This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9113

copies: rename some function to the new naming scheme
ClosedPublic

Authored by marmoute on Sep 28 2020, 12:32 PM.

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHGfb000408bca5: copies: rename some function to the new naming scheme
Summary

We are about to introduce more function and more variants, it seems better to
align everything on the new scheme, allowing _ for clarify. We do this aligned
in a dedicated changeset to make the next changesets simpler.

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.Sep 28 2020, 12:32 PM
pulkit accepted this revision.Oct 1 2020, 10:35 AM
This revision is now accepted and ready to land.Oct 1 2020, 10:35 AM
Alphare accepted this revision.Oct 1 2020, 11:35 AM

Thanks, my shoulders are not as tense now. ;)

marmoute added a commit: rHGfb000408bca5: copies: rename some function to the new naming scheme.Oct 2 2020, 9:48 AM
Closed by commit rHGfb000408bca5: copies: rename some function to the new naming scheme (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (8 lines)

Diff 23006

mercurial/copies.py

if debug: if debug:
dbg( dbg(
b'debug.copies: time: %f seconds\n' b'debug.copies: time: %f seconds\n'
% (util.timer() - start) % (util.timer() - start)
) )
return cm return cm
def _revinfogetter(repo): def _revinfo_getter(repo):
"""return a function that return multiple data given a <rev>"i """return a function that return multiple data given a <rev>"i
* p1: revision number of first parent * p1: revision number of first parent
* p2: revision number of first parent * p2: revision number of first parent
* p1copies: mapping of copies from p1 * p1copies: mapping of copies from p1
* p2copies: mapping of copies from p2 * p2copies: mapping of copies from p2
* removed: a list of removed files * removed: a list of removed files
* ismerged: a callback to know if file was merged in that revision * ismerged: a callback to know if file was merged in that revision
def _changesetforwardcopies(a, b, match): def _changesetforwardcopies(a, b, match):
if a.rev() in (node.nullrev, b.rev()): if a.rev() in (node.nullrev, b.rev()):
return {} return {}
repo = a.repo().unfiltered() repo = a.repo().unfiltered()
children = {} children = {}
revinfo = _revinfogetter(repo) revinfo = _revinfo_getter(repo)
cl = repo.changelog cl = repo.changelog
isancestor = cl.isancestorrev # XXX we should had chaching to this. isancestor = cl.isancestorrev # XXX we should had chaching to this.
missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()]) missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])
mrset = set(missingrevs) mrset = set(missingrevs)
roots = set() roots = set()
for r in missingrevs: for r in missingrevs:
for p in cl.parentrevs(r): for p in cl.parentrevs(r):
cl.reachableroots(min_root, [b.rev()], list(roots), includepath=True) cl.reachableroots(min_root, [b.rev()], list(roots), includepath=True)
) )
iterrevs = set(from_head) iterrevs = set(from_head)
iterrevs &= mrset iterrevs &= mrset
iterrevs.update(roots) iterrevs.update(roots)
iterrevs.remove(b.rev()) iterrevs.remove(b.rev())
revs = sorted(iterrevs) revs = sorted(iterrevs)
return _combinechangesetcopies( return _combine_changeset_copies(
revs, children, b.rev(), revinfo, match, isancestor revs, children, b.rev(), revinfo, match, isancestor
) )
def _combinechangesetcopies( def _combine_changeset_copies(
revs, children, targetrev, revinfo, match, isancestor revs, children, targetrev, revinfo, match, isancestor
): ):
"""combine the copies information for each item of iterrevs """combine the copies information for each item of iterrevs
revs: sorted iterable of revision to visit revs: sorted iterable of revision to visit
children: a {parent: [children]} mapping. children: a {parent: [children]} mapping.
targetrev: the final copies destination revision (not in iterrevs) targetrev: the final copies destination revision (not in iterrevs)
revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed) revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed)