Patchwork D11324: dirstatemap: use the default code to handle "possibly_dirty" case

login
register
mail settings
Submitter phabricator
Date Aug. 21, 2021, 9:57 a.m.
Message ID <differential-rev-PHID-DREV-penfn5tsurhrxdh2ynsk-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49638/
State Superseded
Headers show

Comments

phabricator - Aug. 21, 2021, 9:57 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This case is quite simple too

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/dirstatemap.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -298,8 +298,7 @@ 
             self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
             return
         elif possibly_dirty:
-            self.addfile(filename, possibly_dirty=possibly_dirty)
-            return
+            pass
         elif wc_tracked:
             # this is a "normal" file
             if parentfiledata is None: