Patchwork D5659: unamend: import "copies" module as "copiesmod" to avoid shadowing

login
register
mail settings
Submitter phabricator
Date Jan. 24, 2019, 5:10 p.m.
Message ID <71f9508f5df8cca2a273920431eb7965@localhost.localdomain>
Download mbox | patch
Permalink /patch/37979/
State Not Applicable
Headers show

Comments

phabricator - Jan. 24, 2019, 5:10 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7be231f5a4ad: unamend: import &quot;copies&quot; module as &quot;copiesmod&quot; to avoid shadowing (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5659?vs=13371&id=13408

REVISION DETAIL
  https://phab.mercurial-scm.org/D5659

AFFECTED FILES
  hgext/uncommit.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/hgext/uncommit.py b/hgext/uncommit.py
--- a/hgext/uncommit.py
+++ b/hgext/uncommit.py
@@ -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=()):