dirstate: don't rename branch file if writing it failed

mercurial/dirstate.py

@@ -265,8 +265,10 @@ class dirstate(object):
         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 = {}