--- a/hgext/graphlog.py Wed Apr 11 11:14:07 2012 +0200
+++ b/hgext/graphlog.py Wed Apr 11 11:17:26 2012 +0200
@@ -306,6 +306,7 @@
# branch and only_branch are really aliases and must be handled at
# the same time
opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
+ opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
# pats/include/exclude are passed to match.match() directly in
# _matchfile() revset but walkchangerevs() builds its matcher with
# scmutil.match(). The difference is input pats are globbed on
--- a/tests/test-glog.t Wed Apr 11 11:14:07 2012 +0200
+++ b/tests/test-glog.t Wed Apr 11 11:17:26 2012 +0200
@@ -1464,7 +1464,7 @@
abort: unknown revision 'not-a-branch'!
abort: unknown revision 'not-a-branch'!
abort: unknown revision 'not-a-branch'!
- $ testlog -b default -b branch --only-branch branch
+ $ testlog -b 35 -b 36 --only-branch branch
[]
(group
(group