Mercurial > hg4j
comparison cmdline/org/tmatesoft/hg/console/Log.java @ 88:61eedab3eb3e
Status between two revisions to recognize copy/rename
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 26 Jan 2011 05:46:47 +0100 |
| parents | 4222b04f34ee |
| children | ee2c750b036d |
comparison
equal
deleted
inserted
replaced
| 87:25f2e5d1cd8b | 88:61eedab3eb3e |
|---|---|
| 180 changelogWalker = repo.getChangelog().new ParentWalker(); | 180 changelogWalker = repo.getChangelog().new ParentWalker(); |
| 181 changelogWalker.init(); | 181 changelogWalker.init(); |
| 182 } | 182 } |
| 183 Nodeid p1 = changelogWalker.safeFirstParent(csetNodeid); | 183 Nodeid p1 = changelogWalker.safeFirstParent(csetNodeid); |
| 184 Nodeid p2 = changelogWalker.safeSecondParent(csetNodeid); | 184 Nodeid p2 = changelogWalker.safeSecondParent(csetNodeid); |
| 185 int p1x = p1 == Nodeid.NULL ? -1 : repo.getChangelog().getLocalRevisionNumber(p1); | 185 int p1x = p1 == Nodeid.NULL ? -1 : repo.getChangelog().getLocalRevision(p1); |
| 186 int p2x = p2 == Nodeid.NULL ? -1 : repo.getChangelog().getLocalRevisionNumber(p2); | 186 int p2x = p2 == Nodeid.NULL ? -1 : repo.getChangelog().getLocalRevision(p2); |
| 187 int mx = repo.getManifest().getLocalRevisionNumber(cset.getManifestRevision()); | 187 int mx = repo.getManifest().getLocalRevision(cset.getManifestRevision()); |
| 188 f.format("parent: %d:%s\nparent: %d:%s\nmanifest: %d:%s\n", p1x, p1, p2x, p2, mx, cset.getManifestRevision()); | 188 f.format("parent: %d:%s\nparent: %d:%s\nmanifest: %d:%s\n", p1x, p1, p2x, p2, mx, cset.getManifestRevision()); |
| 189 } | 189 } |
| 190 f.format("user: %s\ndate: %s\n", cset.getUser(), cset.getDate()); | 190 f.format("user: %s\ndate: %s\n", cset.getUser(), cset.getDate()); |
| 191 if (!complete && verbose) { | 191 if (!complete && verbose) { |
| 192 final List<Path> files = cset.getAffectedFiles(); | 192 final List<Path> files = cset.getAffectedFiles(); |
