Mercurial > hg
changeset 36774:a835bf3fe40a
rebase: collapse two nested if-conditions
Also change the order since it feel to me like it's more about
--collapse than it is about --keep.
Differential Revision: https://phab.mercurial-scm.org/D2711
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 06 Mar 2018 09:39:24 -0800 |
| parents | 1004fd71810f |
| children | 6dab3bdb1f00 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Mar 01 20:12:25 2018 -0800 +++ b/hgext/rebase.py Tue Mar 06 09:39:24 2018 -0800 @@ -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)