1293 # because largefiles in the working directory may be modified |
1293 # because largefiles in the working directory may be modified |
1294 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1294 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1295 unsure, s = lfdirstate.status(match_.always(repo.root, |
1295 unsure, s = lfdirstate.status(match_.always(repo.root, |
1296 repo.getcwd()), |
1296 repo.getcwd()), |
1297 [], False, False, False) |
1297 [], False, False, False) |
1298 for lfile in unsure + s.modified + s.added: |
1298 pctx = repo['.'] |
|
1299 for lfile in unsure + s.modified: |
|
1300 lfileabs = repo.wvfs.join(lfile) |
|
1301 if not os.path.exists(lfileabs): |
|
1302 continue |
|
1303 lfhash = lfutil.hashrepofile(repo, lfile) |
|
1304 standin = lfutil.standin(lfile) |
|
1305 lfutil.writestandin(repo, standin, lfhash, |
|
1306 lfutil.getexecutable(lfileabs)) |
|
1307 if (standin in pctx and |
|
1308 lfhash == lfutil.readstandin(repo, lfile, '.')): |
|
1309 lfdirstate.normal(lfile) |
|
1310 for lfile in s.added: |
1299 lfutil.updatestandin(repo, lfutil.standin(lfile)) |
1311 lfutil.updatestandin(repo, lfutil.standin(lfile)) |
|
1312 lfdirstate.write() |
1300 |
1313 |
1301 if linearmerge: |
1314 if linearmerge: |
1302 # Only call updatelfiles on the standins that have changed |
1315 # Only call updatelfiles on the standins that have changed |
1303 # to save time |
1316 # to save time |
1304 oldstandins = lfutil.getstandinsstate(repo) |
1317 oldstandins = lfutil.getstandinsstate(repo) |