equal
deleted
inserted
replaced
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) |