| Alphare | |
| pulkit |
| hg-reviewers |
This is the newer, more semantic API.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/lfutil.py (4 lines) |
| if normallookup or mtime < 0 or not repo.wvfs.exists(lfile): | if normallookup or mtime < 0 or not repo.wvfs.exists(lfile): | ||||
| # state 'n' doesn't ensure 'clean' in this case | # state 'n' doesn't ensure 'clean' in this case | ||||
| lfdirstate.update_file( | lfdirstate.update_file( | ||||
| lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True | lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True | ||||
| ) | ) | ||||
| else: | else: | ||||
| lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) | lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) | ||||
| elif state == b'm': | elif state == b'm': | ||||
| lfdirstate.normallookup(lfile) | lfdirstate.update_file( | ||||
| lfile, p1_tracked=True, wc_tracked=True, merged=True | |||||
| ) | |||||
| elif state == b'r': | elif state == b'r': | ||||
| lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False) | lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False) | ||||
| elif state == b'a': | elif state == b'a': | ||||
| lfdirstate.add(lfile) | lfdirstate.add(lfile) | ||||
| def markcommitted(orig, ctx, node): | def markcommitted(orig, ctx, node): | ||||
| repo = ctx.repo() | repo = ctx.repo() | ||||