Patchwork D11325: dirstatemap: use the default code to handle "p2-tracked" case

login
register
mail settings
Submitter phabricator
Date Aug. 21, 2021, 9:57 a.m.
Message ID <differential-rev-PHID-DREV-vnm5j67s7re7oy54arcb-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49639/
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
  We juste have to do minor value adjustement and the default code will do the rest.
  
  This kind of change highglight that "clean_p2" is probably not the right name,
  for that value. However this is all thing to be figured out and cleaned up once
  are done moving logic at lower level.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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
@@ -295,8 +295,7 @@ 
                 self.addfile(filename, from_p2=True)
                 return
         elif not p1_tracked and p2_tracked and wc_tracked:
-            self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
-            return
+            clean_p2 = True
         elif possibly_dirty:
             pass
         elif wc_tracked: