[PATCH stable] dirstate: don't rename branch file if writing it failed

Idan Kamara idankk86 at gmail.com
Sun Dec 16 12:57:11 CST 2012


# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1355595547 -7200
# Branch stable
# Node ID 75544dacf843e2e7ba16de0cc48e7e8d52713494
# Parent  57a75683f8dcfd71f431c08a44461bc543b60690
dirstate: don't rename branch file if writing it failed

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -265,8 +265,10 @@
         f = self._opener('branch', 'w', atomictemp=True)
         try:
             f.write(self._branch + '\n')
-        finally:
             f.close()
+        except: # re-raises
+            f.discard()
+            raise
 
     def _read(self):
         self._map = {}


More information about the Mercurial-devel mailing list