Mercurial > hg

diff hgext/rebase.py @ 36960:66651ec259ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 05 Mar 2018 00:18:07 -0500
parents 61600b024a70
children 795eb53f1d3e
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Mar 07 19:57:50 2018 -0800
+++ b/hgext/rebase.py	Mon Mar 05 00:18:07 2018 -0500
@@ -488,7 +488,7 @@
                 with ui.configoverride(overrides, 'rebase'):
                     stats = rebasenode(repo, rev, p1, base, self.collapsef,
                                        dest, wctx=self.wctx)
-                    if stats and stats[3] > 0:
+                    if stats[3] > 0:
                         if self.wctx.isinmemory():
                             raise error.InMemoryMergeConflictsError()
                         else: