Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgDirstate.java @ 501:d2f6ab541330
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 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgDirstate.java Mon Oct 29 18:16:21 2012 +0100 +++ b/src/org/tmatesoft/hg/repo/HgDirstate.java Mon Oct 29 19:04:13 2012 +0100 @@ -145,7 +145,7 @@ } else if (state == 'm') { merged.put(r.name1, r); } else { - 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); + 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); } } } catch (IOException ex) { @@ -215,7 +215,7 @@ branch = b == null || b.length() == 0 ? HgRepository.DEFAULT_BRANCH_NAME : b; r.close(); } catch (FileNotFoundException ex) { - internalRepo.getContext().getLog().dump(HgDirstate.class, Debug, ex, null); // log verbose debug, exception might be legal here + internalRepo.getSessionContext().getLog().dump(HgDirstate.class, Debug, ex, null); // log verbose debug, exception might be legal here // IGNORE } catch (IOException ex) { throw new HgInvalidControlFileException("Error reading file with branch information", ex, branchFile);