[PATCH 2 of 3] context: clarify why we don't compare file contents when nodeid differs
Martin von Zweigbergk
martinvonz at google.com
Tue Jan 12 15:43:47 CST 2016
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1452632994 28800
# Tue Jan 12 13:09:54 2016 -0800
# Node ID 228d5d4d70b304ad1afc7dcc5b7c6b366ea5d239
# Parent f07b94c8bb3a311a47e91a2bc528f7d91145fc13
context: clarify why we don't compare file contents when nodeid differs
diff --git a/mercurial/context.py b/mercurial/context.py
@@ -140,15 +140,15 @@
elif node2 is None:
- elif node2 != _newnode:
- # The file was not a new file in mf2, so an entry
- # from diff is really a difference.
+ elif self.rev() is not None:
+ # 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
+ # to a file as a modification.
elif flag1 != flag2:
- # node2 was newnode, but the working file doesn't
- # match the one in mf1.
More information about the Mercurial-devel