This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9192

commit: move salvaged calculation a bit earlier in the function
ClosedPublic

Authored by pulkit on Oct 10 2020, 4:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb92887ce8db4: commit: move salvaged calculation a bit earlier in the function
Summary

This helps us initialize mergestate before and now we can pass it into
_process_files() instead of re-reading it there.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Oct 10 2020, 4:41 AM
pulkit added a commit: rHGb92887ce8db4: commit: move salvaged calculation a bit earlier in the function.Oct 13 2020, 7:40 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb92887ce8db4: commit: move salvaged calculation a bit earlier in the function (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23190

mercurial/commit.py

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)
ms = mergestate.mergestate.read(repo)
salvaged = _get_salvaged(repo, ms, ctx)
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 = metadata.ChangingFiles()
files.update_touched(ctx.files()) files.update_touched(ctx.files())
if writechangesetcopy: if writechangesetcopy:
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())
ms = mergestate.mergestate.read(repo)
salvaged = _get_salvaged(ctx.repo(), ms, ctx)
for s in salvaged: for s in salvaged:
files.mark_salvaged(s) 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