Mercurial > hg4j

comparison test/org/tmatesoft/hg/test/TestHistory.java @ 517:9922d1f7cb2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update test to use new command configuration argument (used to have followAncestry == true by default)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Tue, 18 Dec 2012 19:08:00 +0100
parents 5dcb4581c8ef
children 0d5e1ea7955e
comparison
equal deleted inserted replaced
516:0ae5768081aa 517:9922d1f7cb2a
155 public void copy(HgFileRevision from, HgFileRevision to) throws HgCallbackTargetException { 155 public void copy(HgFileRevision from, HgFileRevision to) throws HgCallbackTargetException {
156 renames.put(from.getPath(), to.getPath()); 156 renames.put(from.getPath(), to.getPath());
157 } 157 }
158 }); 158 });
159 h.checkPrevInParents = true; 159 h.checkPrevInParents = true;
160 new HgLogCommand(repo).file(fname, true).execute(h); 160 new HgLogCommand(repo).file(fname, true, true).execute(h);
161 161
162 assertEquals(1, h.getAdapterUse(HgFileRenameHandlerMixin.class)); 162 assertEquals(1, h.getAdapterUse(HgFileRenameHandlerMixin.class));
163 163
164 report("execute with HgChangesetTreeHandler(follow == true)", h.getResult(), false); 164 report("execute with HgChangesetTreeHandler(follow == true)", h.getResult(), false);
165 165
366 errorCollector.assertEquals(parents_b.second(), parents_a.second().getNodeid()); 366 errorCollector.assertEquals(parents_b.second(), parents_a.second().getNodeid());
367 } 367 }
368 // 368 //
369 if (checkPrevInChildren && !cmdResult.isEmpty()) { 369 if (checkPrevInChildren && !cmdResult.isEmpty()) {
370 HgChangeset prevChangeset = reverseResult ? cmdResult.getFirst() : cmdResult.getLast(); 370 HgChangeset prevChangeset = reverseResult ? cmdResult.getFirst() : cmdResult.getLast();
371 String msg = String.format("No parent-child bind betwee revisions %d and %d", prevChangeset.getRevisionIndex(), entry.changeset().getRevisionIndex()); 371 String msg = String.format("No parent-child bind between revisions %d and %d", prevChangeset.getRevisionIndex(), entry.changeset().getRevisionIndex());
372 errorCollector.assertTrue(msg, entry.children().contains(prevChangeset)); 372 errorCollector.assertTrue(msg, entry.children().contains(prevChangeset));
373 } 373 }
374 if (checkPrevInParents && !cmdResult.isEmpty()) { 374 if (checkPrevInParents && !cmdResult.isEmpty()) {
375 HgChangeset prevChangeset = reverseResult ? cmdResult.getFirst() : cmdResult.getLast(); 375 HgChangeset prevChangeset = reverseResult ? cmdResult.getFirst() : cmdResult.getLast();
376 String msg = String.format("No parent-child bind betwee revisions %d and %d", prevChangeset.getRevisionIndex(), entry.changeset().getRevisionIndex()); 376 String msg = String.format("No parent-child bind between revisions %d and %d", prevChangeset.getRevisionIndex(), entry.changeset().getRevisionIndex());
377 errorCollector.assertTrue(msg, p.first() == prevChangeset || p.second() == prevChangeset); 377 errorCollector.assertTrue(msg, p.first() == prevChangeset || p.second() == prevChangeset);
378 } 378 }
379 // 379 //
380 if (reverseResult) { 380 if (reverseResult) {
381 cmdResult.addFirst(entry.changeset()); 381 cmdResult.addFirst(entry.changeset());