[PATCH stable] glog: fix "incompatible option" error message

[Greg Ward]

# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1261166742 18000
# Branch stable
# Node ID 6d3bf731802f1f26ebb51ca1fe5f8c3768be4482
# Parent  f1bf64abcb1b2bf5842acfbecc3606f8bced4d48
glog: fix "incompatible option" error message.

Options like 'only_branch' should be presented to the user as
'--only-branch'.

diff --git a/hgext/graphlog.py b/hgext/graphlog.py
--- a/hgext/graphlog.py
+++ b/hgext/graphlog.py
@@ -218,7 +218,9 @@
                "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()