diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2014-10-03 14:36:33 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2014-10-03 14:36:33 +0200 |
| commit | af44423a58b896f43b8149b6ea746aeb4e1cd290 (patch) | |
| tree | 7656f29845787ecb3eef9a824b72f40f8877e010 /plugins/sonar-git-plugin | |
| parent | a1634e27e30064ef2b6d507b0818e115ae1f5229 (diff) | |
| download | sonarqube-af44423a58b896f43b8149b6ea746aeb4e1cd290.tar.gz sonarqube-af44423a58b896f43b8149b6ea746aeb4e1cd290.zip | |
SONAR-5643 Properly handle cases where there are local modification on files
Diffstat (limited to 'plugins/sonar-git-plugin')
| -rw-r--r-- | plugins/sonar-git-plugin/src/main/java/org/sonar/plugins/scm/git/GitBlameConsumer.java | 2 | ||||
| -rw-r--r-- | plugins/sonar-git-plugin/src/test/java/org/sonar/plugins/scm/git/GitBlameCommandTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/sonar-git-plugin/src/main/java/org/sonar/plugins/scm/git/GitBlameConsumer.java b/plugins/sonar-git-plugin/src/main/java/org/sonar/plugins/scm/git/GitBlameConsumer.java index 987c37e8d6f..b1b7e585c58 100644 --- a/plugins/sonar-git-plugin/src/main/java/org/sonar/plugins/scm/git/GitBlameConsumer.java +++ b/plugins/sonar-git-plugin/src/main/java/org/sonar/plugins/scm/git/GitBlameConsumer.java @@ -133,7 +133,7 @@ public class GitBlameConsumer implements StreamConsumer { revision = parts[0]; if (StringUtils.containsOnly(revision, "0")) { - throw new IllegalStateException("Unable to blame file " + filename + ". Is file commited?"); + throw new IllegalStateException("Unable to blame file " + filename + ". No blame info at line " + (getLines().size() + 1) + ". Is file commited?"); } BlameLine oldLine = commitInfo.get(revision); diff --git a/plugins/sonar-git-plugin/src/test/java/org/sonar/plugins/scm/git/GitBlameCommandTest.java b/plugins/sonar-git-plugin/src/test/java/org/sonar/plugins/scm/git/GitBlameCommandTest.java index f393c47c1c6..574f68dc4da 100644 --- a/plugins/sonar-git-plugin/src/test/java/org/sonar/plugins/scm/git/GitBlameCommandTest.java +++ b/plugins/sonar-git-plugin/src/test/java/org/sonar/plugins/scm/git/GitBlameCommandTest.java @@ -140,7 +140,7 @@ public class GitBlameCommandTest { }); thrown.expect(IllegalStateException.class); - thrown.expectMessage("Unable to blame file src/foo.xoo. Is file commited?"); + thrown.expectMessage("Unable to blame file src/foo.xoo. No blame info at line 1. Is file commited?"); new GitBlameCommand(commandExecutor).blame(fs, Arrays.<InputFile>asList(inputFile), result); } |