Patchwork summary: fix type of empty unresolved list

login
register
mail settings
Submitter Yuya Nishihara
Date July 7, 2017, 3:13 p.m.
Message ID <de50a2f8fd984912893b.1499440421@mimosa>
Download mbox | patch
Permalink /patch/22099/
State Accepted
Headers show

Comments

Yuya Nishihara - July 7, 2017, 3:13 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1499436784 -32400
#      Fri Jul 07 23:13:04 2017 +0900
# Node ID de50a2f8fd984912893b6aea79cd0d7ab0b83299
# Parent  e714159860fd0872ae0555bb07546aa7e9f700e0
summary: fix type of empty unresolved list

It was okay because tested as a boolean prior to calling len(), but looked
incorrect.
Sean Farley - July 7, 2017, 6:50 p.m.
Yuya Nishihara <yuya@tcha.org> writes:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1499436784 -32400
> #      Fri Jul 07 23:13:04 2017 +0900
> # Node ID de50a2f8fd984912893b6aea79cd0d7ab0b83299
> # Parent  e714159860fd0872ae0555bb07546aa7e9f700e0
> summary: fix type of empty unresolved list
>
> It was okay because tested as a boolean prior to calling len(), but looked
> incorrect.

Makes sense. Queued!

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4774,7 +4774,7 @@  def summary(ui, repo, **opts):
         s = ' '.join(e.recordtypes)
         ui.warn(
             _('warning: merge state has unsupported record types: %s\n') % s)
-        unresolved = 0
+        unresolved = []
     else:
         unresolved = list(ms.unresolved())