Comments
Patch
@@ -394,6 +394,9 @@
self._lastnormaltime = 0
self._dirty = False
self._parentwriters = 0
+ if self._diverted:
+ # avoid accidental reading '.pending' in
+ self._removepending()
def copy(self, source, dest):
"""Mark dest as a copy of source. Unmark dest if source is None."""
@@ -622,6 +625,14 @@
return
self._writedirstate(self._filename)
+ def _removepending(self):
+ try:
+ self._opener.unlink(self._pendingfilename)
+ except OSError, e:
+ if e.errno != errno.ENOENT:
+ raise
+ self._diverted = False
+
def _writepending(self, tr):
'''Make pending data visible to external processes