##// END OF EJS Templates
absorb: migrate to new method for getting copy info...
Martin von Zweigbergk -
r41944:8843bc1f default
parent child Browse files
Show More
@@ -191,9 +191,9 def getfilestack(stack, path, seenfctxs=
191 pctx = None # do not add another immutable fctx
191 pctx = None # do not add another immutable fctx
192 break
192 break
193 fctxmap[ctx] = fctx # only for mutable fctxs
193 fctxmap[ctx] = fctx # only for mutable fctxs
194 renamed = fctx.renamed()
194 copy = fctx.copysource()
195 if renamed:
195 if copy:
196 path = renamed[0] # follow rename
196 path = copy # follow rename
197 if path in ctx: # but do not follow copy
197 if path in ctx: # but do not follow copy
198 pctx = ctx.p1()
198 pctx = ctx.p1()
199 break
199 break
@@ -232,8 +232,8 class overlaystore(patch.filestore):
232 else:
232 else:
233 content = fctx.data()
233 content = fctx.data()
234 mode = (fctx.islink(), fctx.isexec())
234 mode = (fctx.islink(), fctx.isexec())
235 renamed = fctx.renamed() # False or (path, node)
235 copy = fctx.copysource()
236 return content, mode, (renamed and renamed[0])
236 return content, mode, copy
237
237
238 def overlaycontext(memworkingcopy, ctx, parents=None, extra=None):
238 def overlaycontext(memworkingcopy, ctx, parents=None, extra=None):
239 """({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx
239 """({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx
General Comments 0
You need to be logged in to leave comments. Login now