Mercurial > hg
comparison mercurial/context.py @ 37448:d7114f883505
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 |
comparison
equal
deleted
inserted
replaced
37447:067e8d1178a2 | 37448:d7114f883505 |
---|---|
20 hex, | 20 hex, |
21 modifiednodeid, | 21 modifiednodeid, |
22 nullid, | 22 nullid, |
23 nullrev, | 23 nullrev, |
24 short, | 24 short, |
25 wdirfilenodeids, | |
25 wdirid, | 26 wdirid, |
26 wdirnodes, | |
27 wdirrev, | 27 wdirrev, |
28 ) | 28 ) |
29 from . import ( | 29 from . import ( |
30 dagop, | 30 dagop, |
31 encoding, | 31 encoding, |
136 added.append(fn) | 136 added.append(fn) |
137 elif node2 is None: | 137 elif node2 is None: |
138 removed.append(fn) | 138 removed.append(fn) |
139 elif flag1 != flag2: | 139 elif flag1 != flag2: |
140 modified.append(fn) | 140 modified.append(fn) |
141 elif node2 not in wdirnodes: | 141 elif node2 not in wdirfilenodeids: |
142 # When comparing files between two commits, we save time by | 142 # When comparing files between two commits, we save time by |
143 # not comparing the file contents when the nodeids differ. | 143 # not comparing the file contents when the nodeids differ. |
144 # Note that this means we incorrectly report a reverted change | 144 # Note that this means we incorrectly report a reverted change |
145 # to a file as a modification. | 145 # to a file as a modification. |
146 modified.append(fn) | 146 modified.append(fn) |