D2711: rebase: collapse two nested if-conditions
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Mar 7 18:24:00 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Also change the order since it feel to me like it's more about
--collapse than it is about --keep.
REPOSITORY
rHG Mercurial
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
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list