Mercurial > hg-stable
changeset 45826:f90943d753ef
fix: suggest --source instead of --rev on empty revset
`--source` is the recommended flag for regular users (`--rev` is
available for advanced users).
Differential Revision: https://phab.mercurial-scm.org/D9224
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 16 Oct 2020 15:05:43 -0700 |
| parents | 7252f5237352 |
| children | 15a98880cc07 |
| files | hgext/fix.py tests/test-fix.t |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fix.py Mon Sep 28 17:13:15 2020 +0200 +++ b/hgext/fix.py Fri Oct 16 15:05:43 2020 -0700 @@ -439,7 +439,7 @@ raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") if not revs: raise error.Abort( - b'no changesets specified', hint=b'use --rev or --working-dir' + b'no changesets specified', hint=b'use --source or --working-dir' ) return revs
--- a/tests/test-fix.t Mon Sep 28 17:13:15 2020 +0200 +++ b/tests/test-fix.t Fri Oct 16 15:05:43 2020 -0700 @@ -246,15 +246,15 @@ $ hg fix abort: no changesets specified - (use --rev or --working-dir) + (use --source or --working-dir) [255] $ hg fix --whole abort: no changesets specified - (use --rev or --working-dir) + (use --source or --working-dir) [255] $ hg fix --base 0 abort: no changesets specified - (use --rev or --working-dir) + (use --source or --working-dir) [255] Fixing a public revision isn't allowed. It should abort early enough that