Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 248:3fbfce107f94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
247:f052f40839ec 248:3fbfce107f94
27 27
28 import org.tmatesoft.hg.core.HgBadStateException; 28 import org.tmatesoft.hg.core.HgBadStateException;
29 import org.tmatesoft.hg.core.HgFileRevision; 29 import org.tmatesoft.hg.core.HgFileRevision;
30 import org.tmatesoft.hg.core.HgLogCommand.FileRevision; 30 import org.tmatesoft.hg.core.HgLogCommand.FileRevision;
31 import org.tmatesoft.hg.core.Nodeid; 31 import org.tmatesoft.hg.core.Nodeid;
32 import org.tmatesoft.hg.internal.ManifestRevision;
32 import org.tmatesoft.hg.internal.Pool; 33 import org.tmatesoft.hg.internal.Pool;
33 import org.tmatesoft.hg.repo.HgStatusCollector.ManifestRevisionInspector;
34 import org.tmatesoft.hg.util.Path; 34 import org.tmatesoft.hg.util.Path;
35 import org.tmatesoft.hg.util.PathPool; 35 import org.tmatesoft.hg.util.PathPool;
36 import org.tmatesoft.hg.util.PathRewrite; 36 import org.tmatesoft.hg.util.PathRewrite;
37 37
38 /** 38 /**
100 wcp1 = wcParents[0]; wcp2 = wcParents[1]; 100 wcp1 = wcParents[0]; wcp2 = wcParents[1];
101 ArrayList<Entry> result = new ArrayList<Entry>(); 101 ArrayList<Entry> result = new ArrayList<Entry>();
102 PathPool pathPool = new PathPool(new PathRewrite.Empty()); 102 PathPool pathPool = new PathPool(new PathRewrite.Empty());
103 Pool<Nodeid> nodeidPool = new Pool<Nodeid>(); 103 Pool<Nodeid> nodeidPool = new Pool<Nodeid>();
104 Pool<String> fnamePool = new Pool<String>(); 104 Pool<String> fnamePool = new Pool<String>();
105 final ManifestRevisionInspector m1 = new ManifestRevisionInspector(nodeidPool, fnamePool); 105 final ManifestRevision m1 = new ManifestRevision(nodeidPool, fnamePool);
106 final ManifestRevisionInspector m2 = new ManifestRevisionInspector(nodeidPool, fnamePool); 106 final ManifestRevision m2 = new ManifestRevision(nodeidPool, fnamePool);
107 final int rp1 = repo.getChangelog().getLocalRevision(wcp1); 107 final int rp1 = repo.getChangelog().getLocalRevision(wcp1);
108 final int rp2 = repo.getChangelog().getLocalRevision(wcp2); 108 final int rp2 = repo.getChangelog().getLocalRevision(wcp2);
109 repo.getManifest().walk(rp1, rp1, m1); 109 repo.getManifest().walk(rp1, rp1, m1);
110 repo.getManifest().walk(rp2, rp2, m2); 110 repo.getManifest().walk(rp2, rp2, m2);
111 BufferedReader br = new BufferedReader(new FileReader(f)); 111 BufferedReader br = new BufferedReader(new FileReader(f));