Mercurial > hg4j
diff test/org/tmatesoft/hg/test/TestBlame.java @ 632:54e16ab771ec v1.1rc2
Progress/cancel for HgDiffCommand. Renamed execute method
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 30 May 2013 16:13:43 +0200 |
| parents | 72c979555cb8 |
| children | 3219cfadda49 |
line wrap: on
line diff
--- a/test/org/tmatesoft/hg/test/TestBlame.java Thu May 30 15:24:17 2013 +0200 +++ b/test/org/tmatesoft/hg/test/TestBlame.java Thu May 30 16:13:43 2013 +0200 @@ -77,7 +77,7 @@ ByteArrayOutputStream bos = new ByteArrayOutputStream(); HgDiffCommand diffCmd = new HgDiffCommand(repo); diffCmd.file(df).changeset(checkChangeset); - diffCmd.executeAnnotateSingleRevision(new DiffOutInspector(new PrintStream(bos))); + diffCmd.executeParentsAnnotate(new DiffOutInspector(new PrintStream(bos))); LineGrepOutputParser gp = new LineGrepOutputParser("^@@.+"); ExecHelper eh = new ExecHelper(gp, null); eh.run("hg", "diff", "-c", String.valueOf(checkChangeset), "-U", "0", fname); @@ -307,7 +307,7 @@ // ByteArrayOutputStream bos = new ByteArrayOutputStream(); HgDiffCommand diffCmd = new HgDiffCommand(repo).file(df); - diffCmd.changeset(0).executeAnnotateSingleRevision(new DiffOutInspector(new PrintStream(bos))); + diffCmd.changeset(0).executeParentsAnnotate(new DiffOutInspector(new PrintStream(bos))); // String[] apiResult = splitLines(bos.toString()); String[] expected = splitLines(gp.result());