Mercurial > hg-stable
changeset 29757:3b184adfb5be
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.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 05 Aug 2016 15:00:53 +0200 |
| parents | 0d588332ad2c |
| children | 3dbc95f3eb31 |
| files | mercurial/branchmap.py |
| diffstat | 1 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ """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 @@ )) 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 @@ 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.LockError as inst: - repo.ui.debug("couldn't write revision branch cache: %s\n" % inst) + except (IOError, OSError, error.Abort, error.LockError) as inst: + repo.ui.debug("couldn't write revision branch cache%s: %s\n" + % (step, inst)) finally: if wlock is not None: wlock.release()