This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9579

engine: refactor actual cloning code into separate function
ClosedPublic

Authored by pulkit on Dec 14 2020, 4:55 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG85f7cf314b39: engine: refactor actual cloning code into separate function
Summary

The for ... under which this cloning code exists is too complicated and based
on certain assumptions. I am going to refactor it in next patches and make it
bit saner.

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.Dec 14 2020, 4:55 AM
marmoute requested changes to this revision.Dec 22 2020, 3:38 AM
This revision now requires changes to proceed.Dec 22 2020, 3:38 AM
marmoute added inline comments.Dec 22 2020, 4:02 AM
mercurial/upgrade_utils/engine.py
251–278

(that comment got lost someone)

This looks like as unnecessary nested function, lets make it a real function instead.

pulkit updated this revision to Diff 24539.Dec 30 2020, 5:31 AM
mharbison72 accepted this revision.Jan 5 2021, 10:34 AM
pulkit added a commit: rHG85f7cf314b39: engine: refactor actual cloning code into separate function.Jan 5 2021, 10:50 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG85f7cf314b39: engine: refactor actual cloning code into separate function (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade_utils/engine.py (68 lines)

Diff 24607

mercurial/upgrade_utils/engine.py

The store entry is checked against the passed filter""" The store entry is checked against the passed filter"""
if entry.endswith(b'00changelog.i'): if entry.endswith(b'00changelog.i'):
return UPGRADE_CHANGELOG in revlogfilter return UPGRADE_CHANGELOG in revlogfilter
elif entry.endswith(b'00manifest.i'): elif entry.endswith(b'00manifest.i'):
return UPGRADE_MANIFEST in revlogfilter return UPGRADE_MANIFEST in revlogfilter
return UPGRADE_FILELOGS in revlogfilter return UPGRADE_FILELOGS in revlogfilter
def _perform_clone(
ui,
dstrepo,
tr,
old_revlog,
unencoded,
deltareuse,
forcedeltabothparents,
revlogs,
sidedatacompanion,
oncopiedrevision,
):
""" returns the new revlog object created"""
newrl = None
if matchrevlog(revlogs, unencoded):
ui.note(
_(b'cloning %d revisions from %s\n') % (len(old_revlog), unencoded)
)
newrl = _revlogfrompath(dstrepo, unencoded)
old_revlog.clone(
tr,
newrl,
addrevisioncb=oncopiedrevision,
deltareuse=deltareuse,
forcedeltabothparents=forcedeltabothparents,
sidedatacompanion=sidedatacompanion,
)
else:
msg = _(b'blindly copying %s containing %i revisions\n')
ui.note(msg % (unencoded, len(old_revlog)))
_copyrevlog(tr, dstrepo, old_revlog, unencoded)
newrl = _revlogfrompath(dstrepo, unencoded)
return newrl
def _clonerevlogs( def _clonerevlogs(
ui, ui,
srcrepo, srcrepo,
dstrepo, dstrepo,
tr, tr,
deltareuse, deltareuse,
forcedeltabothparents, forcedeltabothparents,
revlogs=UPGRADE_ALL_REVLOGS, revlogs=UPGRADE_ALL_REVLOGS,
# Used to keep track of progress. # Used to keep track of progress.
progress = None progress = None
def oncopiedrevision(rl, rev, node): def oncopiedrevision(rl, rev, node):
progress.increment() progress.increment()
sidedatacompanion = getsidedatacompanion(srcrepo, dstrepo) sidedatacompanion = getsidedatacompanion(srcrepo, dstrepo)
# Do the actual copying. # Do the actual copying.
# FUTURE this operation can be farmed off to worker processes. # FUTURE this operation can be farmed off to worker processes.
seen = set() seen = set()
for unencoded, encoded, size in alldatafiles: for unencoded, encoded, size in alldatafiles:
if unencoded.endswith(b'.d'): if unencoded.endswith(b'.d'):
continue continue
oldrl = _revlogfrompath(srcrepo, unencoded) oldrl = _revlogfrompath(srcrepo, unencoded)
if isinstance(oldrl, changelog.changelog) and b'c' not in seen: if isinstance(oldrl, changelog.changelog) and b'c' not in seen:
ui.status( ui.status(
_( _(
b'finished migrating %d manifest revisions across %d ' b'finished migrating %d manifest revisions across %d '
b'manifests; change in size: %s\n' b'manifests; change in size: %s\n'
) )
% (mrevcount, mcount, util.bytecount(mdstsize - msrcsize)) % (mrevcount, mcount, util.bytecount(mdstsize - msrcsize))
) )
ui.status( ui.status(
_( _(
b'migrating changelog containing %d revisions ' b'migrating changelog containing %d revisions '
b'(%s in store; %s tracked data)\n' b'(%s in store; %s tracked data)\n'
) )
% ( % (
crevcount, crevcount,
util.bytecount(csrcsize), util.bytecount(csrcsize),
util.bytecount(crawsize), util.bytecount(crawsize),
) )
marmouteUnsubmitted
Not Done

(that comment got lost someone)

This looks like as unnecessary nested function, lets make it a real function instead.

marmoute: (that comment got lost someone) This looks like as unnecessary nested function, lets make it a…
) )
seen.add(b'c') seen.add(b'c')
progress = srcrepo.ui.makeprogress( progress = srcrepo.ui.makeprogress(
_(b'changelog revisions'), total=crevcount _(b'changelog revisions'), total=crevcount
) )
elif isinstance(oldrl, manifest.manifestrevlog) and b'm' not in seen: elif isinstance(oldrl, manifest.manifestrevlog) and b'm' not in seen:
ui.status( ui.status(
_( _(
) )
seen.add(b'f') seen.add(b'f')
if progress: if progress:
progress.complete() progress.complete()
progress = srcrepo.ui.makeprogress( progress = srcrepo.ui.makeprogress(
_(b'file revisions'), total=frevcount _(b'file revisions'), total=frevcount
) )
if matchrevlog(revlogs, unencoded): newrl = _perform_clone(
ui.note( ui,
_(b'cloning %d revisions from %s\n') % (len(oldrl), unencoded) dstrepo,
)
newrl = _revlogfrompath(dstrepo, unencoded)
oldrl.clone(
tr, tr,
newrl, oldrl,
addrevisioncb=oncopiedrevision, unencoded,
deltareuse=deltareuse, deltareuse,
forcedeltabothparents=forcedeltabothparents, forcedeltabothparents,
sidedatacompanion=sidedatacompanion, revlogs,
sidedatacompanion,
oncopiedrevision,
) )
else:
msg = _(b'blindly copying %s containing %i revisions\n')
ui.note(msg % (unencoded, len(oldrl)))
_copyrevlog(tr, dstrepo, oldrl, unencoded)
newrl = _revlogfrompath(dstrepo, unencoded)
info = newrl.storageinfo(storedsize=True) info = newrl.storageinfo(storedsize=True)
datasize = info[b'storedsize'] or 0 datasize = info[b'storedsize'] or 0
dstsize += datasize dstsize += datasize
if isinstance(newrl, changelog.changelog): if isinstance(newrl, changelog.changelog):
cdstsize += datasize cdstsize += datasize
elif isinstance(newrl, manifest.manifestrevlog): elif isinstance(newrl, manifest.manifestrevlog):