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.
--- a/hgext/graphlog.py Mon Aug 09 21:43:39 2010 +0200
+++ b/hgext/graphlog.py Wed Aug 11 12:19:01 2010 +0200
@@ -217,8 +217,8 @@
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("_", "-"))