| Alphare |
| 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/overrides.py (2 lines) |
| MERGE_ACTION_LARGEFILE_MARK_REMOVED | MERGE_ACTION_LARGEFILE_MARK_REMOVED | ||||
| ]: | ]: | ||||
| # this should be executed before 'orig', to execute 'remove' | # this should be executed before 'orig', to execute 'remove' | ||||
| # before all other actions | # before all other actions | ||||
| repo.dirstate.update_file( | repo.dirstate.update_file( | ||||
| lfile, p1_tracked=True, wc_tracked=False | lfile, p1_tracked=True, wc_tracked=False | ||||
| ) | ) | ||||
| # make sure lfile doesn't get synclfdirstate'd as normal | # make sure lfile doesn't get synclfdirstate'd as normal | ||||
| lfdirstate.add(lfile) | lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True) | ||||
| lfdirstate.write() | lfdirstate.write() | ||||
| return orig(repo, actions, branchmerge, getfiledata) | return orig(repo, actions, branchmerge, getfiledata) | ||||
| # Override filemerge to prompt the user about how they wish to merge | # Override filemerge to prompt the user about how they wish to merge | ||||
| # largefiles. This will handle identical edits without prompting the user. | # largefiles. This will handle identical edits without prompting the user. | ||||
| @eh.wrapfunction(filemerge, b'_filemerge') | @eh.wrapfunction(filemerge, b'_filemerge') | ||||