# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1271718500 -7200
# Node ID 9e314c5e689009453cf6ffa4b0eb175e722fa837
# Parent  8d5f5122a732b1c97a60b6b2bab9bb6a0b8ef26b
log -b: use opts.get() instead of assuming opts is correctly filled

diff -r 8d5f5122a732 -r 9e314c5e6890 mercurial/commands.py
--- a/mercurial/commands.py	Mon Apr 19 17:00:02 2010 -0500
+++ b/mercurial/commands.py	Tue Apr 20 01:08:20 2010 +0200
@@ -2161,8 +2161,8 @@
     if opts["date"]:
         df = util.matchdate(opts["date"])
 
-    opts['branch'] += opts.get('only_branch')
-    opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
+    branches = opts.get('branch', []) + opts.get('only_branch', [])
+    opts['branch'] = [repo.lookupbranch(b) for b in branches]
 
     displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
     def prep(ctx, fns):