Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 27010:f4fec0940278

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Nov 2015 20:59:17 -0600
parents a4c26918fb23 ed5f20f9c22e
children ec37257341a9
comparison
equal deleted inserted replaced
27009:f5faef7e9119 27010:f4fec0940278
5678 ret = 1 5678 ret = 1
5679 finally: 5679 finally:
5680 ui.setconfig('ui', 'forcemerge', '', 'resolve') 5680 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5681 ms.commit() 5681 ms.commit()
5682 5682
5683 # replace filemerge's .orig file with our resolve file 5683 # replace filemerge's .orig file with our resolve file, but only
5684 # for files in tocomplete, ms.resolve will not overwrite 5684 # for merges that are complete
5685 # .orig -- only preresolve does 5685 if complete:
5686 try: 5686 try:
5687 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a)) 5687 util.rename(a + ".resolve",
5688 except OSError as inst: 5688 cmdutil.origpath(ui, repo, a))
5689 if inst.errno != errno.ENOENT: 5689 except OSError as inst:
5690 raise 5690 if inst.errno != errno.ENOENT:
5691 raise
5691 5692
5692 for f in tocomplete: 5693 for f in tocomplete:
5693 try: 5694 try:
5694 # resolve file 5695 # resolve file
5695 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 5696 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5698 if r: 5699 if r:
5699 ret = 1 5700 ret = 1
5700 finally: 5701 finally:
5701 ui.setconfig('ui', 'forcemerge', '', 'resolve') 5702 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5702 ms.commit() 5703 ms.commit()
5704
5705 # replace filemerge's .orig file with our resolve file
5706 a = repo.wjoin(f)
5707 util.rename(a + ".resolve", a + ".orig")
5703 5708
5704 ms.commit() 5709 ms.commit()
5705 5710
5706 if not didwork and pats: 5711 if not didwork and pats:
5707 ui.warn(_("arguments do not match paths that need resolving\n")) 5712 ui.warn(_("arguments do not match paths that need resolving\n"))