Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgStatusCollector.java @ 221:04735ce6bed2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPE when one of the flags is non-null
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 19 May 2011 04:45:52 +0200
parents 047b1dec7a04
children 373e07cd3991
comparison
equal deleted inserted replaced
220:8de327242aa0 221:04735ce6bed2
222 if (r1Files.remove(fname)) { 222 if (r1Files.remove(fname)) {
223 Nodeid nidR1 = r1.nodeid(fname); 223 Nodeid nidR1 = r1.nodeid(fname);
224 Nodeid nidR2 = r2.nodeid(fname); 224 Nodeid nidR2 = r2.nodeid(fname);
225 String flagsR1 = r1.flags(fname); 225 String flagsR1 = r1.flags(fname);
226 String flagsR2 = r2.flags(fname); 226 String flagsR2 = r2.flags(fname);
227 if (nidR1.equals(nidR2) && ((flagsR2 == null && flagsR1 == null) || flagsR2.equals(flagsR1))) { 227 if (nidR1.equals(nidR2) && ((flagsR2 == null && flagsR1 == null) || (flagsR2 != null && flagsR2.equals(flagsR1)))) {
228 inspector.clean(pp.path(fname)); 228 inspector.clean(pp.path(fname));
229 } else { 229 } else {
230 inspector.modified(pp.path(fname)); 230 inspector.modified(pp.path(fname));
231 } 231 }
232 } else { 232 } else {