Mercurial Mercurial > public > mercurial-scm > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/dirstate.py
changeset 47987 dd267f16042f
parent 47986 72b80a0124f8
child 47988 d459c6b84961 
--- a/mercurial/dirstate.py	Wed Sep 15 09:50:44 2021 +0200
+++ b/mercurial/dirstate.py	Wed Sep 15 10:02:11 2021 +0200
@@ -387,10 +387,8 @@
             self._origpl = self._pl
         self._map.setparents(p1, p2)
         copies = {}
-        if (
-            oldp2 != self._nodeconstants.nullid
-            and p2 == self._nodeconstants.nullid
-        ):
+        nullid = self._nodeconstants.nullid
+        if oldp2 != nullid and p2 == nullid:
             candidatefiles = self._map.non_normal_or_other_parent_paths()
 
             for f in candidatefiles:
mercurial-scm/hg