Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 6007:090b1a665901

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add config item for GUI tools <tool>.gui indicates whether a tool requires a GUI to run
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Feb 2008 19:29:05 -0600
parents 3c9dbb743d20
children bb441d77df99
comparison
equal deleted inserted replaced
6006:3c9dbb743d20 6007:090b1a665901
34 ui.warn(_("couldn't find merge tool %s\n") % tmsg) 34 ui.warn(_("couldn't find merge tool %s\n") % tmsg)
35 elif symlink and not _toolbool(ui, tool, "symlink"): 35 elif symlink and not _toolbool(ui, tool, "symlink"):
36 ui.warn(_("tool %s can't handle symlinks\n") % tmsg) 36 ui.warn(_("tool %s can't handle symlinks\n") % tmsg)
37 elif binary and not _toolbool(ui, tool, "binary"): 37 elif binary and not _toolbool(ui, tool, "binary"):
38 ui.warn(_("tool %s can't handle binary\n") % tmsg) 38 ui.warn(_("tool %s can't handle binary\n") % tmsg)
39 elif not util.gui() and _toolbool(ui, tool, "gui"):
40 ui.warn(_("tool %s requires a GUI\n") % tmsg)
39 else: 41 else:
40 return True 42 return True
41 return False 43 return False
42 44
43 # HGMERGE takes precedence 45 # HGMERGE takes precedence