Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphlog: improve --only-branch handling
authorPatrick Mezard <patrick@mezard.eu>
Thu, 29 Mar 2012 16:55:08 +0200
changeset 16314 16ec050490fc
parent 16310 8ac2c91855cf
child 16315 f89284d72a61
graphlog: improve --only-branch handling The previous code was correct for command line as opts always contains the default empty lists for --branch and --only-branch options. But calling graphlog.revset() directly with only --only-branch set would leave it unprocessed.
hgext/graphlog.py file | annotate | diff | comparison | revisions 
--- a/hgext/graphlog.py	Thu Mar 29 22:16:56 2012 +0900
+++ b/hgext/graphlog.py	Thu Mar 29 16:55:08 2012 +0200
@@ -296,9 +296,7 @@
     opts = dict(opts)
     # branch and only_branch are really aliases and must be handled at
     # the same time
-    if 'branch' in opts and 'only_branch' in opts:
-        opts['branch'] = opts['branch'] + opts.pop('only_branch')
-
+    opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
     follow = opts.get('follow') or opts.get('follow_first')
     followfirst = opts.get('follow_first')
     if 'follow' in opts:
mercurial