# HG changeset patch
# User push includes an xxx changeset: yyyyyyyyyy
# Date 1350600399 -7200
# Node ID 0c1185f6ddd7ed67d8421296da98315bfedb5f40
# Parent  82f1fe0308bda46d805dcaf56a2f763581da8137
obsolete: simplify push abort message

to:   push includes xxx changeset: yyyyyyyyyy

diff -r 82f1fe0308bd -r 0c1185f6ddd7 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Oct 19 00:43:44 2012 +0200
+++ b/mercurial/localrepo.py	Fri Oct 19 00:46:39 2012 +0200
@@ -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 -r 82f1fe0308bd -r 0c1185f6ddd7 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Oct 19 00:43:44 2012 +0200
+++ b/tests/test-obsolete.t	Fri Oct 19 00:46:39 2012 +0200
@@ -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