Mercurial > hg

diff hgext/largefiles/reposetup.py @ 23383:7f8d27e1f862 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: avoid exec-bit examination on the platform being unaware of it Changeset 24600c9d7f4e introduced the examination of exec bit of largefiles in "hg status --rev REV" case, but it doesn't avoid it on the platform being unaware of exec-bit (e.g. on NTFS of Windows).
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 25 Nov 2014 18:37:28 +0900
parents 24600c9d7f4e
children b5e2128ce9e6
line wrap: on
line diff
--- a/hgext/largefiles/reposetup.py	Thu Nov 20 16:30:57 2014 -0800
+++ b/hgext/largefiles/reposetup.py	Tue Nov 25 18:37:28 2014 +0900
@@ -170,6 +170,7 @@
                     else:
                         tocheck = unsure + modified + added + clean
                         modified, added, clean = [], [], []
+                        checkexec = self.dirstate._checkexec
 
                         for lfile in tocheck:
                             standin = lfutil.standin(lfile)
@@ -177,7 +178,8 @@
                                 abslfile = self.wjoin(lfile)
                                 if ((ctx1[standin].data().strip() !=
                                      lfutil.hashfile(abslfile)) or
-                                    (('x' in ctx1.flags(standin)) !=
+                                    (checkexec and
+                                     ('x' in ctx1.flags(standin)) !=
                                      bool(lfutil.getexecutable(abslfile)))):
                                     modified.append(lfile)
                                 elif listclean: