Mercurial > hg

diff mercurial/context.py @ 37448:d7114f883505

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
node: rename wdirnodes to clarify they are for manifest/filelogs Differential Revision: https://phab.mercurial-scm.org/D2941
author Yuya Nishihara <yuya@tcha.org>
date Sun, 25 Mar 2018 18:31:22 +0900
parents 067e8d1178a2
children 901e749ca0e1
line wrap: on
line diff
--- a/mercurial/context.py	Sun Mar 25 18:27:43 2018 +0900
+++ b/mercurial/context.py	Sun Mar 25 18:31:22 2018 +0900
@@ -22,8 +22,8 @@
     nullid,
     nullrev,
     short,
+    wdirfilenodeids,
     wdirid,
-    wdirnodes,
     wdirrev,
 )
 from . import (
@@ -138,7 +138,7 @@
                 removed.append(fn)
             elif flag1 != flag2:
                 modified.append(fn)
-            elif node2 not in wdirnodes:
+            elif node2 not in wdirfilenodeids:
                 # When comparing files between two commits, we save time by
                 # not comparing the file contents when the nodeids differ.
                 # Note that this means we incorrectly report a reverted change