comparison hgext/rebase.py @ 36960:66651ec259ea

commands: don't check for merge.update() truthiness

AFAICT ``stats`` is always a tuple in these cases. We don't
need to check if the variable has a truthy value.

Differential Revision: https://phab.mercurial-scm.org/D2691

36959:43815d87c6aa

            else:
                overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
                with ui.configoverride(overrides, 'rebase'):
                    stats = rebasenode(repo, rev, p1, base, self.collapsef,
                                       dest, wctx=self.wctx)
                    if stats and stats[3] > 0:
                        if self.wctx.isinmemory():
                            raise error.InMemoryMergeConflictsError()
                        else:
                            raise error.InterventionRequired(
                                _('unresolved conflicts (see hg '

36960:66651ec259ea

            else:
                overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
                with ui.configoverride(overrides, 'rebase'):
                    stats = rebasenode(repo, rev, p1, base, self.collapsef,
                                       dest, wctx=self.wctx)
                    if stats[3] > 0:
                        if self.wctx.isinmemory():
                            raise error.InMemoryMergeConflictsError()
                        else:
                            raise error.InterventionRequired(
                                _('unresolved conflicts (see hg '