# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 2010-08-11 10:19:01
# Node ID 13921a1af02b39f2e537c8fa289244df8d3dce1b
# Parent  423ece53380ee7cb475f9f429766757749f6a070

graphlog: mark --branch as incompatible with --graph

The --only-branch option was deprecated in 0d5f139b23c1 and --branch
was added instead. But the graphlog extension was not updated to match
the change.

diff --git a/hgext/graphlog.py b/hgext/graphlog.py
--- a/hgext/graphlog.py
+++ b/hgext/graphlog.py
@@ -217,8 +217,8 @@ def get_revs(repo, rev_opt):
 
 def check_unsupported_flags(opts):
     for op in ["follow", "follow_first", "date", "copies", "keyword", "remove",
-               "only_merges", "user", "only_branch", "prune", "newest_first",
-               "no_merges", "include", "exclude"]:
+               "only_merges", "user", "branch", "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.replace("_", "-"))