Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgDirstate.java @ 388:b015f3918120

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 15 Feb 2012 22:57:56 +0100
parents aa2e589d4e84
children 63c5a9d7ca3f
comparison
equal deleted inserted replaced
387:cdea37239b01 388:b015f3918120
140 } else if (state == 'r') { 140 } else if (state == 'r') {
141 removed.put(r.name1, r); 141 removed.put(r.name1, r);
142 } else if (state == 'm') { 142 } else if (state == 'm') {
143 merged.put(r.name1, r); 143 merged.put(r.name1, r);
144 } else { 144 } else {
145 // FIXME log error? 145 repo.getContext().getLog().warn(getClass(), "Dirstate record for file %s (size: %d, tstamp:%d) has unknown state '%c'", r.name1, r.size(), r.time, state);
146 } 146 }
147 } 147 }
148 } catch (IOException ex) { 148 } catch (IOException ex) {
149 throw new HgInvalidControlFileException("Dirstate read failed", ex, dirstateFile); 149 throw new HgInvalidControlFileException("Dirstate read failed", ex, dirstateFile);
150 } finally { 150 } finally {