Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 23393:c834c0194dbb | 23394:b5e2128ce9e6 |
|---|---|
| 168 clean.append(lfile) | 168 clean.append(lfile) |
| 169 lfdirstate.normal(lfile) | 169 lfdirstate.normal(lfile) |
| 170 else: | 170 else: |
| 171 tocheck = unsure + modified + added + clean | 171 tocheck = unsure + modified + added + clean |
| 172 modified, added, clean = [], [], [] | 172 modified, added, clean = [], [], [] |
| 173 checkexec = self.dirstate._checkexec | |
| 173 | 174 |
| 174 for lfile in tocheck: | 175 for lfile in tocheck: |
| 175 standin = lfutil.standin(lfile) | 176 standin = lfutil.standin(lfile) |
| 176 if standin in ctx1: | 177 if standin in ctx1: |
| 177 abslfile = self.wjoin(lfile) | 178 abslfile = self.wjoin(lfile) |
| 178 if ((ctx1[standin].data().strip() != | 179 if ((ctx1[standin].data().strip() != |
| 179 lfutil.hashfile(abslfile)) or | 180 lfutil.hashfile(abslfile)) or |
| 180 (('x' in ctx1.flags(standin)) != | 181 (checkexec and |
| 182 ('x' in ctx1.flags(standin)) != | |
| 181 bool(lfutil.getexecutable(abslfile)))): | 183 bool(lfutil.getexecutable(abslfile)))): |
| 182 modified.append(lfile) | 184 modified.append(lfile) |
| 183 elif listclean: | 185 elif listclean: |
| 184 clean.append(lfile) | 186 clean.append(lfile) |
| 185 else: | 187 else: |