| hg-reviewers |
| No Linters Available |
| No Unit Test Coverage |
| origfiles = origctx.files() | origfiles = origctx.files() | ||||
| assert files.touched.issubset(origfiles) | assert files.touched.issubset(origfiles) | ||||
| files.update_touched(origfiles) | files.update_touched(origfiles) | ||||
| if writechangesetcopy: | if writechangesetcopy: | ||||
| files.update_copies_from_p1(ctx.p1copies()) | files.update_copies_from_p1(ctx.p1copies()) | ||||
| files.update_copies_from_p2(ctx.p2copies()) | files.update_copies_from_p2(ctx.p2copies()) | ||||
| copy_sd = ctx.repo().filecopiesmode == b'changeset-sidedata' | |||||
| if copy_sd and len(ctx.parents()) > 1: | |||||
| # XXX this `mergestate.read` could be duplicated with a the merge state | |||||
| # reading in _process_files So we could refactor further to reuse it in | |||||
| # some cases. | |||||
| ms = mergestate.mergestate.read(repo) | ms = mergestate.mergestate.read(repo) | ||||
| salvaged = _get_salvaged(ctx.repo(), ms, ctx) | |||||
| for s in salvaged: | |||||
| files.mark_salvaged(s) | |||||
| return mn, files | |||||
| def _get_salvaged(repo, ms, ctx): | |||||
| """ returns a list of salvaged files | |||||
| returns empty list if config option which process salvaged files are | |||||
| not enabled """ | |||||
| salvaged = [] | |||||
| copy_sd = repo.filecopiesmode == b'changeset-sidedata' | |||||
| if copy_sd and len(ctx.parents()) > 1: | |||||
| if ms.active(): | if ms.active(): | ||||
| for fname in sorted(ms.extras().keys()): | for fname in sorted(ms.extras().keys()): | ||||
| might_removed = ms.extras(fname).get(b'merge-removal-candidate') | might_removed = ms.extras(fname).get(b'merge-removal-candidate') | ||||
| if might_removed == b'yes': | if might_removed == b'yes': | ||||
| if fname in ctx: | if fname in ctx: | ||||
| files.mark_salvaged(fname) | salvaged.append(fname) | ||||
| return salvaged | |||||
| return mn, files | |||||
| def _process_files(tr, ctx, error=False): | def _process_files(tr, ctx, error=False): | ||||
| repo = ctx.repo() | repo = ctx.repo() | ||||
| p1 = ctx.p1() | p1 = ctx.p1() | ||||
| p2 = ctx.p2() | p2 = ctx.p2() | ||||
| writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) | writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) | ||||