Mercurial > public > mercurial-scm > hg

comparison hgext/extdiff.py @ 34777:bb2525871d95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'exdiff.opts.*' config
author Boris Feld <boris.feld@octobus.net>
date Sat, 14 Oct 2017 00:33:57 +0200
parents 9fd9f91b0c43
children bf138446ac2f
comparison
equal deleted inserted replaced
34776:48d2b396cf6c 34777:bb2525871d95
82 util, 82 util,
83 ) 83 )
84 84
85 cmdtable = {} 85 cmdtable = {}
86 command = registrar.command(cmdtable) 86 command = registrar.command(cmdtable)
87
88 configtable = {}
89 configitem = registrar.configitem(configtable)
90
91 configitem('extdiff', r'opts\..*',
92 default='',
93 generic=True,
94 )
95
87 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for 96 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
88 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should 97 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
89 # be specifying the version(s) of Mercurial they are tested with, or 98 # be specifying the version(s) of Mercurial they are tested with, or
90 # leave the attribute unspecified. 99 # leave the attribute unspecified.
91 testedwith = 'ships-with-hg-core' 100 testedwith = 'ships-with-hg-core'
367 cmd = cmd[4:] 376 cmd = cmd[4:]
368 if not path: 377 if not path:
369 path = util.findexe(cmd) 378 path = util.findexe(cmd)
370 if path is None: 379 if path is None:
371 path = filemerge.findexternaltool(ui, cmd) or cmd 380 path = filemerge.findexternaltool(ui, cmd) or cmd
372 diffopts = ui.config('extdiff', 'opts.' + cmd, '') 381 diffopts = ui.config('extdiff', 'opts.' + cmd)
373 cmdline = util.shellquote(path) 382 cmdline = util.shellquote(path)
374 if diffopts: 383 if diffopts:
375 cmdline += ' ' + diffopts 384 cmdline += ' ' + diffopts
376 elif cmd.startswith('opts.'): 385 elif cmd.startswith('opts.'):
377 continue 386 continue