[PATCH 1 of 6] localrepo: refactor retrieving of journal/undo files paths
Idan Kamara
idankk86 at gmail.com
Tue Mar 6 10:44:24 CST 2012
# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1331052172 -7200
# Node ID 35ccf489e76ec8362f9fab7304e500e20e7c783d
# Parent 81a1a00f5738f40250fd6ac7d3dc563ca03bfd34
localrepo: refactor retrieving of journal/undo files paths
We'd like to remove undo files after stripping
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -750,8 +750,8 @@
raise error.RepoError(
_("abandoned transaction found - run hg recover"))
- journalfiles = self._writejournal(desc)
- renames = [(x, undoname(x)) for x in journalfiles]
+ self._writejournal(desc)
+ renames = [(x, undoname(x)) for x in self._journalfiles()]
tr = transaction.transaction(self.ui.warn, self.sopener,
self.sjoin("journal"),
@@ -760,6 +760,15 @@
self._transref = weakref.ref(tr)
return tr
+ def _journalfiles(self):
+ return (self.sjoin('journal'), self.join('journal.dirstate'),
+ self.join('journal.branch'), self.join('journal.desc'),
+ self.join('journal.bookmarks'),
+ self.sjoin('journal.phaseroots'))
+
+ def undofiles(self):
+ return [undoname(x) for x in self._journalfiles()]
+
def _writejournal(self, desc):
# save dirstate for rollback
try:
@@ -783,11 +792,6 @@
else:
self.sopener.write('journal.phaseroots', '')
- return (self.sjoin('journal'), self.join('journal.dirstate'),
- self.join('journal.branch'), self.join('journal.desc'),
- self.join('journal.bookmarks'),
- self.sjoin('journal.phaseroots'))
-
def recover(self):
lock = self.lock()
try:
More information about the Mercurial-devel
mailing list