This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8699

commitctx: document _filecommit input and output
ClosedPublic

Authored by marmoute on Jul 8 2020, 4:36 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG41b32cbc53f8: commitctx: document _filecommit input and output
rHG74c590085697: commitctx: document _filecommit input and output
Summary

This is the beginning of a larger refactoring/cleanup of the commitctx code to
clarify and augment the logic gathering metadata useful for copy tracing. The
current code is a tad too long and entangled to make such update easy. We start
with easy and small cleanup.

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

marmoute created this revision.Jul 8 2020, 4:36 AM
pulkit added a subscriber: pulkit.Jul 9 2020, 4:28 AM
pulkit added inline comments.
mercurial/localrepo.py
2798

s/individual/includecopymeta in flight

pulkit accepted this revision.Jul 9 2020, 4:29 AM
This revision is now accepted and ready to land.Jul 9 2020, 4:29 AM
marmoute added a commit: rHG74c590085697: commitctx: document _filecommit input and output.Jul 10 2020, 6:46 AM
Closed by commit rHG74c590085697: commitctx: document _filecommit input and output (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (16 lines)

Diff 21827

mercurial/localrepo.py

manifest2, manifest2,
linkrev, linkrev,
tr, tr,
changelist, changelist,
includecopymeta, includecopymeta,
): ):
""" """
commit an individual file as part of a larger transaction commit an individual file as part of a larger transaction
input:
fctx: a file context with the content we are trying to commit
manifest1: manifest of changeset first parent
manifest2: manifest of changeset second parent
linkrev: revision number of the changeset being created
tr: current transation
changelist: list of file being changed (modified inplace)
individual: boolean, set to False to skip storing the copy data
pulkitUnsubmitted
Not Done

s/individual/includecopymeta in flight

pulkit: s/individual/includecopymeta in flight
(only used by the Google specific feature of using
changeset extra as copy source of truth).
output:
The resulting filenode
""" """
fname = fctx.path() fname = fctx.path()
fparent1 = manifest1.get(fname, nullid) fparent1 = manifest1.get(fname, nullid)
fparent2 = manifest2.get(fname, nullid) fparent2 = manifest2.get(fname, nullid)
if isinstance(fctx, context.filectx): if isinstance(fctx, context.filectx):
node = fctx.filenode() node = fctx.filenode()
if node in [fparent1, fparent2]: if node in [fparent1, fparent2]: