Commits

Pierre-Yves David committed 1525b24

obsolete: doc punch the hint about hg stabilize into the push error message.

The goal is to ease the transposition of to default where half of the message
may be raised by core directly.

  • Participants
  • Parent commits 2c969d1

Comments (0)

Files changed (1)

hgext/obsolete.py

     * patch remote to ignore obsolete heads on remote
     """
     # do not push instability
-    for h in outgoing.missingheads:
-        # checking heads only is enought because any thing base on obsolete
-        # changeset is either obsolete or unstable.
-        ctx =  repo[h]
+    try:
+        for h in outgoing.missingheads:
+            # checking heads only is enought because any thing base on obsolete
+            # changeset is either obsolete or unstable.
+            ctx =  repo[h]
+            if ctx.unstable():
+                raise util.Abort(_("push includes an unstable changeset: %s!")
+                                 % ctx)
+            if ctx.obsolete():
+                raise util.Abort(_("push includes an  obsolete changeset: %s!")
+                                 % ctx)
+            if ctx.latecomer():
+                raise util.Abort(_("push includes an latecomer changeset: %s!")
+                                 % ctx)
+            if ctx.conflicting():
+                raise util.Abort(_("push includes conflicting changeset: %s!")
+                                 % ctx)
+    except util.Abort, ex:
         hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)")
-        if ctx.unstable():
-            raise util.Abort(_("push includes an unstable changeset: %s!") % ctx,
-                             hint=hint)
-        if ctx.obsolete():
-            raise util.Abort(_("push includes an  obsolete changeset: %s!") % ctx,
-                             hint=hint)
-        if ctx.latecomer():
-            raise util.Abort(_("push includes an latecomer changeset: %s!") % ctx,
-                             hint=hint)
-        if ctx.conflicting():
-            raise util.Abort(_("push includes conflicting changeset: %s!") % ctx,
-                             hint=hint)
+        if (len(ex.args) >= 1
+            and ex.args[0].startswith('push includes ')
+            and ex.hint is None):
+            ex.hint = hint
+        raise
     ### patch remote branch map
     # do not read it this burn eyes
     try: