Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename: add hint about --at-rev if source file doesn't exist
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 07 May 2021 08:38:17 -0700
changeset 47127 5ffc6c18fb96
parent 47126 ecfe0819ada5
child 47128 bea4717415c0
rename: add hint about --at-rev if source file doesn't exist 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. Differential Revision: https://phab.mercurial-scm.org/D10697
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
tests/test-copy.t file | annotate | diff | comparison | revisions
tests/test-remotefilelog-prefetch.t file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Fri Apr 30 20:21:56 2021 +0200
+++ b/mercurial/cmdutil.py	Fri May 07 08:38:17 2021 -0700
@@ -1851,7 +1851,10 @@
             continue
         copylist.append((tfn(pat, dest, srcs), srcs))
     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
     for targetpath, srcs in copylist:
--- a/tests/test-copy.t	Fri Apr 30 20:21:56 2021 +0200
+++ b/tests/test-copy.t	Fri May 07 08:38:17 2021 -0700
@@ -115,6 +115,7 @@
   $ hg mv foo bar
   foo: not copying - file is not managed
   abort: no files to copy
+  (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg st -A
   ? foo
@@ -124,14 +125,17 @@
   $ hg mv ../foo ../bar
   ../foo: not copying - file is not managed
   abort: no files to copy
+  (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg mv ../foo ../bar --config ui.relative-paths=yes
   ../foo: not copying - file is not managed
   abort: no files to copy
+  (maybe you meant to use --after --at-rev=.)
   [10]
   $ hg mv ../foo ../bar --config ui.relative-paths=no
   foo: not copying - file is not managed
   abort: no files to copy
+  (maybe you meant to use --after --at-rev=.)
   [10]
   $ cd ..
   $ rmdir dir
--- a/tests/test-remotefilelog-prefetch.t	Fri Apr 30 20:21:56 2021 +0200
+++ b/tests/test-remotefilelog-prefetch.t	Fri May 07 08:38:17 2021 -0700
@@ -237,6 +237,7 @@
   $ hg mv z2 z3
   z2: not copying - file is not managed
   abort: no files to copy
+  (maybe you meant to use --after --at-rev=.)
   [10]
   $ find $CACHEDIR -type f | sort
 .. The following output line about files fetches is globed because it is
mercurial