[PATCH 09 of 10 V4] obsolete: simplify push abort message
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Thu Oct 18 17:52:32 CDT 2012
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1350600399 -7200
# Node ID 86831abf8463f47eebb75288adb12d1becbc3e7f
# Parent 692654d6a957fa40d31e5726723da78a5f6f1965
obsolete: simplify push abort message
from: push includes an xxx changeset: yyyyyyyyyy
to: push includes xxx changeset: yyyyyyyyyy
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1870,8 +1870,8 @@
# then, save the iteration
if self.obsstore:
# this message are here for 80 char limit reason
- mso = _("push includes an obsolete changeset: %s!")
- msu = _("push includes an unstable changeset: %s!")
+ mso = _("push includes obsolete changeset: %s!")
+ msu = _("push includes unstable changeset: %s!")
# If we are to push if there is at least one
# obsolete or unstable changeset in missing, at
# least one of the missinghead will be obsolete or
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -453,7 +453,7 @@
$ hg push ../tmpc/ -r 'desc("original_d")'
pushing to ../tmpc/
searching for changes
- abort: push includes an obsolete changeset: 94b33453f93b!
+ abort: push includes obsolete changeset: 94b33453f93b!
[255]
refuse to push unstable changeset
@@ -461,7 +461,7 @@
$ hg push ../tmpc/
pushing to ../tmpc/
searching for changes
- abort: push includes an unstable changeset: cda648ca50f5!
+ abort: push includes unstable changeset: cda648ca50f5!
[255]
Test that extinct changeset are properly detected
More information about the Mercurial-devel
mailing list