( )⚙ D1439 pushrebase: fix manifest cache

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1439

pushrebase: fix manifest cache
ClosedPublic

Authored by durham on Nov 16 2017, 6:28 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXecc15d40b338: pushrebase: fix manifest cache
Summary

The manifestctx constructor changed at some point in the past to take a
manifestlog and a node instead of a repo and a node. The pushrebase cache code
wasn't adjusted for this. Luckily the manifestctx object only ever uses the
manifestlog to look at the revlog, and the revlog is only ever used to look at
the delta as a fastpath, so most code paths weren't affected.

We encountered this issue on our server, despite it being in there for several
months. Unfortunately I wasn't able to repro it in a test, but I did insert
manual manifestctx._revlog() lines after the construction to ensure that the
revlog can now be created, versus crashing before.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durham created this revision.Nov 16 2017, 6:28 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 16 2017, 6:28 PM
quark accepted this revision.Nov 20 2017, 4:54 PM
This revision is now accepted and ready to land.Nov 20 2017, 4:54 PM
Closed by commit rFBHGXecc15d40b338: pushrebase: fix manifest cache (authored by durham). · Explain WhyNov 21 2017, 5:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/pushrebase.py (4 lines)

Diff 3582

hgext3rd/pushrebase.py

def prefillcaches(op, bundle, bundlerepocache): def prefillcaches(op, bundle, bundlerepocache):
# Preload the caches with data we already have. We need to make copies # Preload the caches with data we already have. We need to make copies
# here so that original repo caches don't get tainted with bundle # here so that original repo caches don't get tainted with bundle
# specific data. # specific data.
newdirmancache = bundle.manifestlog._dirmancache newdirmancache = bundle.manifestlog._dirmancache
for dir, dircache in op.repo.manifestlog._dirmancache.iteritems(): for dir, dircache in op.repo.manifestlog._dirmancache.iteritems():
for mfnode in dircache: for mfnode in dircache:
mfctx = dircache[mfnode] mfctx = dircache[mfnode]
newmfctx = manifest.manifestctx(bundle, mfnode) newmfctx = manifest.manifestctx(bundle.manifestlog, mfnode)
if (util.safehasattr(mfctx, '_data') and if (util.safehasattr(mfctx, '_data') and
util.safehasattr(newmfctx, '_data')): util.safehasattr(newmfctx, '_data')):
newmfctx._data = mfctx._data newmfctx._data = mfctx._data
newdirmancache[dir][mfnode] = newmfctx newdirmancache[dir][mfnode] = newmfctx
for mfnode, mfdict in bundlerepocache.iteritems(): for mfnode, mfdict in bundlerepocache.iteritems():
newmfctx = manifest.manifestctx(bundle, mfnode) newmfctx = manifest.manifestctx(bundle.manifestlog, mfnode)
newmfctx._data = mfdict newmfctx._data = mfdict
newdirmancache[""][mfnode] = newmfctx newdirmancache[""][mfnode] = newmfctx
newfulltextcache = op.repo.manifestlog._revlog._fulltextcache.copy() newfulltextcache = op.repo.manifestlog._revlog._fulltextcache.copy()
bundle.manifestlog._revlog._fulltextcache = newfulltextcache bundle.manifestlog._revlog._fulltextcache = newfulltextcache
def getontotarget(op, params, bundle): def getontotarget(op, params, bundle):
onto = resolveonto(op.repo, params.get('onto', donotrebasemarker)) onto = resolveonto(op.repo, params.get('onto', donotrebasemarker))