| pulkit |
| hg-reviewers |
rollback is updating parent without touching the working copy. It should wrapped
in a parentchange context.
| 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 (15 lines) |
| else: | else: | ||||
| # content of standin is not so important in 'a', | # content of standin is not so important in 'a', | ||||
| # 'm' or 'n' (coming from the 2nd parent) cases | # 'm' or 'n' (coming from the 2nd parent) cases | ||||
| lfutil.writestandin(repo, f, b'', False) | lfutil.writestandin(repo, f, b'', False) | ||||
| for standin in orphans: | for standin in orphans: | ||||
| repo.wvfs.unlinkpath(standin, ignoremissing=True) | repo.wvfs.unlinkpath(standin, ignoremissing=True) | ||||
| lfdirstate = lfutil.openlfdirstate(ui, repo) | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||||
| with lfdirstate.parentchange(): | |||||
| orphans = set(lfdirstate) | orphans = set(lfdirstate) | ||||
| lfiles = lfutil.listlfiles(repo) | lfiles = lfutil.listlfiles(repo) | ||||
| for file in lfiles: | for file in lfiles: | ||||
| lfutil.synclfdirstate(repo, lfdirstate, file, True) | lfutil.synclfdirstate(repo, lfdirstate, file, True) | ||||
| orphans.discard(file) | orphans.discard(file) | ||||
| for lfile in orphans: | for lfile in orphans: | ||||
| lfdirstate.drop(lfile) | lfdirstate.drop(lfile) | ||||
| lfdirstate.write() | lfdirstate.write() | ||||
| return result | return result | ||||
| @eh.wrapcommand(b'transplant', extension=b'transplant') | @eh.wrapcommand(b'transplant', extension=b'transplant') | ||||
| def overridetransplant(orig, ui, repo, *revs, **opts): | def overridetransplant(orig, ui, repo, *revs, **opts): | ||||
| resuming = opts.get('continue') | resuming = opts.get('continue') | ||||
| repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) | repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) | ||||