Mercurial > hg4j

comparison src/org/tmatesoft/hg/internal/DirstateReader.java @ 610:5c68567b3645

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 09 May 2013 21:06:48 +0200
parents 5daa42067e7c
children
comparison
equal deleted inserted replaced
609:e4a71afd3c71 610:5c68567b3645
100 } else if (state == 'r') { 100 } else if (state == 'r') {
101 target.next(EntryKind.Removed, r); 101 target.next(EntryKind.Removed, r);
102 } else if (state == 'm') { 102 } else if (state == 'm') {
103 target.next(EntryKind.Merged, r); 103 target.next(EntryKind.Merged, r);
104 } else { 104 } else {
105 repo.getSessionContext().getLog().dump(getClass(), Severity.Warn, "Dirstate record for file %s (size: %d, tstamp:%d) has unknown state '%c'", r.name(), r.size(), r.modificationTime(), state); 105 repo.getLog().dump(getClass(), Severity.Warn, "Dirstate record for file %s (size: %d, tstamp:%d) has unknown state '%c'", r.name(), r.size(), r.modificationTime(), state);
106 } 106 }
107 } 107 }
108 } catch (IOException ex) { 108 } catch (IOException ex) {
109 throw new HgInvalidControlFileException("Dirstate read failed", ex, dirstateFile); 109 throw new HgInvalidControlFileException("Dirstate read failed", ex, dirstateFile);
110 } finally { 110 } finally {
176 b = b.trim().intern(); 176 b = b.trim().intern();
177 } 177 }
178 branch = b == null || b.length() == 0 ? HgRepository.DEFAULT_BRANCH_NAME : b; 178 branch = b == null || b.length() == 0 ? HgRepository.DEFAULT_BRANCH_NAME : b;
179 r.close(); 179 r.close();
180 } catch (FileNotFoundException ex) { 180 } catch (FileNotFoundException ex) {
181 internalRepo.getSessionContext().getLog().dump(HgDirstate.class, Debug, ex, null); // log verbose debug, exception might be legal here 181 internalRepo.getLog().dump(HgDirstate.class, Debug, ex, null); // log verbose debug, exception might be legal here
182 // IGNORE 182 // IGNORE
183 } catch (IOException ex) { 183 } catch (IOException ex) {
184 throw new HgInvalidControlFileException("Error reading file with branch information", ex, branchFile); 184 throw new HgInvalidControlFileException("Error reading file with branch information", ex, branchFile);
185 } 185 }
186 } 186 }