# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1619546561 25200
# Node ID 7001f92e0ee95f17fea0bb0d0f1cd1d6c3c9d11e
# Parent  d55b71393907e4c937bbad9da5527f35df9a41d7
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

diff -r d55b71393907 -r 7001f92e0ee9 mercurial/rewriteutil.py
--- 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)
 
diff -r d55b71393907 -r 7001f92e0ee9 tests/test-uncommit.t
--- 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]