Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 07:55:47 +01:00
Code Issues Packages Projects Releases Activity

fix wrong line number

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-09-16 15:38:40 +02:00
parent 004a6ab74d
commit 9514f0397e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java
View File

@@ -118,8 +118,7 @@ public class HgBlameViewer implements BlameViewer
* @throws IOException
*/
@Override
public BlameResult getBlame(String revision, String path)
throws IOException
public BlameResult getBlame(String revision, String path) throws IOException
{
AssertUtil.assertIsNotEmpty(path);
@@ -173,15 +172,15 @@ public class HgBlameViewer implements BlameViewer
*
* @throws IOException
*/
private BlameResult parseBlameInput(BufferedReader reader)
throws IOException
private BlameResult parseBlameInput(BufferedReader reader) throws IOException
{
List<BlameLine> blameLines = new ArrayList<BlameLine>();
String line = reader.readLine();
int i = 1;
while (line != null)
{
BlameLine blameLine = parseBlameLine(line);
BlameLine blameLine = parseBlameLine(i, line);
if (blameLine != null)
{
@@ -189,6 +188,7 @@ public class HgBlameViewer implements BlameViewer
}
line = reader.readLine();
i++;
}
return new BlameResult(blameLines.size(), blameLines);
@@ -198,11 +198,13 @@ public class HgBlameViewer implements BlameViewer
* Method description
*
*
*
* @param nr
* @param line
*
* @return
*/
private BlameLine parseBlameLine(String line)
private BlameLine parseBlameLine(int nr, String line)
{
BlameLine blameLine = null;
Matcher m = REGEX_FIRSTPART.matcher(line);
@@ -214,8 +216,7 @@ public class HgBlameViewer implements BlameViewer
// todo parse date
Long when = getDate(m.group(3));
blameLine = new BlameLine(authorPerson, when, m.group(2), m.group(5),
Integer.parseInt(m.group(4)));
blameLine = new BlameLine(authorPerson, when, m.group(2), m.group(5), nr);
}
else if (logger.isWarnEnabled())
{