# HG changeset patch # User Martin von Zweigbergk # Date 2019-01-19 01:09:42 # Node ID 7be231f5a4ad6a92efe221f3e19b20edc9883291 # Parent c7d425f7f5c9099125adbce729c93fbcb4cc186f unamend: import "copies" module as "copiesmod" to avoid shadowing Differential Revision: https://phab.mercurial-scm.org/D5659 diff --git a/hgext/uncommit.py b/hgext/uncommit.py --- a/hgext/uncommit.py +++ b/hgext/uncommit.py @@ -25,7 +25,7 @@ from mercurial import ( cmdutil, commands, context, - copies, + copies as copiesmod, error, node, obsutil, @@ -70,7 +70,7 @@ def _commitfiltered(repo, ctx, match, ke 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=()):