# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1489615912 25200
# Node ID ac7aa96e4cd86a38ddbf1ac15345b3277108fc8f
# Parent  2daeab02b4b13b4d4829c216fd0db39e9733ba0b
filemerge: explicitly tests for None

Changeset 758526333dec removed the mutable default value, but did not explicitly
tested for None. Such implicit testing can introduce semantic and performance
issue. We move to an explicit testing for None as recommended by PEP8:

https://www.python.org/dev/peps/pep-0008/#programming-recommendations

diff -r 2daeab02b4b1 -r ac7aa96e4cd8 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Wed Mar 15 15:11:04 2017 -0700
+++ b/mercurial/filemerge.py	Wed Mar 15 15:11:52 2017 -0700
@@ -36,7 +36,9 @@
     return ui.configbool("merge-tools", tool + "." + part, default)
 
 def _toollist(ui, tool, part, default=None):
-    return ui.configlist("merge-tools", tool + "." + part, default or [])
+    if default is None:
+        default = []
+    return ui.configlist("merge-tools", tool + "." + part, default)
 
 internals = {}
 # Merge tools to document.