Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 14150:3a3584967a93
status: remove unreachable code for status between revisions
The manifest value of a file will never be false when "not parentworking", and
the expensive content comparision would thus fortunately never be reached. (If
it was reached it would be wrong for example in case of renames.)
This code once handled status against working directory, but that has been done
elsewhere for a long time.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 24 Feb 2011 14:06:08 +0100 |
| parents | 7f45b1911893 |
| children | 497493b777ad |
comparison
equal
deleted
inserted
replaced
| 14149:091c86a77d19 | 14150:3a3584967a93 |
|---|---|
| 1226 modified, added, clean = [], [], [] | 1226 modified, added, clean = [], [], [] |
| 1227 for fn in mf2: | 1227 for fn in mf2: |
| 1228 if fn in mf1: | 1228 if fn in mf1: |
| 1229 if (fn not in deleted and | 1229 if (fn not in deleted and |
| 1230 (mf1.flags(fn) != mf2.flags(fn) or | 1230 (mf1.flags(fn) != mf2.flags(fn) or |
| 1231 (mf1[fn] != mf2[fn] and | 1231 mf1[fn] != mf2[fn])): |
| 1232 (mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))): | |
| 1233 modified.append(fn) | 1232 modified.append(fn) |
| 1234 elif listclean: | 1233 elif listclean: |
| 1235 clean.append(fn) | 1234 clean.append(fn) |
| 1236 del mf1[fn] | 1235 del mf1[fn] |
| 1237 elif fn not in deleted: | 1236 elif fn not in deleted: |