# HG changeset patch # User Jun Wu # Date 1502440619 25200 # Node ID bc9e075133c9cf890f1ce328787dea68260bc74c # Parent ddf77c0cc169be436f9d428493059e3a0cf1f985 rebase: remove "state >= revtodo" condition Now the minimal value of state is revtodo, that condition is always true, therefore removed. Differential Revision: https://phab.mercurial-scm.org/D344 diff -r ddf77c0cc169 -r bc9e075133c9 hgext/rebase.py --- a/hgext/rebase.py Fri Aug 11 01:05:47 2017 -0700 +++ b/hgext/rebase.py Fri Aug 11 01:36:59 2017 -0700 @@ -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)