changeset 18214:cd4c75200206

branchmap: ignore Abort error while writing cache Read only vfs can now raise Abort exception. Note that encoding.local are also a possible raiser.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 04 Jan 2013 04:52:57 +0100
parents c38a62af000e
children 5e851ca54189
files mercurial/branchmap.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/branchmap.py	Fri Jan 04 01:07:25 2013 +0100
+++ b/mercurial/branchmap.py	Fri Jan 04 04:52:57 2013 +0100
@@ -139,7 +139,8 @@
                 for node in nodes:
                     f.write("%s %s\n" % (hex(node), encoding.fromlocal(label)))
             f.close()
-        except (IOError, OSError):
+        except (IOError, OSError, util.Abort):
+            # Abort may be raise by read only opener
             pass
 
     def update(self, repo, ctxgen):