Mercurial > hg

diff mercurial/localrepo.py @ 14150:3a3584967a93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Mar 07 14:47:30 2011 +0100
+++ b/mercurial/localrepo.py	Thu Feb 24 14:06:08 2011 +0100
@@ -1228,8 +1228,7 @@
                 if fn in mf1:
                     if (fn not in deleted and
                         (mf1.flags(fn) != mf2.flags(fn) or
-                         (mf1[fn] != mf2[fn] and
-                          (mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))):
+                         mf1[fn] != mf2[fn])):
                         modified.append(fn)
                     elif listclean:
                         clean.append(fn)