D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Feb 13 20:28:38 UTC 2020
Closed by commit rHG27a78ea30b48: copy: rename `wctx` to `ctx` since it will not necessarily be working copy (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D8032?vs=20194&id=20197#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8032?vs=20194&id=20197
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8032/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8032
AFFECTED FILES
mercurial/cmdutil.py
CHANGE DETAILS
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1418,18 +1418,18 @@
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 @@
# 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
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list