# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1421194526 -3600
# Node ID 669106fc5bb1de671f59e432bbc59ca4ccc0e5bc
# Parent  7aa1405528a389e70aa23b0cbc5d677e1bb3c78a
branchcache: make _rbcrevslen handling more safe

self._rbcrevslen is used to keep track of the number of good records on disk.
It should thus not be updated before the records actually have been written to
disk.

diff -r 7aa1405528a3 -r 669106fc5bb1 mercurial/branchmap.py
--- a/mercurial/branchmap.py	Wed Jan 14 01:15:26 2015 +0100
+++ b/mercurial/branchmap.py	Wed Jan 14 01:15:26 2015 +0100
@@ -431,8 +431,7 @@
 
         start = self._rbcrevslen * _rbcrecsize
         if start != len(self._rbcrevs):
-            self._rbcrevslen = min(len(repo.changelog),
-                                   len(self._rbcrevs) // _rbcrecsize)
+            revs = min(len(repo.changelog), len(self._rbcrevs) // _rbcrecsize)
             try:
                 f = repo.vfs.open(_rbcrevs, 'ab')
                 # The position after open(x, 'a') is implementation defined-
@@ -442,10 +441,11 @@
                     repo.ui.debug("truncating %s to %s\n" % (_rbcrevs, start))
                     f.seek(start)
                     f.truncate()
-                end = self._rbcrevslen * _rbcrecsize
+                end = revs * _rbcrecsize
                 f.write(self._rbcrevs[start:end])
                 f.close()
             except (IOError, OSError, util.Abort), inst:
                 repo.ui.debug("couldn't write revision branch cache: %s\n" %
                               inst)
                 return
+            self._rbcrevslen = revs