Mercurial > hg4j

comparison src/org/tmatesoft/hg/repo/HgDirstate.java @ 371:aa2e589d4e84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPE in HgWCStatusCollector:initDirstateParentManifest (aka AssertionError in HgDirstate:parents())
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Sat, 31 Dec 2011 01:04:22 +0300
parents a0864b2892cd
children b015f3918120
comparison
equal deleted inserted replaced
370:a2341e761609 371:aa2e589d4e84
74 canonicalPathRewrite = canonicalPath; 74 canonicalPathRewrite = canonicalPath;
75 } 75 }
76 76
77 /*package-local*/ void read() throws HgInvalidControlFileException { 77 /*package-local*/ void read() throws HgInvalidControlFileException {
78 normal = added = removed = merged = Collections.<Path, Record>emptyMap(); 78 normal = added = removed = merged = Collections.<Path, Record>emptyMap();
79 parents = new Pair<Nodeid,Nodeid>(Nodeid.NULL, Nodeid.NULL);
79 if (canonicalPathRewrite != null) { 80 if (canonicalPathRewrite != null) {
80 canonical2dirstateName = new HashMap<Path,Path>(); 81 canonical2dirstateName = new HashMap<Path,Path>();
81 } else { 82 } else {
82 canonical2dirstateName = Collections.emptyMap(); 83 canonical2dirstateName = Collections.emptyMap();
83 } 84 }