# HG changeset patch # User Martin von Zweigbergk # Date 2019-12-26 22:12:45 # Node ID 27a78ea30b4827b3f9535cdd88c4cb2e868cf660 # Parent 2bd3b95fdce0cfe95880c26a160d3d32aa9a7bd4 copy: rename `wctx` to `ctx` since it will not necessarily be working copy Differential Revision: https://phab.mercurial-scm.org/D8032 diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1418,18 +1418,18 @@ def copy(ui, repo, pats, opts, rename=Fa targets = {} after = opts.get(b"after") dryrun = opts.get(b"dry_run") - wctx = repo[None] - pctx = wctx.p1() + ctx = repo[None] + pctx = ctx.p1() uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) def walkpat(pat): srcs = [] - m = scmutil.match(wctx, [pat], opts, globbed=True) - for abs in wctx.walk(m): + m = scmutil.match(ctx, [pat], opts, globbed=True) + for abs in ctx.walk(m): rel = uipathfn(abs) exact = m.exact(abs) - if abs not in wctx: + if abs not in ctx: if abs in pctx: if not after: if exact: @@ -1582,13 +1582,13 @@ def copy(ui, repo, pats, opts, rename=Fa # fix up dirstate scmutil.dirstatecopy( - ui, repo, wctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd + ui, repo, ctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd ) if rename and not dryrun: if not after and srcexists and not samefile: rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs') repo.wvfs.unlinkpath(abssrc, rmdir=rmdir) - wctx.forget([abssrc]) + ctx.forget([abssrc]) # pat: ossep # dest ossep