D344: rebase: remove "state >= revtodo" condition
quark (Jun Wu)
phabricator at mercurial-scm.org
Wed Aug 16 02:33:38 EDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbc9e075133c9: rebase: remove "state >= revtodo" condition (authored by quark).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D344?vs=778&id=981
REVISION DETAIL
https://phab.mercurial-scm.org/D344
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
@@ -445,8 +445,7 @@
else:
commitmsg = 'Collapsed revision'
for rebased in sorted(self.state):
- if rebased not in self.skipped and\
- self.state[rebased] >= revtodo:
+ if rebased not in self.skipped:
commitmsg += '\n* %s' % repo[rebased].description()
editopt = True
editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
@@ -467,8 +466,7 @@
else:
newrev = repo[newnode].rev()
for oldrev in self.state.iterkeys():
- if self.state[oldrev] >= revtodo:
- self.state[oldrev] = newrev
+ self.state[oldrev] = newrev
if 'qtip' in repo.tags():
updatemq(repo, self.state, self.skipped, **opts)
To: quark, #hg-reviewers, martinvonz
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list