# HG changeset patch # User Sushil khanchi # Date 1577043225 -19800 # Node ID 6c0797ec50b615c267a01bb8987990f12c9c567b # Parent a1cf66165e69273d9b1dd39f12000d225ea3f1a1 evolve: add quotes around the action in msg of pre-checking diff -r a1cf66165e69 -r 6c0797ec50b6 hgext3rd/evolve/rewriteutil.py --- a/hgext3rd/evolve/rewriteutil.py Wed Dec 04 21:06:39 2019 +0530 +++ b/hgext3rd/evolve/rewriteutil.py Mon Dec 23 01:03:45 2019 +0530 @@ -58,7 +58,7 @@ can be used to control the commit message. """ if node.nullrev in revs: - msg = _(b"cannot %s the null revision") % (action) + msg = _(b"cannot '%s' the null revision") % (action) hint = _(b"no changeset checked out") raise error.Abort(msg, hint=hint) if any(util.safehasattr(r, 'rev') for r in revs): @@ -68,7 +68,7 @@ publicrevs = repo.revs(b'%ld and public()', revs) if publicrevs: summary = _formatrevs(repo, publicrevs) - msg = _(b"cannot %s public changesets: %s") % (action, summary) + msg = _(b"cannot '%s' public changesets: %s") % (action, summary) hint = _(b"see 'hg help phases' for details") raise error.Abort(msg, hint=hint) newunstable = disallowednewunstable(repo, revs) diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-amend-patch.t --- a/tests/test-amend-patch.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-amend-patch.t Mon Dec 23 01:03:45 2019 +0530 @@ -654,7 +654,7 @@ () public $ HGEDITOR=cat hg amend --patch - abort: cannot amend public changesets: 36454bda1fdb + abort: cannot 'amend' public changesets: 36454bda1fdb (see 'hg help phases' for details) [255] diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-evolve.t --- a/tests/test-evolve.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-evolve.t Mon Dec 23 01:03:45 2019 +0530 @@ -144,7 +144,7 @@ $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' 1 public $ hg prune 1 - abort: cannot prune public changesets: 7c3bad9141dc + abort: cannot 'prune' public changesets: 7c3bad9141dc (see 'hg help phases' for details) [255] $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-fold.t --- a/tests/test-fold.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-fold.t Mon Dec 23 01:03:45 2019 +0530 @@ -52,7 +52,7 @@ Test various error case $ hg fold --exact null:: - abort: cannot fold the null revision + abort: cannot 'fold' the null revision (no changeset checked out) [255] $ hg fold @@ -86,7 +86,7 @@ [255] $ hg phase --public 0 $ hg fold --from -r 0 - abort: cannot fold public changesets: 1ea73414a91b + abort: cannot 'fold' public changesets: 1ea73414a91b (see 'hg help phases' for details) [255] diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-metaedit.t --- a/tests/test-metaedit.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-metaedit.t Mon Dec 23 01:03:45 2019 +0530 @@ -64,14 +64,14 @@ $ hg update --clean . 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg metaedit -r 0 - abort: cannot metaedit public changesets: ea207398892e + abort: cannot 'metaedit' public changesets: ea207398892e (see 'hg help phases' for details) [255] $ hg metaedit --fold abort: revisions must be specified with --fold [255] $ hg metaedit -r 0 --fold - abort: cannot fold public changesets: ea207398892e + abort: cannot 'fold' public changesets: ea207398892e (see 'hg help phases' for details) [255] $ hg metaedit 'desc(C) + desc(F)' --fold diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-pick.t --- a/tests/test-pick.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-pick.t Mon Dec 23 01:03:45 2019 +0530 @@ -287,7 +287,7 @@ $ hg phase -r 7c15c05db6fa -p $ hg pick -r 7c15c05db6fa - abort: cannot pick public changesets: 7c15c05db6fa + abort: cannot 'pick' public changesets: 7c15c05db6fa (see 'hg help phases' for details) [255] diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-prune.t --- a/tests/test-prune.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-prune.t Mon Dec 23 01:03:45 2019 +0530 @@ -92,7 +92,7 @@ cannot prune public changesets $ hg prune 0 - abort: cannot prune public changesets: 1f0dee641bb7 + abort: cannot 'prune' public changesets: 1f0dee641bb7 (see 'hg help phases' for details) [255] $ hg debugobsolete diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-sharing.t --- a/tests/test-sharing.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-sharing.t Mon Dec 23 01:03:45 2019 +0530 @@ -163,7 +163,7 @@ Now that the fix is public, we cannot amend it any more. $ hg amend -m 'fix bug 37' - abort: cannot amend public changesets: 7b49f864d655 + abort: cannot 'amend' public changesets: 7b49f864d655 (see 'hg help phases' for details) [255] diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-split.t --- a/tests/test-split.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-split.t Mon Dec 23 01:03:45 2019 +0530 @@ -148,7 +148,7 @@ 0: draft $ hg phase --rev 'desc("_a")' --public $ hg split --rev 'desc("_a")' - abort: cannot split public changesets: 135f39f4bd78 + abort: cannot 'split' public changesets: 135f39f4bd78 (see 'hg help phases' for details) [255] $ hg phase --rev 'desc("_a")' --draft --force diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-touch.t --- a/tests/test-touch.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-touch.t Mon Dec 23 01:03:45 2019 +0530 @@ -170,7 +170,7 @@ $ hg phase --public -r 2 $ hg touch 2 - abort: cannot touch public changesets: * (glob) + abort: cannot 'touch' public changesets: * (glob) (see 'hg help phases' for details) [255] $ hg touch --duplicate 2 diff -r a1cf66165e69 -r 6c0797ec50b6 tests/test-uncommit.t --- a/tests/test-uncommit.t Wed Dec 04 21:06:39 2019 +0530 +++ b/tests/test-uncommit.t Mon Dec 23 01:03:45 2019 +0530 @@ -15,7 +15,7 @@ Cannot uncommit null changeset $ hg uncommit - abort: cannot uncommit the null revision + abort: cannot 'uncommit' the null revision (no changeset checked out) [255] @@ -25,7 +25,7 @@ $ hg ci -Am adda a $ hg phase --public . $ hg uncommit - abort: cannot uncommit public changesets: 07f494440405 + abort: cannot 'uncommit' public changesets: 07f494440405 (see 'hg help phases' for details) [255] $ hg phase --force --draft .