Mercurial > hg4j
comparison test/org/tmatesoft/hg/test/TestIncoming.java @ 282:e51dd9a14b6f
Yet another WC status fix, where dirstate parent and base revision are treated right (dirstate parent other than tip and explicit baseRevision are not the same)
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Sat, 03 Sep 2011 01:21:03 +0200 |
parents | 41a778e3fd31 |
children | b015f3918120 |
comparison
equal
deleted
inserted
replaced
281:81e9a3c9bafe | 282:e51dd9a14b6f |
---|---|
87 // regardless of the pull in between. | 87 // regardless of the pull in between. |
88 HgIncomingCommand cmd = new HgIncomingCommand(localRepo); | 88 HgIncomingCommand cmd = new HgIncomingCommand(localRepo); |
89 cmd.against(hgRemote); | 89 cmd.against(hgRemote); |
90 HgLogCommand.CollectHandler collector = new HgLogCommand.CollectHandler(); | 90 HgLogCommand.CollectHandler collector = new HgLogCommand.CollectHandler(); |
91 LogOutputParser outParser = new LogOutputParser(true); | 91 LogOutputParser outParser = new LogOutputParser(true); |
92 ExecHelper eh = new ExecHelper(outParser, new File(localRepo.getLocation())); | 92 ExecHelper eh = new ExecHelper(outParser, localRepo.getWorkingDir()); |
93 cmd.executeFull(collector); | 93 cmd.executeFull(collector); |
94 eh.run("hg", "incoming", "--debug", hgRemote.getLocation()); | 94 eh.run("hg", "incoming", "--debug", hgRemote.getLocation()); |
95 List<Nodeid> liteResult = cmd.executeLite(); | 95 List<Nodeid> liteResult = cmd.executeLite(); |
96 report(collector, outParser, liteResult, errorCollector); | 96 report(collector, outParser, liteResult, errorCollector); |
97 return liteResult; | 97 return liteResult; |