| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| if writechangesetcopy: | if writechangesetcopy: | ||||
| files.update_added(ctx.filesadded()) | files.update_added(ctx.filesadded()) | ||||
| files.update_removed(ctx.filesremoved()) | files.update_removed(ctx.filesremoved()) | ||||
| elif not ctx.files(): | elif not ctx.files(): | ||||
| repo.ui.debug(b'reusing manifest from p1 (no file change)\n') | repo.ui.debug(b'reusing manifest from p1 (no file change)\n') | ||||
| mn = p1.manifestnode() | mn = p1.manifestnode() | ||||
| files = metadata.ChangingFiles() | files = metadata.ChangingFiles() | ||||
| else: | else: | ||||
| mn, files = _process_files(tr, ctx, error=error) | mn, files = _process_files(tr, ctx, ms, error=error) | ||||
| if origctx and origctx.manifestnode() == mn: | if origctx and origctx.manifestnode() == mn: | ||||
| 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()) | ||||
| for fname in sorted(ms._stateextras.keys()): | for fname in sorted(ms._stateextras.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: | ||||
| salvaged.append(fname) | salvaged.append(fname) | ||||
| return salvaged | return salvaged | ||||
| def _process_files(tr, ctx, error=False): | def _process_files(tr, ctx, ms, 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) | ||||
| m1ctx = p1.manifestctx() | m1ctx = p1.manifestctx() | ||||
| m2ctx = p2.manifestctx() | m2ctx = p2.manifestctx() | ||||
| mctx = m1ctx.copy() | mctx = m1ctx.copy() | ||||
| m = mctx.read() | m = mctx.read() | ||||
| m1 = m1ctx.read() | m1 = m1ctx.read() | ||||
| m2 = m2ctx.read() | m2 = m2ctx.read() | ||||
| ms = mergestate.mergestate.read(repo) | |||||
| files = metadata.ChangingFiles() | files = metadata.ChangingFiles() | ||||
| # check in files | # check in files | ||||
| added = [] | added = [] | ||||
| removed = list(ctx.removed()) | removed = list(ctx.removed()) | ||||
| linkrev = len(repo) | linkrev = len(repo) | ||||
| repo.ui.note(_(b"committing files:\n")) | repo.ui.note(_(b"committing files:\n")) | ||||