Mercurial > public > mercurial-scm > hg

diff mercurial/dirstate.py @ 51686:493034cc3265

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
black: format the codebase with 23.3.0 The CI has moved to 23.3.0, which is the last version that supports 3.7 at runtime, so we should honor this change. # skip-blame mass-reformating only
author Rapha?l Gom?s <rgomes@octobus.net>
date Thu, 18 Jul 2024 12:36:12 +0200
parents 513597087b89
children 7f0cb9ee0534
line wrap: on
line diff
--- a/mercurial/dirstate.py	Thu Jul 18 12:03:29 2024 +0200
+++ b/mercurial/dirstate.py	Thu Jul 18 12:36:12 2024 +0200
@@ -136,7 +136,6 @@
 
 @interfaceutil.implementer(intdirstate.idirstate)
 class dirstate:
-
     # used by largefile to avoid overwritting transaction callback
     _tr_key_suffix = b''
 
@@ -880,7 +879,6 @@
         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
@@ -1092,7 +1090,6 @@
 
         write_key = self._use_tracked_hint and self._dirty_tracked_set
         if tr:
-
             self._setup_tr_abort(tr)
             self._attached_to_a_transaction = True
 
@@ -1286,7 +1283,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