##// END OF EJS Templates
memctx: rename constructor argument "copied" to "copysource" (API)...
Martin von Zweigbergk -
r42161:550a172a default
parent child Browse files
Show More
@@ -601,7 +601,7 b' def replacerev(ui, repo, ctx, filedata, '
601 601 if path not in ctx:
602 602 return None
603 603 fctx = ctx[path]
604 copied = fctx.copysource()
604 copysource = fctx.copysource()
605 605 return context.memfilectx(
606 606 repo,
607 607 memctx,
@@ -609,7 +609,7 b' def replacerev(ui, repo, ctx, filedata, '
609 609 data=filedata.get(path, fctx.data()),
610 610 islink=fctx.islink(),
611 611 isexec=fctx.isexec(),
612 copied=copied)
612 copysource=copysource)
613 613
614 614 extra = ctx.extra().copy()
615 615 extra['fix_source'] = ctx.hex()
@@ -645,7 +645,7 b' def collapse(repo, firstctx, lastctx, co'
645 645 fctx.path(), fctx.data(),
646 646 islink='l' in flags,
647 647 isexec='x' in flags,
648 copied=copied.get(path))
648 copysource=copied.get(path))
649 649 return mctx
650 650 return None
651 651
@@ -83,7 +83,7 b' def _commitfiltered(repo, ctx, match, ke'
83 83 mctx = context.memfilectx(repo, memctx, fctx.path(), fctx.data(),
84 84 fctx.islink(),
85 85 fctx.isexec(),
86 copied=copied.get(path))
86 copysource=copied.get(path))
87 87 return mctx
88 88
89 89 if not files:
@@ -2563,7 +2563,7 b' def amend(ui, repo, old, extra, pats, op'
2563 2563 fctx.path(), fctx.data(),
2564 2564 islink='l' in flags,
2565 2565 isexec='x' in flags,
2566 copied=copied.get(path))
2566 copysource=copied.get(path))
2567 2567 return mctx
2568 2568 except KeyError:
2569 2569 return None
@@ -2233,10 +2233,10 b' def memfilefromctx(ctx):'
2233 2233 """
2234 2234 def getfilectx(repo, memctx, path):
2235 2235 fctx = ctx[path]
2236 copied = fctx.copysource()
2236 copysource = fctx.copysource()
2237 2237 return memfilectx(repo, memctx, path, fctx.data(),
2238 2238 islink=fctx.islink(), isexec=fctx.isexec(),
2239 copied=copied)
2239 copysource=copysource)
2240 2240
2241 2241 return getfilectx
2242 2242
@@ -2246,12 +2246,12 b' def memfilefrompatch(patchstore):'
2246 2246 This is a convenience method for building a memctx based on a patchstore.
2247 2247 """
2248 2248 def getfilectx(repo, memctx, path):
2249 data, mode, copied = patchstore.getfile(path)
2249 data, mode, copysource = patchstore.getfile(path)
2250 2250 if data is None:
2251 2251 return None
2252 2252 islink, isexec = mode
2253 2253 return memfilectx(repo, memctx, path, data, islink=islink,
2254 isexec=isexec, copied=copied)
2254 isexec=isexec, copysource=copysource)
2255 2255
2256 2256 return getfilectx
2257 2257
@@ -2377,7 +2377,7 b' class memfilectx(committablefilectx):'
2377 2377 See memctx and committablefilectx for more details.
2378 2378 """
2379 2379 def __init__(self, repo, changectx, path, data, islink=False,
2380 isexec=False, copied=None):
2380 isexec=False, copysource=None):
2381 2381 """
2382 2382 path is the normalized file path relative to repository root.
2383 2383 data is the file content as a string.
@@ -2394,8 +2394,8 b' class memfilectx(committablefilectx):'
2394 2394 else:
2395 2395 self._flags = ''
2396 2396 self._copied = None
2397 if copied:
2398 self._copied = (copied, nullid)
2397 if copysource:
2398 self._copied = (copysource, nullid)
2399 2399
2400 2400 def cmp(self, fctx):
2401 2401 return self.data() != fctx.data()
General Comments 0
You need to be logged in to leave comments. Login now