--- a/mercurial/dirstate.py Mon Jul 22 16:49:38 2024 +0200
+++ b/mercurial/dirstate.py Tue Jul 23 10:02:46 2024 +0200
@@ -136,6 +136,7 @@
@interfaceutil.implementer(intdirstate.idirstate)
class dirstate:
+
# used by largefile to avoid overwritting transaction callback
_tr_key_suffix = b''
@@ -879,6 +880,7 @@
possibly_dirty=False,
parentfiledata=None,
):
+
# note: I do not think we need to double check name clash here since we
# are in a update/merge case that should already have taken care of
# this. The test agrees
@@ -1090,6 +1092,7 @@
write_key = self._use_tracked_hint and self._dirty_tracked_set
if tr:
+
self._setup_tr_abort(tr)
self._attached_to_a_transaction = True
@@ -1283,7 +1286,7 @@
badfn(ff, badtype(kind))
if nf in dmap:
results[nf] = None
- except OSError as inst:
+ except (OSError) as inst:
# nf not found on disk - it is dirstate only
if nf in dmap: # does it exactly match a missing file?
results[nf] = None