Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 10963:9e314c5e6890
log -b: use opts.get() instead of assuming opts is correctly filled
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 20 Apr 2010 01:08:20 +0200 |
parents | 8d5f5122a732 |
children | 49a07f441496 |
comparison
equal
deleted
inserted
replaced
10962:8d5f5122a732 | 10963:9e314c5e6890 |
---|---|
2159 | 2159 |
2160 df = False | 2160 df = False |
2161 if opts["date"]: | 2161 if opts["date"]: |
2162 df = util.matchdate(opts["date"]) | 2162 df = util.matchdate(opts["date"]) |
2163 | 2163 |
2164 opts['branch'] += opts.get('only_branch') | 2164 branches = opts.get('branch', []) + opts.get('only_branch', []) |
2165 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] | 2165 opts['branch'] = [repo.lookupbranch(b) for b in branches] |
2166 | 2166 |
2167 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) | 2167 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) |
2168 def prep(ctx, fns): | 2168 def prep(ctx, fns): |
2169 rev = ctx.rev() | 2169 rev = ctx.rev() |
2170 parents = [p for p in repo.changelog.parentrevs(rev) | 2170 parents = [p for p in repo.changelog.parentrevs(rev) |