D10514: rewriteutil: replace "null changeset" by "the null revision" in error message
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Apr 28 15:08:20 UTC 2021
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
pulkit accepted this revision.
This revision is now accepted and ready to land.
REVISION SUMMARY
The evolve extension uses "the null revision" and we seem to use that
term much more frequently in core too.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D10514
AFFECTED FILES
mercurial/rewriteutil.py
tests/test-uncommit.t
CHANGE DETAILS
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -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]
diff --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py
--- a/mercurial/rewriteutil.py
+++ b/mercurial/rewriteutil.py
@@ -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)
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list