Patchwork D11151: sparse: use `update_file` instead of `normal` during `applyupdates`

login
register
mail settings
Submitter phabricator
Date July 19, 2021, 10:44 a.m.
Message ID <differential-rev-PHID-DREV-y2ooiqbivbn4ssdnxhcm-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49464/
State Superseded
Headers show

Comments

phabricator - July 19, 2021, 10:44 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is the newer, more semantic API.
  
  (more content end up "nonnormal", see previous commit)

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/sparse.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/sparse.py b/mercurial/sparse.py
--- a/mercurial/sparse.py
+++ b/mercurial/sparse.py
@@ -453,7 +453,7 @@ 
             for file, flags, msg in tmresult.getactions(
                 [mergestatemod.ACTION_GET]
             ):
-                dirstate.normal(file)
+                dirstate.update_file(file, p1_tracked=True, wc_tracked=True)
 
     profiles = activeconfig(repo)[2]
     changedprofiles = profiles & files