unamend: import "copies" module as "copiesmod" to avoid shadowing
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 18 Jan 2019 17:09:42 -0800
changeset 41339 7be231f5a4ad
parent 41338 c7d425f7f5c9
child 41340 c9f1fd82a826
unamend: import "copies" module as "copiesmod" to avoid shadowing Differential Revision: https://phab.mercurial-scm.org/D5659
hgext/uncommit.py
--- a/hgext/uncommit.py	Fri Jan 18 17:08:02 2019 -0800
+++ b/hgext/uncommit.py	Fri Jan 18 17:09:42 2019 -0800
@@ -25,7 +25,7 @@
     cmdutil,
     commands,
     context,
-    copies,
+    copies as copiesmod,
     error,
     node,
     obsutil,
@@ -70,7 +70,7 @@
         return ctx.parents()[0].node()
 
     # Filter copies
-    copied = copies.pathcopies(base, ctx)
+    copied = copiesmod.pathcopies(base, ctx)
     copied = dict((dst, src) for dst, src in copied.iteritems()
                   if dst in files)
     def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):