Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 248:3fbfce107f94
Issue 8: Means to find out information about given file at specific changeset. Inner ManifestRevisionInspector got promoted to ManifestRevision
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 12 Aug 2011 18:48:57 +0200 |
| parents | 1792b37650f2 |
| children | 4c3b9f679412 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgMergeState.java Fri Aug 12 17:17:37 2011 +0200 +++ b/src/org/tmatesoft/hg/repo/HgMergeState.java Fri Aug 12 18:48:57 2011 +0200 @@ -29,8 +29,8 @@ import org.tmatesoft.hg.core.HgFileRevision; import org.tmatesoft.hg.core.HgLogCommand.FileRevision; import org.tmatesoft.hg.core.Nodeid; +import org.tmatesoft.hg.internal.ManifestRevision; import org.tmatesoft.hg.internal.Pool; -import org.tmatesoft.hg.repo.HgStatusCollector.ManifestRevisionInspector; import org.tmatesoft.hg.util.Path; import org.tmatesoft.hg.util.PathPool; import org.tmatesoft.hg.util.PathRewrite; @@ -102,8 +102,8 @@ PathPool pathPool = new PathPool(new PathRewrite.Empty()); Pool<Nodeid> nodeidPool = new Pool<Nodeid>(); Pool<String> fnamePool = new Pool<String>(); - final ManifestRevisionInspector m1 = new ManifestRevisionInspector(nodeidPool, fnamePool); - final ManifestRevisionInspector m2 = new ManifestRevisionInspector(nodeidPool, fnamePool); + final ManifestRevision m1 = new ManifestRevision(nodeidPool, fnamePool); + final ManifestRevision m2 = new ManifestRevision(nodeidPool, fnamePool); final int rp1 = repo.getChangelog().getLocalRevision(wcp1); final int rp2 = repo.getChangelog().getLocalRevision(wcp2); repo.getManifest().walk(rp1, rp1, m1);