equal
deleted
inserted
replaced
2482 df = util.matchdate(opts["date"]) |
2482 df = util.matchdate(opts["date"]) |
2483 |
2483 |
2484 branches = opts.get('branch', []) + opts.get('only_branch', []) |
2484 branches = opts.get('branch', []) + opts.get('only_branch', []) |
2485 opts['branch'] = [repo.lookupbranch(b) for b in branches] |
2485 opts['branch'] = [repo.lookupbranch(b) for b in branches] |
2486 |
2486 |
2487 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) |
2487 displayer = cmdutil.show_changeset(ui, repo, opts, True) |
2488 def prep(ctx, fns): |
2488 def prep(ctx, fns): |
2489 rev = ctx.rev() |
2489 rev = ctx.rev() |
2490 parents = [p for p in repo.changelog.parentrevs(rev) |
2490 parents = [p for p in repo.changelog.parentrevs(rev) |
2491 if p != nullrev] |
2491 if p != nullrev] |
2492 if opts.get('no_merges') and len(parents) == 2: |
2492 if opts.get('no_merges') and len(parents) == 2: |
2515 for fn in ctx.files(): |
2515 for fn in ctx.files(): |
2516 rename = getrenamed(fn, rev) |
2516 rename = getrenamed(fn, rev) |
2517 if rename: |
2517 if rename: |
2518 copies.append((fn, rename[0])) |
2518 copies.append((fn, rename[0])) |
2519 |
2519 |
2520 displayer.show(ctx, copies=copies) |
2520 revmatchfn = None |
|
2521 if opts.get('patch') or opts.get('stat'): |
|
2522 revmatchfn = cmdutil.match(repo, fns) |
|
2523 |
|
2524 displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
2521 |
2525 |
2522 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
2526 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
2523 if count == limit: |
2527 if count == limit: |
2524 break |
2528 break |
2525 if displayer.flush(ctx.rev()): |
2529 if displayer.flush(ctx.rev()): |