Mercurial > hg
diff hgext/rebase.py @ 44168:1cb7ae9b0071
rebase: move some variables after an error cases where they're not needed
Differential Revision: https://phab.mercurial-scm.org/D7905
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 15 Jan 2020 17:15:45 -0800 |
parents | 4263aaab651d |
children | d4c1501225c4 |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Jan 15 10:44:23 2020 -0800 +++ b/hgext/rebase.py Wed Jan 15 17:15:45 2020 -0800 @@ -1793,14 +1793,6 @@ for i, revs in enumerate(unwanted) if revs is not None ) - base = bases[i] - - # newps[0] should match merge base if possible. Currently, if newps[i] - # is nullrev, the only case is newps[i] and newps[j] (j < i), one is - # the other's ancestor. In that case, it's fine to not swap newps here. - # (see CASE-1 and CASE-2 above) - if i != 0 and newps[i] != nullrev: - newps[0], newps[i] = newps[i], newps[0] # The merge will include unwanted revisions. Abort now. Revisit this if # we have a more advanced merge algorithm that handles multiple bases. @@ -1817,6 +1809,15 @@ % (rev, repo[rev], unwanteddesc) ) + base = bases[i] + + # newps[0] should match merge base if possible. Currently, if newps[i] + # is nullrev, the only case is newps[i] and newps[j] (j < i), one is + # the other's ancestor. In that case, it's fine to not swap newps here. + # (see CASE-1 and CASE-2 above) + if i != 0 and newps[i] != nullrev: + newps[0], newps[i] = newps[i], newps[0] + repo.ui.debug(b" future parents are %d and %d\n" % tuple(newps)) return newps[0], newps[1], base