# HG changeset patch # User Gregory Szorc <gregory.sz...@gmail.com> # Date 1482796473 25200 # Mon Dec 26 16:54:33 2016 -0700 # Node ID f3927785d168824ac04c4eb44361337775286e01 # Parent 265102f455de6451e493024fb8a9f24d816ce1c2 filemerge: don't use mutable default argument value
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -35,8 +35,8 @@ def _toolstr(ui, tool, part, default="") def _toolbool(ui, tool, part, default=False): return ui.configbool("merge-tools", tool + "." + part, default) -def _toollist(ui, tool, part, default=[]): - return ui.configlist("merge-tools", tool + "." + part, default) +def _toollist(ui, tool, part, default=None): + return ui.configlist("merge-tools", tool + "." + part, default or []) internals = {} # Merge tools to document. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel