##// END OF EJS Templates
unamend: import "copies" module as "copiesmod" to avoid shadowing...
Martin von Zweigbergk -
r41370:7be231f5 default
parent child Browse files
Show More
@@ -25,7 +25,7 b' from mercurial import ('
25 cmdutil,
25 cmdutil,
26 commands,
26 commands,
27 context,
27 context,
28 copies,
28 copies as copiesmod,
29 error,
29 error,
30 node,
30 node,
31 obsutil,
31 obsutil,
@@ -70,7 +70,7 b' def _commitfiltered(repo, ctx, match, ke'
70 return ctx.parents()[0].node()
70 return ctx.parents()[0].node()
71
71
72 # Filter copies
72 # Filter copies
73 copied = copies.pathcopies(base, ctx)
73 copied = copiesmod.pathcopies(base, ctx)
74 copied = dict((dst, src) for dst, src in copied.iteritems()
74 copied = dict((dst, src) for dst, src in copied.iteritems()
75 if dst in files)
75 if dst in files)
76 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):
76 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):
General Comments 0
You need to be logged in to leave comments. Login now