##// END OF EJS Templates
node: rename wdirnodes to clarify they are for manifest/filelogs...
Yuya Nishihara -
r37466:d7114f88 default
parent child Browse files
Show More
@@ -22,8 +22,8 b' from .node import ('
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 (
@@ -138,7 +138,7 b' class basectx(object):'
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
@@ -280,7 +280,7 b' def _makegetfctx(ctx):'
280 ac = repo.changelog.ancestors(revs, inclusive=True)
280 ac = repo.changelog.ancestors(revs, inclusive=True)
281 ctx._ancestrycontext = ac
281 ctx._ancestrycontext = ac
282 def makectx(f, n):
282 def makectx(f, n):
283 if n in node.wdirnodes: # in a working context?
283 if n in node.wdirfilenodeids: # in a working context?
284 if ctx.rev() is None:
284 if ctx.rev() is None:
285 return ctx.filectx(f)
285 return ctx.filectx(f)
286 return repo[None][f]
286 return repo[None][f]
@@ -30,7 +30,7 b" newnodeid = '!' * 20"
30 addednodeid = ('0' * 15) + 'added'
30 addednodeid = ('0' * 15) + 'added'
31 modifiednodeid = ('0' * 12) + 'modified'
31 modifiednodeid = ('0' * 12) + 'modified'
32
32
33 wdirnodes = {newnodeid, addednodeid, modifiednodeid}
33 wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}
34
34
35 # pseudo identifiers for working directory
35 # pseudo identifiers for working directory
36 # (they are experimental, so don't add too many dependencies on them)
36 # (they are experimental, so don't add too many dependencies on them)
General Comments 0
You need to be logged in to leave comments. Login now