Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 14840:11b5a5d2ca8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands, merge: call setconfig on the right ui In practice this doesn't change anything since ui == repo.ui here, but setting repo.ui explicitly here is clearer since hg.merge will use repo.ui later on.
author Idan Kamara <idankk86@gmail.com>
date Tue, 05 Jul 2011 14:36:33 +0300
parents 6ba51c81ff75
children cac04f2f475b
comparison
equal deleted inserted replaced
14839:510c893a726f 14840:11b5a5d2ca8b
3585 displayer.close() 3585 displayer.close()
3586 return 0 3586 return 0
3587 3587
3588 try: 3588 try:
3589 # ui.forcemerge is an internal variable, do not document 3589 # ui.forcemerge is an internal variable, do not document
3590 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) 3590 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3591 return hg.merge(repo, node, force=opts.get('force')) 3591 return hg.merge(repo, node, force=opts.get('force'))
3592 finally: 3592 finally:
3593 ui.setconfig('ui', 'forcemerge', '') 3593 ui.setconfig('ui', 'forcemerge', '')
3594 3594
3595 @command('outgoing|out', 3595 @command('outgoing|out',