Mercurial > hg

changeset 48141:42ab0bcb6ded

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: narrow gathering of parent data The parent data are only going to be useful is the file might be clean. And it might only be clean if it is tracked in both p1 and the working copy. Differential Revision: https://phab.mercurial-scm.org/D11584
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 02:01:12 +0200
parents 98b3eb6c1479
children fb3b41d583c2
files mercurial/dirstate.py
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Fri Oct 01 01:27:53 2021 +0200
+++ b/mercurial/dirstate.py	Fri Oct 01 02:01:12 2021 +0200
@@ -525,11 +525,8 @@
             if entry is not None and entry.added:
                 return  # avoid dropping copy information (maybe?)
 
-        # this mean we are doing call for file we do not really care about the
-        # data (eg: added or removed), however this should be a minor overhead
-        # compared to the overall update process calling this.
         parentfiledata = None
-        if wc_tracked:
+        if wc_tracked and p1_tracked:
             parentfiledata = self._get_filedata(filename)
 
         self._map.reset_state(