Show More
@@ -2944,16 +2944,18 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
2944 | fnode = ctx.filenode(fn) |
|
2944 | fnode = ctx.filenode(fn) | |
2945 | except error.LookupError: |
|
2945 | except error.LookupError: | |
2946 | continue |
|
2946 | continue | |
|
2947 | copy = None | |||
|
2948 | if follow: | |||
2947 | try: |
|
2949 | try: | |
2948 | copied = flog.renamed(fnode) |
|
2950 | copied = flog.renamed(fnode) | |
2949 | except error.WdirUnsupported: |
|
2951 | except error.WdirUnsupported: | |
2950 | copied = ctx[fn].renamed() |
|
2952 | copied = ctx[fn].renamed() | |
2951 |
copy = |
|
2953 | copy = copied and copied[0] | |
2952 | if copy: |
|
2954 | if copy: | |
2953 | copies.setdefault(rev, {})[fn] = copy |
|
2955 | copies.setdefault(rev, {})[fn] = copy | |
2954 | if fn in skip: |
|
2956 | if fn in skip: | |
2955 | if copy: |
|
|||
2956 | skip[copy] = True |
|
2957 | skip[copy] = True | |
|
2958 | if fn in skip: | |||
2957 | continue |
|
2959 | continue | |
2958 | files.append(fn) |
|
2960 | files.append(fn) | |
2959 |
|
2961 |
General Comments 0
You need to be logged in to leave comments.
Login now