This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10697

rename: add hint about --at-rev if source file doesn't exist
ClosedPublic

Authored by martinvonz on May 7 2021, 11:46 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5ffc6c18fb96: rename: add hint about --at-rev if source file doesn't exist
Summary

It's quite common that users want to record copy (rename) information
after committing the working copy changes (i.e. an added and a deleted
file). When they try hg mv [--after] <src> <dst>, that just fails
because the source file doesn't exist. It seems helpful if we can
point them to --at-rev=. in this case.

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.May 7 2021, 11:46 AM
martinvonz added a commit: rHG5ffc6c18fb96: rename: add hint about --at-rev if source file doesn't exist.May 7 2021, 10:11 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5ffc6c18fb96: rename: add hint about --at-rev if source file doesn't exist (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27767

mercurial/cmdutil.py

tfn = targetpathafterfn tfn = targetpathafterfn
copylist = [] copylist = []
for pat in pats: for pat in pats:
srcs = walkpat(pat) srcs = walkpat(pat)
if not srcs: if not srcs:
continue continue
copylist.append((tfn(pat, dest, srcs), srcs)) copylist.append((tfn(pat, dest, srcs), srcs))
if not copylist: if not copylist:
raise error.InputError(_(b'no files to copy')) hint = None
if rename:
hint = _(b'maybe you meant to use --after --at-rev=.')
raise error.InputError(_(b'no files to copy'), hint=hint)
errors = 0 errors = 0
for targetpath, srcs in copylist: for targetpath, srcs in copylist:
for abssrc, relsrc, exact in srcs: for abssrc, relsrc, exact in srcs:
if copyfile(abssrc, relsrc, targetpath(abssrc), exact): if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
errors += 1 errors += 1
return errors != 0 return errors != 0

tests/test-copy.t

$ cd part2 $ cd part2
$ hg init $ hg init
$ echo foo > foo $ echo foo > foo
should fail - foo is not managed should fail - foo is not managed
$ hg mv foo bar $ hg mv foo bar
foo: not copying - file is not managed foo: not copying - file is not managed
abort: no files to copy abort: no files to copy
(maybe you meant to use --after --at-rev=.)
[10] [10]
$ hg st -A $ hg st -A
? foo ? foo
respects ui.relative-paths respects ui.relative-paths
$ mkdir dir $ mkdir dir
$ cd dir $ cd dir
$ hg mv ../foo ../bar $ hg mv ../foo ../bar
../foo: not copying - file is not managed ../foo: not copying - file is not managed
abort: no files to copy abort: no files to copy
(maybe you meant to use --after --at-rev=.)
[10] [10]
$ hg mv ../foo ../bar --config ui.relative-paths=yes $ hg mv ../foo ../bar --config ui.relative-paths=yes
../foo: not copying - file is not managed ../foo: not copying - file is not managed
abort: no files to copy abort: no files to copy
(maybe you meant to use --after --at-rev=.)
[10] [10]
$ hg mv ../foo ../bar --config ui.relative-paths=no $ hg mv ../foo ../bar --config ui.relative-paths=no
foo: not copying - file is not managed foo: not copying - file is not managed
abort: no files to copy abort: no files to copy
(maybe you meant to use --after --at-rev=.)
[10] [10]
$ cd .. $ cd ..
$ rmdir dir $ rmdir dir
$ hg add foo $ hg add foo
dry-run; print a warning that this is not a real copy; foo is added dry-run; print a warning that this is not a real copy; foo is added
$ hg mv --dry-run foo bar $ hg mv --dry-run foo bar
foo has not been committed yet, so no copy data will be stored for bar. foo has not been committed yet, so no copy data will be stored for bar.
$ hg st -A $ hg st -A

tests/test-remotefilelog-prefetch.t

[1] [1]
$ hg mv x x2 $ hg mv x x2
x2: not overwriting - file exists x2: not overwriting - file exists
('hg rename --after' to record the rename) ('hg rename --after' to record the rename)
[1] [1]
$ hg mv z2 z3 $ hg mv z2 z3
z2: not copying - file is not managed z2: not copying - file is not managed
abort: no files to copy abort: no files to copy
(maybe you meant to use --after --at-rev=.)
[10] [10]
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
.. The following output line about files fetches is globed because it is .. The following output line about files fetches is globed because it is
.. flaky, the core the test is checked when checking the cache dir, so .. flaky, the core the test is checked when checking the cache dir, so
.. hopefully this flakyness is not hiding any actual bug. .. hopefully this flakyness is not hiding any actual bug.
$ hg revert -a -r 1 || true $ hg revert -a -r 1 || true
? files fetched over 1 fetches - (? misses, 0.00% hit ratio) over * (glob) ? files fetched over 1 fetches - (? misses, 0.00% hit ratio) over * (glob)
abort: z2@109c3a557a73: not found in manifest (?) abort: z2@109c3a557a73: not found in manifest (?)