Show More
@@ -3594,8 +3594,9 b' def grep(ui, repo, pattern, *pats, **opt' | |||
|
3594 | 3594 | def prep(ctx, fns): |
|
3595 | 3595 | rev = ctx.rev() |
|
3596 | 3596 | pctx = ctx.p1() |
|
3597 | matches.setdefault(rev, {}) | |
|
3598 | if diff: | |
|
3597 | 3599 | parent = pctx.rev() |
|
3598 | matches.setdefault(rev, {}) | |
|
3599 | 3600 | matches.setdefault(parent, {}) |
|
3600 | 3601 | files = revfiles.setdefault(rev, []) |
|
3601 | 3602 | for fn in fns: |
@@ -3620,11 +3621,14 b' def grep(ui, repo, pattern, *pats, **opt' | |||
|
3620 | 3621 | content = get_file_content(fn, flog, fnode, ctx, rev) |
|
3621 | 3622 | grepbody(fn, rev, content) |
|
3622 | 3623 | |
|
3624 | if diff: | |
|
3623 | 3625 | pfn = copy or fn |
|
3624 | 3626 | if pfn not in matches[parent]: |
|
3625 | 3627 | try: |
|
3626 | 3628 | pfnode = pctx.filenode(pfn) |
|
3627 |
pcontent = get_file_content( |
|
|
3629 | pcontent = get_file_content( | |
|
3630 | pfn, flog, pfnode, pctx, parent | |
|
3631 | ) | |
|
3628 | 3632 | grepbody(pfn, parent, pcontent) |
|
3629 | 3633 | except error.LookupError: |
|
3630 | 3634 | pass |
General Comments 0
You need to be logged in to leave comments.
Login now