Patchwork D11420: dirstate: extract the logic to check file/dirname collision when adding a file

login
register
mail settings
Submitter phabricator
Date Sept. 14, 2021, 9:20 p.m.
Message ID <differential-rev-PHID-DREV-rlmrokchjuwobfpgkma7-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49732/
State Superseded
Headers show

Comments

phabricator - Sept. 14, 2021, 9:20 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11420

AFFECTED FILES
  mercurial/dirstate.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -676,20 +676,7 @@ 
     ):
         entry = self._map.get(f)
         if added or entry is not None and entry.removed:
-            scmutil.checkfilename(f)
-            if self._map.hastrackeddir(f):
-                msg = _(b'directory %r already in dirstate')
-                msg %= pycompat.bytestr(f)
-                raise error.Abort(msg)
-            # shadows
-            for d in pathutil.finddirs(f):
-                if self._map.hastrackeddir(d):
-                    break
-                entry = self._map.get(d)
-                if entry is not None and not entry.removed:
-                    msg = _(b'file %r in dirstate clashes with %r')
-                    msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
-                    raise error.Abort(msg)
+            self._check_new_tracked_filename(f)
         self._dirty = True
         self._updatedfiles.add(f)
         self._map.addfile(
@@ -703,6 +690,22 @@ 
             possibly_dirty=possibly_dirty,
         )
 
+    def _check_new_tracked_filename(self, filename):
+        scmutil.checkfilename(filename)
+        if self._map.hastrackeddir(filename):
+            msg = _(b'directory %r already in dirstate')
+            msg %= pycompat.bytestr(filename)
+            raise error.Abort(msg)
+        # shadows
+        for d in pathutil.finddirs(filename):
+            if self._map.hastrackeddir(d):
+                break
+            entry = self._map.get(d)
+            if entry is not None and not entry.removed:
+                msg = _(b'file %r in dirstate clashes with %r')
+                msg %= (pycompat.bytestr(d), pycompat.bytestr(filename))
+                raise error.Abort(msg)
+
     def _get_filedata(self, filename):
         """returns"""
         s = os.lstat(self._join(filename))