diff mercurial/localrepo.py @ 18127:dcd43ac7572d

branchmap: simplify write signature All necessary data (cache value and key) are now stored in the branchcache object. Any extra parameter is superfluous.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Sat, 22 Dec 2012 02:04:49 +0100
parents 090ada0acddb
children f0d56efaa35a
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sat Dec 22 02:06:26 2012 +0100
+++ b/mercurial/localrepo.py	Sat Dec 22 02:04:49 2012 +0100
@@ -1440,7 +1440,7 @@
             branchmap.update(self, cache, ctxgen)
             cache.tipnode = self.changelog.tip()
             cache.tiprev = self.changelog.rev(cache.tipnode)
-            branchmap.write(self, cache, cache.tipnode, cache.tiprev)
+            branchmap.write(self, cache)
 
         # Ensure the persistent tag cache is updated.  Doing it now
         # means that the tag cache only has to worry about destroyed
@@ -2498,7 +2498,7 @@
                                                   self[rtiprev].node(),
                                                   rtiprev)
                     self._branchcache = cache
-                    branchmap.write(self, cache, cache.tipnode, cache.tiprev)
+                    branchmap.write(self, cache)
             self.invalidate()
             return len(self.heads()) + 1
         finally: