| hg-reviewers |
Instead of returning it, we pass it as an argument. This makes the whole if-else
in _prepare_files a bit simpler. Else each if-else branch was creating the
object.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| return n | return n | ||||
| def _prepare_files(tr, ctx, error=False, origctx=None): | def _prepare_files(tr, ctx, error=False, origctx=None): | ||||
| repo = ctx.repo() | repo = ctx.repo() | ||||
| p1 = ctx.p1() | p1 = ctx.p1() | ||||
| writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) | writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) | ||||
| files = metadata.ChangingFiles() | |||||
| ms = mergestate.mergestate.read(repo) | ms = mergestate.mergestate.read(repo) | ||||
| salvaged = _get_salvaged(repo, ms, ctx) | salvaged = _get_salvaged(repo, ms, ctx) | ||||
| for s in salvaged: | |||||
| files.mark_salvaged(s) | |||||
| if ctx.manifestnode(): | if ctx.manifestnode(): | ||||
| # reuse an existing manifest revision | # reuse an existing manifest revision | ||||
| repo.ui.debug(b'reusing known manifest\n') | repo.ui.debug(b'reusing known manifest\n') | ||||
| mn = ctx.manifestnode() | mn = ctx.manifestnode() | ||||
| files = metadata.ChangingFiles() | |||||
| files.update_touched(ctx.files()) | files.update_touched(ctx.files()) | ||||
| 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() | |||||
| else: | else: | ||||
| mn, files = _process_files(tr, ctx, ms, error=error) | mn = _process_files(tr, ctx, ms, files, 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()) | ||||
| files.update_copies_from_p2(ctx.p2copies()) | files.update_copies_from_p2(ctx.p2copies()) | ||||
| for s in salvaged: | |||||
| files.mark_salvaged(s) | |||||
| return mn, files | return mn, files | ||||
| def _get_salvaged(repo, ms, ctx): | def _get_salvaged(repo, ms, ctx): | ||||
| """ returns a list of salvaged files | """ returns a list of salvaged files | ||||
| returns empty list if config option which process salvaged files are | returns empty list if config option which process salvaged files are | ||||
| not enabled """ | not enabled """ | ||||
| salvaged = [] | salvaged = [] | ||||
| copy_sd = repo.filecopiesmode == b'changeset-sidedata' | copy_sd = repo.filecopiesmode == b'changeset-sidedata' | ||||
| if copy_sd and len(ctx.parents()) > 1: | if copy_sd and len(ctx.parents()) > 1: | ||||
| if ms.active(): | if ms.active(): | ||||
| 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, ms, error=False): | def _process_files(tr, ctx, ms, files, 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() | ||||
| 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")) | ||||
| uipathfn = scmutil.getuipathfn(repo) | uipathfn = scmutil.getuipathfn(repo) | ||||
| for f in sorted(ctx.modified() + ctx.added()): | for f in sorted(ctx.modified() + ctx.added()): | ||||
| repo.ui.note(uipathfn(f) + b"\n") | repo.ui.note(uipathfn(f) + b"\n") | ||||
| else: | else: | ||||
| rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2)) | rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2)) | ||||
| for f in removed: | for f in removed: | ||||
| if not rf(f): | if not rf(f): | ||||
| files.mark_removed(f) | files.mark_removed(f) | ||||
| mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files.touched, added, drop) | mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files.touched, added, drop) | ||||
| return mn, files | return mn | ||||
| def _filecommit( | def _filecommit( | ||||
| repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta, ms, | repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta, ms, | ||||
| ): | ): | ||||
| """ | """ | ||||
| commit an individual file as part of a larger transaction | commit an individual file as part of a larger transaction | ||||