Mercurial > hg
diff hgext/largefiles/reposetup.py @ 23394:b5e2128ce9e6
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 25 Nov 2014 17:30:05 -0600 |
parents | 4be754832829 7f8d27e1f862 |
children | 4dd8a6a1240d |
line wrap: on
line diff
--- a/hgext/largefiles/reposetup.py Tue Nov 25 02:31:52 2014 -0600 +++ b/hgext/largefiles/reposetup.py Tue Nov 25 17:30:05 2014 -0600 @@ -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: