changeset 10097:ffa6f2eb934e stable

glog: fix "incompatible option" error message. Options like 'only_branch' should be presented to the user as '--only-branch'.
author Greg Ward <greg-hg@gerg.ca>
date Fri, 18 Dec 2009 15:05:42 -0500
parents f1bf64abcb1b
children c7eeec114d99 f5e46dfb38c7
files hgext/graphlog.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/graphlog.py	Wed Dec 16 23:59:50 2009 +0100
+++ b/hgext/graphlog.py	Fri Dec 18 15:05:42 2009 -0500
@@ -218,7 +218,8 @@
                "only_merges", "user", "only_branch", "prune", "newest_first",
                "no_merges", "include", "exclude"]:
         if op in opts and opts[op]:
-            raise util.Abort(_("--graph option is incompatible with --%s") % op)
+            raise util.Abort(_("--graph option is incompatible with --%s")
+                             % op.replace("_", "-"))
 
 def generate(ui, dag, displayer, showparents, edgefn):
     seen, state = [], asciistate()