Commits

Patrick Mézard  committed 2c969d1

obsolete: change warning output to match mercurial core on

The new messages were introduced by hg@12fdaa30063a.

  • Participants
  • Parent commits 8c92f65
  • Branches stable

Comments (0)

Files changed (3)

File docs/tutorials/tutorial.t

   $ hg push other
   pushing to $TESTTMP/other
   searching for changes
-  abort: Trying to push unstable changeset: 9ac5d0e790a2!
+  abort: push includes an unstable changeset: 9ac5d0e790a2!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
  

File hgext/obsolete.py

         ctx =  repo[h]
         hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)")
         if ctx.unstable():
-            raise util.Abort(_("Trying to push unstable changeset: %s!") % ctx,
+            raise util.Abort(_("push includes an unstable changeset: %s!") % ctx,
                              hint=hint)
         if ctx.obsolete():
-            raise util.Abort(_("Trying to push obsolete changeset: %s!") % ctx,
+            raise util.Abort(_("push includes an  obsolete changeset: %s!") % ctx,
                              hint=hint)
         if ctx.latecomer():
-            raise util.Abort(_("Trying to push latecomer changeset: %s!") % ctx,
+            raise util.Abort(_("push includes an latecomer changeset: %s!") % ctx,
                              hint=hint)
         if ctx.conflicting():
-            raise util.Abort(_("Trying to push conflicting changeset: %s!") % ctx,
+            raise util.Abort(_("push includes conflicting changeset: %s!") % ctx,
                              hint=hint)
     ### patch remote branch map
     # do not read it this burn eyes

File tests/test-obsolete.t

   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
-  abort: Trying to push unstable changeset: a7a6f2b5d8a5!
+  abort: push includes an unstable changeset: a7a6f2b5d8a5!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
   $ hg push -f ../other-new
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
-  abort: Trying to push unstable changeset: 95de7fc6918d!
+  abort: push includes an unstable changeset: 95de7fc6918d!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
   $ hg push ../other-new -f # use f because there is unstability
   $ hg push ../other-old
   pushing to ../other-old
   searching for changes
-  abort: Trying to push unstable changeset: 909a0fb57e5d!
+  abort: push includes an unstable changeset: 909a0fb57e5d!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
   $ hg push -f ../other-old
   $ hg push ../other-new/
   pushing to ../other-new/
   searching for changes
-  abort: Trying to push latecomer changeset: 6db5e282cb91!
+  abort: push includes an latecomer changeset: 6db5e282cb91!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]