Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 16626:503e674fb545

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phases: stop modifying localrepo in writeroots() Also pass the phaseroots being written for clarity. repo._dirtyphases was already reset to False at call site.
author Patrick Mezard <patrick@mezard.eu>
date Thu, 10 May 2012 18:52:07 +0200
parents df9df747070d
children 3c738cb162bf
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu May 10 18:52:04 2012 +0200
+++ b/mercurial/localrepo.py	Thu May 10 18:52:07 2012 +0200
@@ -932,7 +932,7 @@
         def unlock():
             self.store.write()
             if self._dirtyphases:
-                phases.writeroots(self)
+                phases.writeroots(self, self._phaseroots)
                 self._dirtyphases = False
             for k, ce in self._filecache.items():
                 if k == 'dirstate':