Mercurial > hg4j

comparison cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java @ 471:7bcfbc255f48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from smartgit3 branch into 1.1 stream
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 11 Jul 2012 20:40:47 +0200
parents 31a89587eb04 d0e5dc3cae6e
children 37d97854c6ad
comparison
equal deleted inserted replaced
470:31bd09da0dcf 471:7bcfbc255f48
104 sb.append("tip"); 104 sb.append("tip");
105 } 105 }
106 sb.append('\n'); 106 sb.append('\n');
107 } 107 }
108 if (complete) { 108 if (complete) {
109 f.format("phase: %s\n", cset.getPhase().name());
109 Nodeid p1 = cset.getFirstParentRevision(); 110 Nodeid p1 = cset.getFirstParentRevision();
110 Nodeid p2 = cset.getSecondParentRevision(); 111 Nodeid p2 = cset.getSecondParentRevision();
111 int p1x = p1.isNull() ? -1 : repo.getChangelog().getRevisionIndex(p1); 112 int p1x = p1.isNull() ? -1 : repo.getChangelog().getRevisionIndex(p1);
112 int p2x = p2.isNull() ? -1 : repo.getChangelog().getRevisionIndex(p2); 113 int p2x = p2.isNull() ? -1 : repo.getChangelog().getRevisionIndex(p2);
113 int mx = repo.getManifest().getRevisionIndex(cset.getManifestRevision()); 114 int mx = repo.getManifest().getRevisionIndex(cset.getManifestRevision());