Mercurial > hg
comparison hgext/graphlog.py @ 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 | 4c844f16bf39 |
children | 27457d31ae3f 25e572394f5c |
comparison
equal
deleted
inserted
replaced
10092:f1bf64abcb1b | 10097:ffa6f2eb934e |
---|---|
216 def check_unsupported_flags(opts): | 216 def check_unsupported_flags(opts): |
217 for op in ["follow", "follow_first", "date", "copies", "keyword", "remove", | 217 for op in ["follow", "follow_first", "date", "copies", "keyword", "remove", |
218 "only_merges", "user", "only_branch", "prune", "newest_first", | 218 "only_merges", "user", "only_branch", "prune", "newest_first", |
219 "no_merges", "include", "exclude"]: | 219 "no_merges", "include", "exclude"]: |
220 if op in opts and opts[op]: | 220 if op in opts and opts[op]: |
221 raise util.Abort(_("--graph option is incompatible with --%s") % op) | 221 raise util.Abort(_("--graph option is incompatible with --%s") |
222 % op.replace("_", "-")) | |
222 | 223 |
223 def generate(ui, dag, displayer, showparents, edgefn): | 224 def generate(ui, dag, displayer, showparents, edgefn): |
224 seen, state = [], asciistate() | 225 seen, state = [], asciistate() |
225 for rev, type, ctx, parents in dag: | 226 for rev, type, ctx, parents in dag: |
226 char = ctx.node() in showparents and '@' or 'o' | 227 char = ctx.node() in showparents and '@' or 'o' |