This revision was automatically updated to reflect the committed changes. Closed by commit rHGa835bf3fe40a: rebase: collapse two nested if-conditions (authored by martinvonz, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2711?vs=6699&id=6706 REVISION DETAIL https://phab.mercurial-scm.org/D2711 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -605,9 +605,8 @@ hg.updaterepo(repo, newwd, False) collapsedas = None - if not self.keepf: - if self.collapsef: - collapsedas = newnode + if self.collapsef and not self.keepf: + collapsedas = newnode clearrebased(ui, repo, self.destmap, self.state, self.skipped, collapsedas, self.keepf, fm=fm) To: martinvonz, #hg-reviewers, indygreg Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
