This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5659

unamend: import "copies" module as "copiesmod" to avoid shadowing
ClosedPublic

Authored by martinvonz on Jan 23 2019, 1:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7be231f5a4ad: unamend: import "copies" module as "copiesmod" to avoid shadowing
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 13408

hgext/uncommit.py

from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
commands, commands,
context, context,
copies, copies as copiesmod,
error, error,
node, node,
obsutil, obsutil,
pycompat, pycompat,
registrar, registrar,
rewriteutil, rewriteutil,
scmutil, scmutil,
) )
return None return None
files = (initialfiles - exclude) files = (initialfiles - exclude)
# return the p1 so that we don't create an obsmarker later # return the p1 so that we don't create an obsmarker later
if not keepcommit: if not keepcommit:
return ctx.parents()[0].node() return ctx.parents()[0].node()
# Filter copies # Filter copies
copied = copies.pathcopies(base, ctx) copied = copiesmod.pathcopies(base, ctx)
copied = dict((dst, src) for dst, src in copied.iteritems() copied = dict((dst, src) for dst, src in copied.iteritems()
if dst in files) if dst in files)
def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()): def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):
if path not in contentctx: if path not in contentctx:
return None return None
fctx = contentctx[path] fctx = contentctx[path]
mctx = context.memfilectx(repo, memctx, fctx.path(), fctx.data(), mctx = context.memfilectx(repo, memctx, fctx.path(), fctx.data(),
fctx.islink(), fctx.islink(),