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

login
register
mail settings
Submitter Laurent Charignon
Date Jan. 12, 2016, 9:44 p.m.
Message ID <09b8308e5e443d73e81b.1452635064@lcharignon-mbp.dhcp.thefacebook.com>
Download mbox | patch
Permalink /patch/12709/
State Accepted
Delegated to: Martin von Zweigbergk
Headers show

Comments

Laurent Charignon - Jan. 12, 2016, 9:44 p.m.
# HG changeset patch
# User Laurent Charignon <lcharignon@fb.com>
# Date 1452113756 28800
#      Wed Jan 06 12:55:56 2016 -0800
# Node ID 09b8308e5e443d73e81bb488bf13789b7ef11149
# Parent  b268c1df481854a6dcb6ac3ec7bb30a6c24ba7e9
rebase: create a new variable to make the next patch more legible

Patch

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')