Mercurial > hg > mutable-history
diff hgext/obsolete.py @ 390:54582eebeb08
obsolete: fix typos, improve messages
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Thu, 26 Jul 2012 13:40:32 +0200 (2012-07-26) |
parents | 97b75bbfacc5 |
children | 04e67d6f1913 |
line wrap: on
line diff
--- a/hgext/obsolete.py +++ b/hgext/obsolete.py @@ -371,14 +371,14 @@ """ # 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. + # Checking heads is enough, obsolete descendants are either + # obsolete or unstable. ctx = repo[h] if ctx.latecomer(): - raise util.Abort(_("push includes an latecomer changeset: %s!") + raise util.Abort(_("push includes a latecomer changeset: %s!") % ctx) if ctx.conflicting(): - raise util.Abort(_("push includes conflicting changeset: %s!") + raise util.Abort(_("push includes a conflicting changeset: %s!") % ctx) return orig(repo, remote, outgoing, *args, **kwargs) @@ -774,7 +774,8 @@ try: result = opush(remote, *args, **opts) except util.Abort, ex: - hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)") + hint = _("use 'hg stabilize' to get a stable history " + "or --force to ignore warnings") if (len(ex.args) >= 1 and ex.args[0].startswith('push includes ') and ex.hint is None):