Mercurial > hg

diff 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
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sun Feb 03 19:29:05 2008 -0600
+++ b/mercurial/filemerge.py	Sun Feb 03 19:29:05 2008 -0600
@@ -36,6 +36,8 @@
             ui.warn(_("tool %s can't handle symlinks\n") % tmsg)
         elif binary and not _toolbool(ui, tool, "binary"):
             ui.warn(_("tool %s can't handle binary\n") % tmsg)
+        elif not util.gui() and _toolbool(ui, tool, "gui"):
+            ui.warn(_("tool %s requires a GUI\n") % tmsg)
         else:
             return True
         return False