[PATCH 3 of 3] obsolete: factorise troubles detection during push

[Pierre-Yves David]

On 17 déc. 2012, at 15:41, pierre-yves.david at logilab.fr wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> # Date 1355754115 -3600
> # Node ID cf9a7e096a42dd13e6a34ddd5d730f231a946c3e
> # Parent  5eca666b0078061addf65b5f431207db21839ebd
> obsolete: factorise troubles detection during push
> 
> The use of the two methods introduced earlier allows a factorisation of the
> push code preventing push of troubled changeset.
> 
> diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
> --- a/mercurial/localrepo.py
> +++ b/mercurial/localrepo.py
> @@ -1914,27 +1914,23 @@ class localrepository(object):
>                         # if self.obsstore == False --> no obsolete
>                         # then, save the iteration
>                         if unfi.obsstore:
>                             # this message are here for 80 char limit reason
>                             mso = _("push includes obsolete changeset: %s!")
> -                            msu = _("push includes unstable changeset: %s!")
> -                            msb = _("push includes bumped changeset: %s!")
> -                            msd = _("push includes divergent changeset: %s!")
> +                            mst = "push includes %s changeset: %s!"

We need to keep the full string around for i18n tool to see them.

fixed version here: http://hg-lab.logilab.org/wip/hg/rev/3cf84ea7a35e

-- 
Pierre-Yves David