[PATCH 2 of 3] rebase: create a new variable to make the next patch more legible

[Laurent Charignon]

I didn't rebase this series properly, sending a V2.

Thanks!

Laurent

> On Jan 6, 2016, at 11:03 AM, Laurent Charignon <lcharignon at fb.com> wrote:
> 
> # HG changeset patch
> # User Laurent Charignon <lcharignon at fb.com>
> # Date 1452106870 28800
> #      Wed Jan 06 11:01:10 2016 -0800
> # Node ID b237d9ad188bfffd8a42a8ace3fd1558a95ad2b3
> # Parent  c0907cb58de571baedd0c556c7364186ea8b4185
> rebase: create a new variable to make the next patch more legible
> 
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -348,11 +348,12 @@ def rebase(ui, repo, **opts):
>                 obsoletenotrebased = _computeobsoletenotrebased(repo,
>                                                                 rebaseobsrevs,
>                                                                 dest)
> +                rebaseobsskipped = set(obsoletenotrebased)
> 
>                 # - plain prune (no successor) changesets are rebased
>                 # - split changesets are not rebased if at least one of the
>                 # changeset resulting from the split is an ancestor of dest
> -                rebaseset = rebasesetrevs - set(obsoletenotrebased)
> +                rebaseset = rebasesetrevs - rebaseobsskipped
>                 if rebasesetrevs and not rebaseset:
>                     msg = _('all requested changesets have equivalents '
>                             'or were marked as obsolete')
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel