# HG changeset patch
# User Patrick Mezard <patrick@mezard.eu>
# Date 1333032908 -7200
# Node ID 16ec050490fc2207f6c243f425148e915c0c96e6
# Parent  8ac2c91855cf3caed00289ee4ea2a4c4b2e4984c
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.

diff -r 8ac2c91855cf -r 16ec050490fc hgext/graphlog.py
--- 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: