This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1495

perftweaks: unbreak the branchcache code
ClosedPublic

Authored by simpkins on Nov 23 2017, 12:56 AM.
Tags
None
Subscribers
None

Details

Reviewers
quark
durham
Group Reviewers
Restricted Project
Commits
rFBHGX0bfd5874c806: perftweaks: unbreak the branchcache code
Summary

D1451 changed _branchmapupdate() so that it no longer updates self.filteredhash
when changing self.tiprev. This causes branchcache.validfor() to report that
the cache is no longer valid, causing an assertion failure at the end of
updatecache().

Test Plan

Running hg commands no longer crash.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

simpkins created this revision.Nov 23 2017, 12:56 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 23 2017, 12:56 AM
quark accepted this revision.Nov 23 2017, 1:18 AM

Sorry for this. Is this the cause of pushrebase failure?

I didn't notice this since the validfor code path was probably skipped by D1450.

This revision is now accepted and ready to land.Nov 23 2017, 1:18 AM
simpkins added a comment.Nov 23 2017, 1:29 AM

No, I don't think this is related to the pushrebase failure. However, it causes pretty much any hg command in my repository to fail after running "hg pull" or "hg rebase" (maybe any command that creates a new tip?)

Closed by commit rFBHGX0bfd5874c806: perftweaks: unbreak the branchcache code (authored by simpkins). · Explain WhyNov 27 2017, 7:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/perftweaks.py (2 lines)

Diff 3801

hgext3rd/perftweaks.py

from mercurial import ( from mercurial import (
branchmap, branchmap,
dispatch, dispatch,
extensions, extensions,
merge, merge,
phases, phases,
revlog, revlog,
scmutil,
tags, tags,
util, util,
) )
from mercurial.extensions import wrapfunction from mercurial.extensions import wrapfunction
from mercurial.node import bin from mercurial.node import bin
import errno import errno
import os import os
# cl.headrevs(). Note: cl.headrevs() is already sorted. # cl.headrevs(). Note: cl.headrevs() is already sorted.
branchheads = cl.headrevs() branchheads = cl.headrevs()
self['default'] = [tonode(rev) for rev in branchheads] self['default'] = [tonode(rev) for rev in branchheads]
tiprev = branchheads[-1] tiprev = branchheads[-1]
if tiprev > self.tiprev: if tiprev > self.tiprev:
self.tipnode = cl.node(tiprev) self.tipnode = cl.node(tiprev)
self.tiprev = tiprev self.tiprev = tiprev
self.filteredhash = scmutil.filteredhash(repo, self.tiprev)
repo.ui.log('branchcache', 'perftweaks updated %s branch cache\n', repo.ui.log('branchcache', 'perftweaks updated %s branch cache\n',
repo.filtername) repo.filtername)
def _branchmapwrite(orig, self, repo): def _branchmapwrite(orig, self, repo):
result = orig(self, repo) result = orig(self, repo)
if repo.ui.configbool('perftweaks', 'cachenoderevs', True): if repo.ui.configbool('perftweaks', 'cachenoderevs', True):
revs = set() revs = set()