comparison hgext/keyword.py @ 20790:49f2d5644f04

config: set a 'source' in most cases where config don't come from file but code Some extensions set configuration settings that showed up in 'hg showconfig --debug' with 'none' as source. That was confusing. Instead, they will now tell which extension they come from. This change tries to be consistent and specify a source everywhere - also where it perhaps is less relevant.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 19 Mar 2014 02:45:14 +0100
parents 3a35ba2681ec
children 99f7e5fe35f2
comparison
equal deleted inserted replaced
20789:d19c9bdbbf35 20790:49f2d5644f04
383 383
384 fn = 'demo.txt' 384 fn = 'demo.txt'
385 tmpdir = tempfile.mkdtemp('', 'kwdemo.') 385 tmpdir = tempfile.mkdtemp('', 'kwdemo.')
386 ui.note(_('creating temporary repository at %s\n') % tmpdir) 386 ui.note(_('creating temporary repository at %s\n') % tmpdir)
387 repo = localrepo.localrepository(repo.baseui, tmpdir, True) 387 repo = localrepo.localrepository(repo.baseui, tmpdir, True)
388 ui.setconfig('keyword', fn, '') 388 ui.setconfig('keyword', fn, '', 'keyword')
389 svn = ui.configbool('keywordset', 'svn') 389 svn = ui.configbool('keywordset', 'svn')
390 # explicitly set keywordset for demo output 390 # explicitly set keywordset for demo output
391 ui.setconfig('keywordset', 'svn', svn) 391 ui.setconfig('keywordset', 'svn', svn, 'keyword')
392 392
393 uikwmaps = ui.configitems('keywordmaps') 393 uikwmaps = ui.configitems('keywordmaps')
394 if args or opts.get('rcfile'): 394 if args or opts.get('rcfile'):
395 ui.status(_('\n\tconfiguration using custom keyword template maps\n')) 395 ui.status(_('\n\tconfiguration using custom keyword template maps\n'))
396 if uikwmaps: 396 if uikwmaps:
417 ui.status(_('\n\tconfiguration using default cvs keywordset\n')) 417 ui.status(_('\n\tconfiguration using default cvs keywordset\n'))
418 kwmaps = _defaultkwmaps(ui) 418 kwmaps = _defaultkwmaps(ui)
419 if uikwmaps: 419 if uikwmaps:
420 ui.status(_('\tdisabling current template maps\n')) 420 ui.status(_('\tdisabling current template maps\n'))
421 for k, v in kwmaps.iteritems(): 421 for k, v in kwmaps.iteritems():
422 ui.setconfig('keywordmaps', k, v) 422 ui.setconfig('keywordmaps', k, v, 'keyword')
423 else: 423 else:
424 ui.status(_('\n\tconfiguration using current keyword template maps\n')) 424 ui.status(_('\n\tconfiguration using current keyword template maps\n'))
425 if uikwmaps: 425 if uikwmaps:
426 kwmaps = dict(uikwmaps) 426 kwmaps = dict(uikwmaps)
427 else: 427 else:
443 repo.dirstate.setbranch('demobranch') 443 repo.dirstate.setbranch('demobranch')
444 finally: 444 finally:
445 wlock.release() 445 wlock.release()
446 for name, cmd in ui.configitems('hooks'): 446 for name, cmd in ui.configitems('hooks'):
447 if name.split('.', 1)[0].find('commit') > -1: 447 if name.split('.', 1)[0].find('commit') > -1:
448 repo.ui.setconfig('hooks', name, '') 448 repo.ui.setconfig('hooks', name, '', 'keyword')
449 msg = _('hg keyword configuration and expansion example') 449 msg = _('hg keyword configuration and expansion example')
450 ui.note(("hg ci -m '%s'\n" % msg)) 450 ui.note(("hg ci -m '%s'\n" % msg))
451 repo.commit(text=msg) 451 repo.commit(text=msg)
452 ui.status(_('\n\tkeywords expanded\n')) 452 ui.status(_('\n\tkeywords expanded\n'))
453 ui.write(repo.wread(fn)) 453 ui.write(repo.wread(fn))