This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8032

copy: rename `wctx` to `ctx` since it will not necessarily be working copy
ClosedPublic

Authored by martinvonz on Jan 28 2020, 6:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG27a78ea30b48: copy: rename `wctx` to `ctx` since it will not necessarily be working copy

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.

Event Timeline

martinvonz created this revision.Jan 28 2020, 6:51 PM
martinvonz updated this revision to Diff 19695.Jan 29 2020, 6:37 PM
martinvonz updated this revision to Diff 20071.Feb 10 2020, 5:42 PM
martinvonz updated this revision to Diff 20084.Feb 10 2020, 6:30 PM
martinvonz updated this revision to Diff 20194.Feb 13 2020, 2:09 PM
martinvonz added a commit: rHG27a78ea30b48: copy: rename `wctx` to `ctx` since it will not necessarily be working copy.Feb 13 2020, 3:28 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG27a78ea30b48: copy: rename `wctx` to `ctx` since it will not necessarily be working copy (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (14 lines)

Diff 20197

mercurial/cmdutil.py

# called with the repo lock held # called with the repo lock held
# #
# hgsep => pathname that uses "/" to separate directories # hgsep => pathname that uses "/" to separate directories
# ossep => pathname that uses os.sep to separate directories # ossep => pathname that uses os.sep to separate directories
cwd = repo.getcwd() cwd = repo.getcwd()
targets = {} targets = {}
after = opts.get(b"after") after = opts.get(b"after")
dryrun = opts.get(b"dry_run") dryrun = opts.get(b"dry_run")
wctx = repo[None] ctx = repo[None]
pctx = wctx.p1() pctx = ctx.p1()
uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
def walkpat(pat): def walkpat(pat):
srcs = [] srcs = []
m = scmutil.match(wctx, [pat], opts, globbed=True) m = scmutil.match(ctx, [pat], opts, globbed=True)
for abs in wctx.walk(m): for abs in ctx.walk(m):
rel = uipathfn(abs) rel = uipathfn(abs)
exact = m.exact(abs) exact = m.exact(abs)
if abs not in wctx: if abs not in ctx:
if abs in pctx: if abs in pctx:
if not after: if not after:
if exact: if exact:
ui.warn( ui.warn(
_( _(
b'%s: not copying - file has been marked ' b'%s: not copying - file has been marked '
b'for remove\n' b'for remove\n'
) )
ui.status(_(b'moving %s to %s\n') % (relsrc, reltarget)) ui.status(_(b'moving %s to %s\n') % (relsrc, reltarget))
else: else:
ui.status(_(b'copying %s to %s\n') % (relsrc, reltarget)) ui.status(_(b'copying %s to %s\n') % (relsrc, reltarget))
targets[abstarget] = abssrc targets[abstarget] = abssrc
# fix up dirstate # fix up dirstate
scmutil.dirstatecopy( 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 rename and not dryrun:
if not after and srcexists and not samefile: if not after and srcexists and not samefile:
rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs') rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
repo.wvfs.unlinkpath(abssrc, rmdir=rmdir) repo.wvfs.unlinkpath(abssrc, rmdir=rmdir)
wctx.forget([abssrc]) ctx.forget([abssrc])
# pat: ossep # pat: ossep
# dest ossep # dest ossep
# srcs: list of (hgsep, hgsep, ossep, bool) # srcs: list of (hgsep, hgsep, ossep, bool)
# return: function that takes hgsep and returns ossep # return: function that takes hgsep and returns ossep
def targetpathfn(pat, dest, srcs): def targetpathfn(pat, dest, srcs):
if os.path.isdir(pat): if os.path.isdir(pat):
abspfx = pathutil.canonpath(repo.root, cwd, pat) abspfx = pathutil.canonpath(repo.root, cwd, pat)