comparison mercurial/copies.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 a4f02a17420d
children ee7b6fa52d9d
comparison
equal deleted inserted replaced
37447:067e8d1178a2 37448:d7114f883505
278 if rev is None: 278 if rev is None:
279 revs = [p.rev() for p in ctx.parents()] 279 revs = [p.rev() for p in ctx.parents()]
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]
287 fctx = repo.filectx(f, fileid=n) 287 fctx = repo.filectx(f, fileid=n)
288 # setup only needed for filectx not create from a changectx 288 # setup only needed for filectx not create from a changectx