changeset 11776:13921a1af02b stable

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.
author Martin Geisler <mg@aragost.com>
date Wed, 11 Aug 2010 12:19:01 +0200
parents 423ece53380e
children 9299b98041e8
files hgext/graphlog.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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("_", "-"))