This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8033

copy: move argument validation a little earlier
ClosedPublic

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

Details

Reviewers
marmoute
durin42
Group Reviewers
hg-reviewers
Commits
rHGd8b49bf6cfec: copy: move argument validation a little earlier
Summary

Argument validation is usually done early and I will want it done
before some code that I'm about to add.

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 19696.Jan 29 2020, 6:37 PM
marmoute accepted this revision.Feb 7 2020, 3:49 PM
marmoute added a subscriber: marmoute.

This looks like a cleanup we can take anyway.

martinvonz updated this revision to Diff 20072.Feb 10 2020, 5:42 PM
martinvonz updated this revision to Diff 20085.Feb 10 2020, 6:30 PM
durin42 accepted this revision.Feb 12 2020, 2:44 PM
durin42 added a subscriber: durin42.

Oddly, this had some rejects (I didn't look why) but i"d be happy to see this earlier in the series.

This revision is now accepted and ready to land.Feb 12 2020, 2:44 PM
martinvonz removed a child revision: D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy.Feb 12 2020, 5:25 PM
martinvonz added a child revision: D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy.
In D8033#120581, @durin42 wrote:

Oddly, this had some rejects (I didn't look why) but i"d be happy to see this earlier in the series.

I moved some revisions around, but it wasn't trivial to move this one. I don't mind waiting until the parents are accepted anyway.

martinvonz updated this revision to Diff 20193.Feb 13 2020, 2:09 PM
martinvonz updated this revision to Diff 20232.Feb 14 2020, 6:19 PM

fixed stale uses of -r in commit message and transient code

martinvonz added a commit: rHGd8b49bf6cfec: copy: move argument validation a little earlier.Feb 15 2020, 2:12 PM
Closed by commit rHGd8b49bf6cfec: copy: move argument validation a little earlier (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (13 lines)

Diff 20243

mercurial/cmdutil.py

scmutil.movedirstate(repo, repo[new_node]) scmutil.movedirstate(repo, repo[new_node])
replacements = {ctx.node(): [new_node]} replacements = {ctx.node(): [new_node]}
scmutil.cleanupnodes( scmutil.cleanupnodes(
repo, replacements, b'uncopy', fixphase=True repo, replacements, b'uncopy', fixphase=True
) )
return return
pats = scmutil.expandpats(pats)
if not pats:
raise error.Abort(_(b'no source or destination specified'))
if len(pats) == 1:
raise error.Abort(_(b'no destination specified'))
dest = pats.pop()
if opts.get(b'at_rev'): if opts.get(b'at_rev'):
raise error.Abort(_("--at-rev is only supported with --forget")) raise error.Abort(_("--at-rev is only supported with --forget"))
def walkpat(pat): def walkpat(pat):
srcs = [] srcs = []
m = scmutil.match(ctx, [pat], opts, globbed=True) m = scmutil.match(ctx, [pat], opts, globbed=True)
for abs in ctx.walk(m): for abs in ctx.walk(m):
rel = uipathfn(abs) rel = uipathfn(abs)
if destdirexists: if destdirexists:
res = lambda p: os.path.join( res = lambda p: os.path.join(
dest, os.path.basename(util.localpath(p)) dest, os.path.basename(util.localpath(p))
) )
else: else:
res = lambda p: dest res = lambda p: dest
return res return res
pats = scmutil.expandpats(pats)
if not pats:
raise error.Abort(_(b'no source or destination specified'))
if len(pats) == 1:
raise error.Abort(_(b'no destination specified'))
dest = pats.pop()
destdirexists = os.path.isdir(dest) and not os.path.islink(dest) destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
if not destdirexists: if not destdirexists:
if len(pats) > 1 or matchmod.patkind(pats[0]): if len(pats) > 1 or matchmod.patkind(pats[0]):
raise error.Abort( raise error.Abort(
_( _(
b'with multiple sources, destination must be an ' b'with multiple sources, destination must be an '
b'existing directory' b'existing directory'
) )