indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY AFAICT ``stats`` is always a tuple in these cases. We don't need to check if the variable has a truthy value. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2691 AFFECTED FILES hgext/rebase.py mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2301,7 +2301,7 @@ finally: repo.ui.setconfig('ui', 'forcemerge', '', 'graft') # report any conflicts - if stats and stats[3] > 0: + if stats[3] > 0: # write out state for --continue nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] repo.vfs.write('graftstate', ''.join(nodelines)) diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -490,7 +490,7 @@ 'rebase') stats = rebasenode(repo, rev, p1, base, self.state, self.collapsef, dest, wctx=self.wctx) - if stats and stats[3] > 0: + if stats[3] > 0: if self.wctx.isinmemory(): raise error.InMemoryMergeConflictsError() else: To: indygreg, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list [email protected] https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
