Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 31389:758526333dec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: don't use mutable default argument value
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 26 Dec 2016 16:54:33 -0700
parents 84e8a6834223
children ac7aa96e4cd8
comparison
equal deleted inserted replaced
31388:9e57033fec0c 31389:758526333dec
33 return ui.config("merge-tools", tool + "." + part, default) 33 return ui.config("merge-tools", tool + "." + part, default)
34 34
35 def _toolbool(ui, tool, part, default=False): 35 def _toolbool(ui, tool, part, default=False):
36 return ui.configbool("merge-tools", tool + "." + part, default) 36 return ui.configbool("merge-tools", tool + "." + part, default)
37 37
38 def _toollist(ui, tool, part, default=[]): 38 def _toollist(ui, tool, part, default=None):
39 return ui.configlist("merge-tools", tool + "." + part, default) 39 return ui.configlist("merge-tools", tool + "." + part, default or [])
40 40
41 internals = {} 41 internals = {}
42 # Merge tools to document. 42 # Merge tools to document.
43 internalsdoc = {} 43 internalsdoc = {}
44 44