Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 5168:64888ff907f4
Fix issue 685: trackback in grep -r after rename
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 15 Aug 2007 16:09:04 +0200 |
| parents | f94dbc6c7eaf |
| children | de7c772751b4 cbe6e263357b |
comparison
equal
deleted
inserted
replaced
| 5166:7706ff46ef45 | 5168:64888ff907f4 |
|---|---|
| 1202 mf = repo.changectx(rev).manifest() | 1202 mf = repo.changectx(rev).manifest() |
| 1203 matches[rev] = {} | 1203 matches[rev] = {} |
| 1204 for fn in fns: | 1204 for fn in fns: |
| 1205 if fn in skip: | 1205 if fn in skip: |
| 1206 continue | 1206 continue |
| 1207 fstate.setdefault(fn, {}) | |
| 1208 try: | 1207 try: |
| 1209 grepbody(fn, rev, getfile(fn).read(mf[fn])) | 1208 grepbody(fn, rev, getfile(fn).read(mf[fn])) |
| 1209 fstate.setdefault(fn, []) | |
| 1210 if follow: | 1210 if follow: |
| 1211 copied = getfile(fn).renamed(mf[fn]) | 1211 copied = getfile(fn).renamed(mf[fn]) |
| 1212 if copied: | 1212 if copied: |
| 1213 copies.setdefault(rev, {})[fn] = copied[0] | 1213 copies.setdefault(rev, {})[fn] = copied[0] |
| 1214 except KeyError: | 1214 except KeyError: |