Patchwork [3,of,4,V3] branchmap: simplify error handlind when writing rev branch cache

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 7, 2016, 2:24 p.m.
Message ID <0e18708cd95bde59d7d6.1470579894@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/16174/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 7, 2016, 2:24 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1470402053 -7200
#      Fri Aug 05 15:00:53 2016 +0200
# Node ID 0e18708cd95bde59d7d6a479746296a23292ff62
# Parent  c8475c98f614e363cf634ecb11b311d3b3fcb6ca
# EXP-Topic vfsward
branchmap: simplify error handlind when writing rev branch cache

Now that we have a general try except, we can move the error handling from the
individual writes in it.
Code will be reindented in the next changeset to help this on readability.

Patch

diff -r c8475c98f614 -r 0e18708cd95b mercurial/branchmap.py
--- a/mercurial/branchmap.py	Fri Aug 05 14:57:16 2016 +0200
+++ b/mercurial/branchmap.py	Fri Aug 05 15:00:53 2016 +0200
@@ -471,10 +471,12 @@  class revbranchcache(object):
         """Save branch cache if it is dirty."""
         repo = self._repo
         wlock = None
+        step = ''
         try:
             if self._rbcnamescount < len(self._names):
+                step = ' names'
                 wlock = repo.wlock(wait=False)
-                try:
+                if True:
                     if self._rbcnamescount != 0:
                         f = repo.vfs.open(_rbcnames, 'ab')
                         if f.tell() == self._rbcsnameslen:
@@ -495,19 +497,16 @@  class revbranchcache(object):
                                       ))
                     self._rbcsnameslen = f.tell()
                     f.close()
-                except (IOError, OSError, error.Abort) as inst:
-                    repo.ui.debug("couldn't write revision branch cache names: "
-                                  "%s\n" % inst)
-                    return
                 self._rbcnamescount = len(self._names)
 
             start = self._rbcrevslen * _rbcrecsize
             if start != len(self._rbcrevs):
+                step = ''
                 if wlock is None:
                     wlock = repo.wlock(wait=False)
                 revs = min(len(repo.changelog),
                            len(self._rbcrevs) // _rbcrecsize)
-                try:
+                if True:
                     f = repo.vfs.open(_rbcrevs, 'ab')
                     if f.tell() != start:
                         repo.ui.debug("truncating %s to %s\n"
@@ -520,13 +519,10 @@  class revbranchcache(object):
                     end = revs * _rbcrecsize
                     f.write(self._rbcrevs[start:end])
                     f.close()
-                except (IOError, OSError, error.Abort) as inst:
-                    repo.ui.debug("couldn't write revision branch cache: %s\n" %
-                                  inst)
-                    return
                 self._rbcrevslen = revs
-        except error.LockHeld as inst:
-            repo.ui.debug("couldn't write revision branch cache: %s\n" % inst)
+        except (IOError, OSError, error.Abort, error.LockHeld) as inst:
+            repo.ui.debug("couldn't write revision branch cache%s: %s\n"
+                          % (step, inst))
         finally:
             if wlock is not None:
                 wlock.release()