This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5290

branchmap: rename partial -> bcache
ClosedPublic

Authored by mjpieters on Nov 20 2018, 8:45 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG3461814417f3: branchmap: rename partial -> bcache
Summary

The name better reflects that we have a branchcache object here, even if at
*some point* it is still being constructed.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mjpieters created this revision.Nov 20 2018, 8:45 AM
mjpieters added a comment.Nov 22 2018, 6:38 AM

The goal of this refactor is to bring clarity to the branchmap cache behaviour, and to make it easier to add performance improvements (in an upcoming additional series of patches).

yuja added a subscriber: yuja.Nov 23 2018, 10:24 PM

Can you split this to a couple of patches?

The idea sounds good, but it isn't easy to review formatting changes,
code moves, and interface improvements as a single patch.

mjpieters edited the summary of this revision. (Show Details)Jan 21 2019, 1:07 PM
mjpieters retitled this revision from branchmap: refactor for better encapsulation to branchmap: rename partial -> bcache.
mjpieters added a child revision: D5635: branchmap: make branchcache responsible for reading.
mjpieters updated this revision to Diff 13329.
mjpieters added a comment.Jan 21 2019, 1:13 PM

@yuja: you wanted separate commits, you got separate commits. :-)

(and apologies for taking so long)

martinvonz accepted this revision.Jan 25 2019, 3:20 PM
This revision is now accepted and ready to land.Jan 25 2019, 3:20 PM
Closed by commit rHG3461814417f3: branchmap: rename partial -> bcache (authored by mjpieters). · Explain WhyJan 26 2019, 2:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (36 lines)

Diff 13329

mercurial/branchmap.py

f = repo.cachevfs(_filename(repo)) f = repo.cachevfs(_filename(repo))
lineiter = iter(f) lineiter = iter(f)
cachekey = next(lineiter).rstrip('\n').split(" ", 2) cachekey = next(lineiter).rstrip('\n').split(" ", 2)
last, lrev = cachekey[:2] last, lrev = cachekey[:2]
last, lrev = bin(last), int(lrev) last, lrev = bin(last), int(lrev)
filteredhash = None filteredhash = None
if len(cachekey) > 2: if len(cachekey) > 2:
filteredhash = bin(cachekey[2]) filteredhash = bin(cachekey[2])
partial = branchcache(tipnode=last, tiprev=lrev, bcache = branchcache(tipnode=last, tiprev=lrev,
filteredhash=filteredhash) filteredhash=filteredhash)
if not partial.validfor(repo): if not bcache.validfor(repo):
# invalidate the cache # invalidate the cache
raise ValueError(r'tip differs') raise ValueError(r'tip differs')
cl = repo.changelog cl = repo.changelog
for l in lineiter: for l in lineiter:
l = l.rstrip('\n') l = l.rstrip('\n')
if not l: if not l:
continue continue
node, state, label = l.split(" ", 2) node, state, label = l.split(" ", 2)
if state not in 'oc': if state not in 'oc':
raise ValueError(r'invalid branch state') raise ValueError(r'invalid branch state')
label = encoding.tolocal(label.strip()) label = encoding.tolocal(label.strip())
node = bin(node) node = bin(node)
if not cl.hasnode(node): if not cl.hasnode(node):
raise ValueError( raise ValueError(
r'node %s does not exist' % pycompat.sysstr(hex(node))) r'node %s does not exist' % pycompat.sysstr(hex(node)))
partial.setdefault(label, []).append(node) bcache.setdefault(label, []).append(node)
if state == 'c': if state == 'c':
partial._closednodes.add(node) bcache._closednodes.add(node)
except (IOError, OSError): except (IOError, OSError):
return None return None
except Exception as inst: except Exception as inst:
if repo.ui.debugflag: if repo.ui.debugflag:
msg = 'invalid branchheads cache' msg = 'invalid branchheads cache'
if repo.filtername is not None: if repo.filtername is not None:
msg += ' (%s)' % repo.filtername msg += ' (%s)' % repo.filtername
msg += ': %s\n' msg += ': %s\n'
repo.ui.debug(msg % pycompat.bytestr(inst)) repo.ui.debug(msg % pycompat.bytestr(inst))
partial = None bcache = None
finally: finally:
if f: if f:
f.close() f.close()
return partial return bcache
### Nearest subset relation ### Nearest subset relation
# Nearest subset of filter X is a filter Y so that: # Nearest subset of filter X is a filter Y so that:
# * Y is included in X, # * Y is included in X,
# * X - Y is as small as possible. # * X - Y is as small as possible.
# This create and ordering used for branchmap purpose. # This create and ordering used for branchmap purpose.
# the ordering may be partial # the ordering may be partial
subsettable = {None: 'visible', subsettable = {None: 'visible',
'visible-hidden': 'visible', 'visible-hidden': 'visible',
'visible': 'served', 'visible': 'served',
'served': 'immutable', 'served': 'immutable',
'immutable': 'base'} 'immutable': 'base'}
def updatecache(repo): def updatecache(repo):
cl = repo.changelog cl = repo.changelog
filtername = repo.filtername filtername = repo.filtername
partial = repo._branchcaches.get(filtername) bcache = repo._branchcaches.get(filtername)
revs = [] revs = []
if partial is None or not partial.validfor(repo): if bcache is None or not bcache.validfor(repo):
partial = read(repo) bcache = read(repo)
if partial is None: if bcache is None:
subsetname = subsettable.get(filtername) subsetname = subsettable.get(filtername)
if subsetname is None: if subsetname is None:
partial = branchcache() bcache = branchcache()
else: else:
subset = repo.filtered(subsetname) subset = repo.filtered(subsetname)
partial = subset.branchmap().copy() bcache = subset.branchmap().copy()
extrarevs = subset.changelog.filteredrevs - cl.filteredrevs extrarevs = subset.changelog.filteredrevs - cl.filteredrevs
revs.extend(r for r in extrarevs if r <= partial.tiprev) revs.extend(r for r in extrarevs if r <= bcache.tiprev)
revs.extend(cl.revs(start=partial.tiprev + 1)) revs.extend(cl.revs(start=bcache.tiprev + 1))
if revs: if revs:
partial.update(repo, revs) bcache.update(repo, revs)
partial.write(repo) bcache.write(repo)
assert partial.validfor(repo), filtername assert bcache.validfor(repo), filtername
repo._branchcaches[repo.filtername] = partial repo._branchcaches[repo.filtername] = bcache
def replacecache(repo, bm): def replacecache(repo, bm):
"""Replace the branchmap cache for a repo with a branch mapping. """Replace the branchmap cache for a repo with a branch mapping.
This is likely only called during clone with a branch map from a remote. This is likely only called during clone with a branch map from a remote.
""" """
cl = repo.changelog cl = repo.changelog
clrev = cl.rev clrev = cl.rev