This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1434

treedirstate: add configuration options
ClosedPublic

Authored by mbthomas on Nov 16 2017, 12:13 PM.
Tags
None
Subscribers
quark

Details

Reviewers
durham
quark
Group Reviewers
Restricted Project
Commits
rFBHGX2af567307a40: treedirstate: add configuration options
Summary

Add configuration options to control upgrading, downgrading and repacking of
treedirstate.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Nov 16 2017, 12:13 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 16 2017, 12:13 PM
durham accepted this revision.Nov 21 2017, 12:17 PM
This revision is now accepted and ready to land.Nov 21 2017, 12:17 PM
mbthomas updated this revision to Diff 3738.Nov 21 2017, 1:36 PM
mbthomas updated this revision to Diff 3834.Nov 24 2017, 11:53 AM
mbthomas updated this revision to Diff 3853.Nov 24 2017, 3:44 PM
quark accepted this revision.Nov 24 2017, 9:21 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/treedirstate.py
78

nit: default=3

mbthomas updated this revision to Diff 3873.Nov 27 2017, 8:00 AM
mbthomas updated this revision to Diff 3891.Nov 27 2017, 4:33 PM
mbthomas updated this revision to Diff 3893.Nov 27 2017, 4:36 PM
Closed by commit rFBHGX2af567307a40: treedirstate: add configuration options (authored by mbthomas). · Explain WhyNov 28 2017, 6:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/treedirstate.py (66 lines)

Diff 3942

hgext3rd/treedirstate.py

# Copyright Facebook, Inc. 2017 # Copyright Facebook, Inc. 2017
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
"""tree-based dirstate implementation""" """tree-based dirstate implementation
::
[treedirstate]
# Whether treedirstate is currently being used.
enabled = False
# Whether new repos should have treedirstate enabled.
useinnewrepos = False
# Whether to upgrade repos to treedirstate on pull.
upgradeonpull = False
# Whether to downgrade repos away from treedirstate on pull.
downgradeonpull = False
# Minimum size before a tree file will be repacked.
minrepackthreshold = 1048576
# Number of times a tree file can grow by before it is repacked.
repackfactor = 3
# Percentage probability of performing a cleanup after a write to a
# treedirstate file that doesn't involve a repack.
cleanuppercent = 1
"""
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
commands,
dirstate, dirstate,
encoding, encoding,
error, error,
extensions, extensions,
localrepo, localrepo,
node, node,
pycompat, pycompat,
registrar, registrar,
import struct import struct
import string import string
from hgext3rd.rust.treedirstate import treedirstatemap as rusttreedirstatemap from hgext3rd.rust.treedirstate import treedirstatemap as rusttreedirstatemap
dirstateheader = b'########################treedirstate####' dirstateheader = b'########################treedirstate####'
treedirstateversion = 1 treedirstateversion = 1
treefileprefix = 'dirstate.tree.' treefileprefix = 'dirstate.tree.'
useinnewrepos = True
configtable = {}
configitem = registrar.configitem(configtable)
configitem('treedirstate', 'useinnewrepos', default=False)
configitem('treedirstate', 'upgradeonpull', default=False)
configitem('treedirstate', 'downgradeonpull', default=False)
configitem('treedirstate', 'cleanuppercent', default=1)
# Sentinel length value for when a nonnormalset or otherparentset is absent. # Sentinel length value for when a nonnormalset or otherparentset is absent.
setabsent = 0xffffffff setabsent = 0xffffffff
# Minimum size the treedirstate file can be before auto-repacking. # Minimum size the treedirstate file can be before auto-repacking.
minrepackthreshold = 1024 * 1024 configitem('treedirstate', 'minrepackthreshold', default=1024 * 1024)
# Number of times the treedirstate file can grow by, compared to its initial # Number of times the treedirstate file can grow by, compared to its initial
# size, before auto-repacking. # size, before auto-repacking.
repackfactor = 3 configitem('treedirstate', 'repackfactor', default=3)
quarkUnsubmitted
Not Done

nit: default=3

quark: nit: `default=3`
class _reader(object): class _reader(object):
def __init__(self, data, offset): def __init__(self, data, offset):
self.data = data self.data = data
self.offset = offset self.offset = offset
def readuint(self): def readuint(self):
v = struct.unpack(">L", self.data[self.offset:self.offset + 4]) v = struct.unpack(">L", self.data[self.offset:self.offset + 4])
def write(self, st, now): def write(self, st, now):
"""Write the dirstate to the filehandle st.""" """Write the dirstate to the filehandle st."""
if self._nonnormalset is not None: if self._nonnormalset is not None:
nonnormadd = self._nonnormalset.add nonnormadd = self._nonnormalset.add
else: else:
def nonnormadd(f): def nonnormadd(f):
pass pass
repackfactor = self._ui.configint('treedirstate', 'repackfactor')
minrepackthreshold = self._ui.configint('treedirstate',
'minrepackthreshold')
repackthreshold = max(self._packedsize * repackfactor, repackthreshold = max(self._packedsize * repackfactor,
minrepackthreshold) minrepackthreshold)
if self._rmap.storeoffset() > repackthreshold: if self._rmap.storeoffset() > repackthreshold:
self._ui.note(_("auto-repacking treedirstate\n")) self._ui.note(_("auto-repacking treedirstate\n"))
self._ui.log('treedirstate_repacking', '', self._ui.log('treedirstate_repacking', '',
treedirstate_repacking=True) treedirstate_repacking=True)
self._repacked = True self._repacked = True
self._treeid = None self._treeid = None
try: try:
return orig(self) return orig(self)
finally: finally:
istreedirstate = ("_map" in self.dirstate.__dict__ and istreedirstate = ("_map" in self.dirstate.__dict__ and
isinstance(self.dirstate._map, treedirstatemap)) isinstance(self.dirstate._map, treedirstatemap))
if istreedirstate: if istreedirstate:
haverepacked = getattr(self.dirstate._map, "_repacked", False) haverepacked = getattr(self.dirstate._map, "_repacked", False)
haveextended = getattr(self.dirstate._map, "_extended", False) haveextended = getattr(self.dirstate._map, "_extended", False)
if haverepacked or (haveextended and random.random() < 0.01): cleanuppercent = self.ui.configint('treedirstate', 'cleanuppercent')
if (haverepacked or
(haveextended and random.randint(0, 99) < cleanuppercent)):
# We have written to the dirstate as part of this command, so
# cleaning up should also be able to write to the repo.
cleanup(self.ui, self) cleanup(self.ui, self)
def wrapnewreporequirements(orig, repo): def wrapnewreporequirements(orig, repo):
reqs = orig(repo) reqs = orig(repo)
if useinnewrepos: if repo.ui.configbool('treedirstate', 'useinnewrepos'):
reqs.add('treedirstate') reqs.add('treedirstate')
return reqs return reqs
def wrappull(orig, ui, repo, *args, **kwargs):
if (ui.configbool('treedirstate', 'downgradeonpull') and
istreedirstate(repo)):
ui.status(_('disabling treedirstate...\n'))
downgrade(ui, repo)
elif (ui.configbool('treedirstate', 'upgradeonpull') and
not istreedirstate(repo)):
ui.status(_('migrating your repo to treedirstate which will make your '
'hg commands faster...\n'))
upgrade(ui, repo)
return orig(ui, repo, *args, **kwargs)
def featuresetup(ui, supported): def featuresetup(ui, supported):
supported |= {'treedirstate'} supported |= {'treedirstate'}
def extsetup(ui): def extsetup(ui):
# Check this version of Mercurial has the extension points we need # Check this version of Mercurial has the extension points we need
if not util.safehasattr(dirstate.dirstatemap, "hasdir"): if not util.safehasattr(dirstate.dirstatemap, "hasdir"):
ui.warn(_("this version of Mercurial doesn't support treedirstate\n")) ui.warn(_("this version of Mercurial doesn't support treedirstate\n"))
return return
if util.safehasattr(localrepo, 'newreporequirements'): if util.safehasattr(localrepo, 'newreporequirements'):
extensions.wrapfunction(localrepo, 'newreporequirements', extensions.wrapfunction(localrepo, 'newreporequirements',
wrapnewreporequirements) wrapnewreporequirements)
localrepo.localrepository.featuresetupfuncs.add(featuresetup) localrepo.localrepository.featuresetupfuncs.add(featuresetup)
extensions.wrapfilecache(localrepo.localrepository, 'dirstate', extensions.wrapfilecache(localrepo.localrepository, 'dirstate',
wrapdirstate) wrapdirstate)
extensions.wrapfunction(scmutil, 'casecollisionauditor', wrapcca) extensions.wrapfunction(scmutil, 'casecollisionauditor', wrapcca)
extensions.wrapfunction(localrepo.localrepository, 'close', wrapclose) extensions.wrapfunction(localrepo.localrepository, 'close', wrapclose)
extensions.wrapcommand(commands.table, 'pull', wrappull)
def reposetup(ui, repo): def reposetup(ui, repo):
ui.log('treedirstate_enabled', '', ui.log('treedirstate_enabled', '',
treedirstate_enabled=istreedirstate(repo)) treedirstate_enabled=istreedirstate(repo))
# debug commands # debug commands
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)