Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgDirstate.java @ 501:d2f6ab541330

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Mon, 29 Oct 2012 19:04:13 +0100
parents b3c16d1aede0
children 0be5be8d57e9
comparison
equal deleted inserted replaced
500:465316bf97e8 501:d2f6ab541330
143 } else if (state == 'r') { 143 } else if (state == 'r') {
144 removed.put(r.name1, r); 144 removed.put(r.name1, r);
145 } else if (state == 'm') { 145 } else if (state == 'm') {
146 merged.put(r.name1, r); 146 merged.put(r.name1, r);
147 } else { 147 } else {
148 repo.getContext().getLog().dump(getClass(), Severity.Warn, "Dirstate record for file %s (size: %d, tstamp:%d) has unknown state '%c'", r.name1, r.size(), r.time, state); 148 repo.getSessionContext().getLog().dump(getClass(), Severity.Warn, "Dirstate record for file %s (size: %d, tstamp:%d) has unknown state '%c'", r.name1, r.size(), r.time, state);
149 } 149 }
150 } 150 }
151 } catch (IOException ex) { 151 } catch (IOException ex) {
152 throw new HgInvalidControlFileException("Dirstate read failed", ex, dirstateFile); 152 throw new HgInvalidControlFileException("Dirstate read failed", ex, dirstateFile);
153 } finally { 153 } finally {
213 b = b.trim().intern(); 213 b = b.trim().intern();
214 } 214 }
215 branch = b == null || b.length() == 0 ? HgRepository.DEFAULT_BRANCH_NAME : b; 215 branch = b == null || b.length() == 0 ? HgRepository.DEFAULT_BRANCH_NAME : b;
216 r.close(); 216 r.close();
217 } catch (FileNotFoundException ex) { 217 } catch (FileNotFoundException ex) {
218 internalRepo.getContext().getLog().dump(HgDirstate.class, Debug, ex, null); // log verbose debug, exception might be legal here 218 internalRepo.getSessionContext().getLog().dump(HgDirstate.class, Debug, ex, null); // log verbose debug, exception might be legal here
219 // IGNORE 219 // IGNORE
220 } catch (IOException ex) { 220 } catch (IOException ex) {
221 throw new HgInvalidControlFileException("Error reading file with branch information", ex, branchFile); 221 throw new HgInvalidControlFileException("Error reading file with branch information", ex, branchFile);
222 } 222 }
223 } 223 }