# HG changeset patch # User Patrick Mezard # Date 1216573740 -7200 # Node ID 8f7a2915170a6a34c094cc9898264b8ee5170c14 # Parent 89ec85aa6cc3285652177c58d4d966c4bec51e32 localrepo: fix status() typos from 854b907527e5a and 97c12b1ed1e0 diff -r 89ec85aa6cc3 -r 8f7a2915170a mercurial/localrepo.py --- a/mercurial/localrepo.py Sun Jul 20 19:09:00 2008 +0200 +++ b/mercurial/localrepo.py Sun Jul 20 19:09:00 2008 +0200 @@ -998,9 +998,7 @@ del wlock if not parentworking: - modified, added, clean = [], [], [] mf1 = mfmatches(ctx1) - if working: # we are comparing working dir against non-parent # generate a pseudo-manifest for the working dir @@ -1016,10 +1014,11 @@ deleted, unknown, ignored = [], [], [] mf2 = mfmatches(ctx2) + modified, added, clean = [], [], [] for fn in util.sort(mf2): if fn in mf1: if ((mf1[fn] != mf2[fn] and - (mf2[fn] or ctx1[f].cmp(ctx2[f].data()))) + (mf2[fn] or ctx1[fn].cmp(ctx2[fn].data()))) or mf1.flags(fn) != mf2.flags(fn)): modified.append(fn) elif listclean: