Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 5170:de7c772751b4
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 15 Aug 2007 16:43:40 +0200 |
| parents | 49554ba98951 64888ff907f4 |
| children | 92236732d5a1 |
comparison
equal
deleted
inserted
replaced
| 5167:4dfe4c21dd64 | 5170:de7c772751b4 |
|---|---|
| 1186 mf = repo.changectx(rev).manifest() | 1186 mf = repo.changectx(rev).manifest() |
| 1187 matches[rev] = {} | 1187 matches[rev] = {} |
| 1188 for fn in fns: | 1188 for fn in fns: |
| 1189 if fn in skip: | 1189 if fn in skip: |
| 1190 continue | 1190 continue |
| 1191 fstate.setdefault(fn, {}) | |
| 1192 try: | 1191 try: |
| 1193 grepbody(fn, rev, getfile(fn).read(mf[fn])) | 1192 grepbody(fn, rev, getfile(fn).read(mf[fn])) |
| 1193 fstate.setdefault(fn, []) | |
| 1194 if follow: | 1194 if follow: |
| 1195 copied = getfile(fn).renamed(mf[fn]) | 1195 copied = getfile(fn).renamed(mf[fn]) |
| 1196 if copied: | 1196 if copied: |
| 1197 copies.setdefault(rev, {})[fn] = copied[0] | 1197 copies.setdefault(rev, {})[fn] = copied[0] |
| 1198 except KeyError: | 1198 except KeyError: |