# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1520357964 28800
# Node ID a835bf3fe40af99bc21c1067d2abe7ff62cf71f0
# Parent  1004fd71810fd280772dd43df91b982e8b2ca14a
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

diff -r 1004fd71810f -r a835bf3fe40a hgext/rebase.py
--- 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)