changeset 2778:766b38594ded

precheck: use 'changesets' in the message instead of 'revisions' This match the message `hg commit --amend` issue in core.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 24 Jul 2017 01:04:40 +0200
parents 7d86d88b2fa8
children f51efb2bb8c9
files hgext3rd/evolve/rewriteutil.py tests/test-fold.t tests/test-metaedit.t
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/rewriteutil.py	Sun Jul 23 19:35:36 2017 +0200
+++ b/hgext3rd/evolve/rewriteutil.py	Mon Jul 24 01:04:40 2017 +0200
@@ -37,7 +37,7 @@
     <action> can be used to control the commit message.
     """
     if repo.revs('%ld and public()', revs):
-        raise error.Abort(_("cannot %s public revisions") % action)
+        raise error.Abort(_("cannot %s public changesets") % action)
 
 def bookmarksupdater(repo, oldid, tr):
     """Return a callable update(newid) updating the current bookmark
--- a/tests/test-fold.t	Sun Jul 23 19:35:36 2017 +0200
+++ b/tests/test-fold.t	Mon Jul 24 01:04:40 2017 +0200
@@ -73,7 +73,7 @@
   [255]
   $ hg phase --public 0
   $ hg fold --from -r 0
-  abort: cannot fold public revisions
+  abort: cannot fold public changesets
   [255]
 
 Test actual folding
--- a/tests/test-metaedit.t	Sun Jul 23 19:35:36 2017 +0200
+++ b/tests/test-metaedit.t	Mon Jul 24 01:04:40 2017 +0200
@@ -103,7 +103,7 @@
   abort: revisions must be specified with --fold
   [255]
   $ hg metaedit -r 0 --fold
-  abort: cannot fold public revisions
+  abort: cannot fold public changesets
   [255]
   $ hg metaedit 'desc(C) + desc(F)' --fold
   abort: cannot fold non-linear revisions (multiple roots given)