Mercurial > hg
changeset 44361:27a78ea30b48
copy: rename `wctx` to `ctx` since it will not necessarily be working copy
Differential Revision: https://phab.mercurial-scm.org/D8032
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 26 Dec 2019 14:12:45 -0800 |
| parents | 2bd3b95fdce0 |
| children | c089a0947f3e |
| files | mercurial/cmdutil.py |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Fri Dec 20 14:03:12 2019 -0800 +++ b/mercurial/cmdutil.py Thu Dec 26 14:12:45 2019 -0800 @@ -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