Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 16850:9c86ef980d9e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: restore config option on correct ui
author Idan Kamara <idankk86@gmail.com>
date Mon, 04 Jun 2012 15:43:16 +0300
parents 025b3b763ba9
children 92cfde8728ac 00e1e40d709c
comparison
equal deleted inserted replaced
16844:a7ba57b10530 16850:9c86ef980d9e
2693 # ui.forcemerge is an internal variable, do not document 2693 # ui.forcemerge is an internal variable, do not document
2694 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) 2694 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2695 stats = mergemod.update(repo, ctx.node(), True, True, False, 2695 stats = mergemod.update(repo, ctx.node(), True, True, False,
2696 ctx.p1().node()) 2696 ctx.p1().node())
2697 finally: 2697 finally:
2698 ui.setconfig('ui', 'forcemerge', '') 2698 repo.ui.setconfig('ui', 'forcemerge', '')
2699 # drop the second merge parent 2699 # drop the second merge parent
2700 repo.setparents(current.node(), nullid) 2700 repo.setparents(current.node(), nullid)
2701 repo.dirstate.write() 2701 repo.dirstate.write()
2702 # fix up dirstate for copies and renames 2702 # fix up dirstate for copies and renames
2703 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) 2703 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())