Mercurial > hg
comparison hgext/largefiles/overrides.py @ 18142:11d1a9143adb
merge with stable
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 28 Dec 2012 11:55:45 +0100 |
| parents | abe9799a86d6 e388273f3ad1 |
| children | e16982a74bf7 |
comparison
equal
deleted
inserted
replaced
| 18137:d8e7b3a14957 | 18142:11d1a9143adb |
|---|---|
| 565 wlock = repo.wlock() | 565 wlock = repo.wlock() |
| 566 try: | 566 try: |
| 567 lfdirstate = lfutil.openlfdirstate(ui, repo) | 567 lfdirstate = lfutil.openlfdirstate(ui, repo) |
| 568 (modified, added, removed, missing, unknown, ignored, clean) = \ | 568 (modified, added, removed, missing, unknown, ignored, clean) = \ |
| 569 lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev()) | 569 lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev()) |
| 570 lfdirstate.write() | |
| 570 for lfile in modified: | 571 for lfile in modified: |
| 571 lfutil.updatestandin(repo, lfutil.standin(lfile)) | 572 lfutil.updatestandin(repo, lfutil.standin(lfile)) |
| 572 for lfile in missing: | 573 for lfile in missing: |
| 573 if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))): | 574 if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))): |
| 574 os.unlink(repo.wjoin(lfutil.standin(lfile))) | 575 os.unlink(repo.wjoin(lfutil.standin(lfile))) |