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.
rewriteutil: replace "null changeset" by "the null revision" in error message
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 27 Apr 2021 11:02:41 -0700
changeset 47015 7001f92e0ee9
parent 47012 d55b71393907
child 47016 8ad2f43fe37b
rewriteutil: replace "null changeset" by "the null revision" in error message The evolve extension uses "the null revision" and we seem to use that term much more frequently in core too. Differential Revision: https://phab.mercurial-scm.org/D10514
mercurial/rewriteutil.py file | annotate | diff | comparison | revisions
tests/test-uncommit.t file | annotate | diff | comparison | revisions 
--- a/mercurial/rewriteutil.py	Mon Mar 29 01:52:06 2021 +0200
+++ b/mercurial/rewriteutil.py	Tue Apr 27 11:02:41 2021 -0700
@@ -34,7 +34,7 @@
     Make sure this function is called after taking the lock.
     """
     if nullrev in revs:
-        msg = _(b"cannot %s null changeset") % action
+        msg = _(b"cannot %s the null revision") % action
         hint = _(b"no changeset checked out")
         raise error.InputError(msg, hint=hint)
 
--- a/tests/test-uncommit.t	Mon Mar 29 01:52:06 2021 +0200
+++ b/tests/test-uncommit.t	Tue Apr 27 11:02:41 2021 -0700
@@ -51,7 +51,7 @@
 Uncommit with no commits should fail
 
   $ hg uncommit
-  abort: cannot uncommit null changeset
+  abort: cannot uncommit the null revision
   (no changeset checked out)
   [10]
mercurial