This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1206

configs: register more of our configs
ClosedPublic

Authored by durham on Oct 23 2017, 3:06 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX2489894d7567: configs: register more of our configs
Summary

Upstream has added devel warnings that require us to register all the configs
and remove the defaults that are specified at read time. This doesn't fix all
the cases, but is the start.

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

durham created this revision.Oct 23 2017, 3:06 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 23 2017, 3:06 PM
durham updated this revision to Diff 3055.Oct 23 2017, 3:09 PM
durham added inline comments.Oct 23 2017, 3:10 PM
tests/test-fbamend-to.t
8

This was needed because fbamend calls histedit.histedit which requires that the histedit extension be configured (because it needs to register it's configs).

quark accepted this revision.Oct 23 2017, 4:50 PM
This revision is now accepted and ready to land.Oct 23 2017, 4:50 PM
Closed by commit rFBHGX2489894d7567: configs: register more of our configs (authored by durham). · Explain WhyOct 25 2017, 8:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3099

fastmanifest/__init__.py

import cachemanager import cachemanager
from metrics import metricscollector from metrics import metricscollector
import debug import debug
from implementation import manifestfactory, fastmanifestcache from implementation import manifestfactory, fastmanifestcache
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {}
configitem = registrar.configitem(configtable)
configitem('fastmanifest', 'logfile', default='')
configitem('fastmanifest', 'debugmetrics', default=False)
configitem('fastmanifest', 'usecache', default=True)
configitem('fastmanifest', 'usetree', default=False)
@command('^debugcachemanifest', [ @command('^debugcachemanifest', [
('r', 'rev', [], 'cache the manifest for revs', 'REV'), ('r', 'rev', [], 'cache the manifest for revs', 'REV'),
('a', 'all', False, 'cache all relevant revisions', ''), ('a', 'all', False, 'cache all relevant revisions', ''),
('l', 'limit', 0, ('l', 'limit', 0,
'limit size of total rev in bytes (<0: unlimited; 0: default policy)', 'limit size of total rev in bytes (<0: unlimited; 0: default policy)',
'BYTES'), 'BYTES'),
('p', 'pruneall', False, 'prune all the entries'), ('p', 'pruneall', False, 'prune all the entries'),
('e', 'list', False, 'list the content of the cache and its size','')], ('e', 'list', False, 'list the content of the cache and its size','')],
extensions.wrapfunction( extensions.wrapfunction(
manifest.manifestlog, '__getitem__', factory.newgetitem) manifest.manifestlog, '__getitem__', factory.newgetitem)
extensions.wrapfunction( extensions.wrapfunction(
manifest.manifestlog, 'get', factory.newgetdirmanifestctx) manifest.manifestlog, 'get', factory.newgetdirmanifestctx)
extensions.wrapfunction( extensions.wrapfunction(
manifest.memmanifestctx, 'write', factory.ctxwrite) manifest.memmanifestctx, 'write', factory.ctxwrite)
extensions.wrapfunction(manifest.manifestrevlog, 'add', factory.add) extensions.wrapfunction(manifest.manifestrevlog, 'add', factory.add)
if ui.configbool('fastmanifest', 'usecache', True): if ui.configbool('fastmanifest', 'usecache'):
revsetmod.symbols['fastmanifesttocache'] = ( revsetmod.symbols['fastmanifesttocache'] = (
cachemanager.fastmanifesttocache cachemanager.fastmanifesttocache
) )
revsetmod.safesymbols.add('fastmanifesttocache') revsetmod.safesymbols.add('fastmanifesttocache')
revsetmod.symbols['fastmanifestcached'] = ( revsetmod.symbols['fastmanifestcached'] = (
cachemanager.fastmanifestcached cachemanager.fastmanifestcached
) )
revsetmod.safesymbols.add('fastmanifestcached') revsetmod.safesymbols.add('fastmanifestcached')

fastmanifest/debug.py

# debug.py # debug.py
# #
# Copyright 2016 Facebook, Inc. # Copyright 2016 Facebook, Inc.
# #
# 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.
class manifestaccesslogger(object): class manifestaccesslogger(object):
"""Class to log manifest access and confirm our assumptions""" """Class to log manifest access and confirm our assumptions"""
def __init__(self, ui): def __init__(self, ui):
self._ui = ui self._ui = ui
def revwrap(self, orig, *args, **kwargs): def revwrap(self, orig, *args, **kwargs):
"""Wraps manifest.rev and log access""" """Wraps manifest.rev and log access"""
r = orig(*args, **kwargs) r = orig(*args, **kwargs)
logfile = self._ui.config("fastmanifest", "logfile", "") logfile = self._ui.config("fastmanifest", "logfile")
if logfile: if logfile:
try: try:
with open(logfile, "a") as f: with open(logfile, "a") as f:
f.write("%s\n" % r) f.write("%s\n" % r)
except EnvironmentError: except EnvironmentError:
pass pass
return r return r
class fixedcachelimit(object): class fixedcachelimit(object):
"""A fix cache limit expressed as a number of bytes""" """A fix cache limit expressed as a number of bytes"""
def __init__(self, bytes): def __init__(self, bytes):
self._bytes = bytes self._bytes = bytes
def bytes(self): def bytes(self):
return self._bytes return self._bytes

fastmanifest/implementation.py

self.__flatmanifest = flat self.__flatmanifest = flat
self.loadflat = loadflat self.loadflat = loadflat
if supportsctree and ui.configbool("fastmanifest", "usetree", False): if supportsctree and ui.configbool("fastmanifest", "usetree", False):
self.__treemanifest = tree self.__treemanifest = tree
else: else:
self.__treemanifest = False self.__treemanifest = False
if ui.configbool("fastmanifest", "usecache", True): if ui.configbool("fastmanifest", "usecache"):
self.__cachedmanifest = fast self.__cachedmanifest = fast
else: else:
self.__cachedmanifest = False self.__cachedmanifest = False
assert (self.__flatmanifest is not None or assert (self.__flatmanifest is not None or
self.__cachedmanifest not in (None, False) or self.__cachedmanifest not in (None, False) or
self.__treemanifest not in (None, False) or self.__treemanifest not in (None, False) or
self.loadflat is not None) self.loadflat is not None)
def add(self, orig, *args, **kwargs): def add(self, orig, *args, **kwargs):
origself, m, transaction, link, p1, p2, added, removed = args[:8] origself, m, transaction, link, p1, p2, added, removed = args[:8]
fastcache = fastmanifestcache.getinstance(origself.opener, self.ui) fastcache = fastmanifestcache.getinstance(origself.opener, self.ui)
p1text = None p1text = None
p1hexnode = revlog.hex(p1) p1hexnode = revlog.hex(p1)
cacheenabled = self.ui.configbool("fastmanifest", "usecache", True) cacheenabled = self.ui.configbool("fastmanifest", "usecache")
treeenabled = self.ui.configbool("fastmanifest", "usetree", False) treeenabled = self.ui.configbool("fastmanifest", "usetree")
if (cacheenabled and if (cacheenabled and
p1hexnode in fastcache and p1hexnode in fastcache and
isinstance(m, hybridmanifest) and isinstance(m, hybridmanifest) and
m._incache()): m._incache()):
p1text = fastcache[p1hexnode].text() p1text = fastcache[p1hexnode].text()
elif treeenabled: elif treeenabled:
tree = m._treemanifest() tree = m._treemanifest()

fastmanifest/metrics.py

self.recordsample(aggkey, **data) self.recordsample(aggkey, **data)
_addhitratio("cachehit", "cachehitratio", dedupe=True) _addhitratio("cachehit", "cachehitratio", dedupe=True)
_addhitratio("diffcachehit", "diffcachehitratio") _addhitratio("diffcachehit", "diffcachehitratio")
_addhitratio("filesnotincachehit", "filesnotincachehitratio") _addhitratio("filesnotincachehit", "filesnotincachehitratio")
def logsamples(self, ui): def logsamples(self, ui):
self._addaggregatesamples() self._addaggregatesamples()
debug = ui.configbool("fastmanifest", "debugmetrics", False) debug = ui.configbool("fastmanifest", "debugmetrics")
if debug: if debug:
ui.status(("[FM-METRICS] Begin metrics\n")) ui.status(("[FM-METRICS] Begin metrics\n"))
for kind, kwargs in self.samples: for kind, kwargs in self.samples:
if kind in FASTMANIFEST_DONOTREPORT_METRICS: if kind in FASTMANIFEST_DONOTREPORT_METRICS:
continue continue
if debug: if debug:

hgext3rd/absorb/__init__.py

) )
from mercurial.i18n import _ from mercurial.i18n import _
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {}
configitem = registrar.configitem(configtable)
configitem('absorb', 'amendflag', default=None)
colortable = { colortable = {
'absorb.node': 'blue bold', 'absorb.node': 'blue bold',
'absorb.path': 'bold', 'absorb.path': 'bold',
} }
defaultdict = collections.defaultdict defaultdict = collections.defaultdict
class nullui(object): class nullui(object):
ui.write(_('# %s %s : %s\n') % ( ui.write(_('# %s %s : %s\n') % (
ui.label(symbol, 'status.' + word), ui.label(symbol, 'status.' + word),
ui.label(path, 'status.' + word), reason)) ui.label(path, 'status.' + word), reason))
if adoptedsum == 0: if adoptedsum == 0:
return 1 return 1
def extsetup(ui): def extsetup(ui):
_wrapamend(ui.config('absorb', 'amendflag', None)) _wrapamend(ui.config('absorb', 'amendflag'))

hgext3rd/directaccess.py

cmdtable = {} cmdtable = {}
if util.safehasattr(registrar, 'command'): if util.safehasattr(registrar, 'command'):
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
else: # compat with hg < 4.3 else: # compat with hg < 4.3
from mercurial import cmdutil from mercurial import cmdutil
command = cmdutil.command(cmdtable) command = cmdutil.command(cmdtable)
configtable = {}
configitem = registrar.configitem(configtable)
configitem('directaccess', 'loadsafter', default=[])
# By default, all the commands have directaccess with warnings # By default, all the commands have directaccess with warnings
# List of commands that have no directaccess and directaccess with no warning # List of commands that have no directaccess and directaccess with no warning
directaccesslevel = [ directaccesslevel = [
# Format: # Format:
# ('nowarning', 'evolve', 'prune'), # ('nowarning', 'evolve', 'prune'),
# means: no directaccess warning, for the command in evolve named prune # means: no directaccess warning, for the command in evolve named prune
# #
# ('error', None, 'serve'), # ('error', None, 'serve'),

hgext3rd/extorder.py

Also there are two special configs in this section: 'preferlast' and Also there are two special configs in this section: 'preferlast' and
'preferfirst'. Those are lists of extensions which prefer to be loaded first or 'preferfirst'. Those are lists of extensions which prefer to be loaded first or
last. But these are not guaranteed -- normal dependencies have higher priority. last. But these are not guaranteed -- normal dependencies have higher priority.
Please not that this extension modifies only order of loading extensions. It Please not that this extension modifies only order of loading extensions. It
will not load them for you will not load them for you
""" """
from mercurial import extensions from mercurial import (
extensions,
registrar,
)
try: try:
from mercurial import chgserver from mercurial import chgserver
except ImportError: except ImportError:
from hgext import chgserver from hgext import chgserver
chgserver._configsections.append('extorder') chgserver._configsections.append('extorder')
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
configtable = {}
configitem = registrar.configitem(configtable)
class MercurialExtOrderException(BaseException): class MercurialExtOrderException(BaseException):
'''Special exception to bypass upstream exception catching '''Special exception to bypass upstream exception catching
Upstream mercurial catches all Exception from uisetup or extsetup - see Upstream mercurial catches all Exception from uisetup or extsetup - see
ea1c2eb7abd341c84422f489af75bccb02622671. We need to throw something that is ea1c2eb7abd341c84422f489af75bccb02622671. We need to throw something that is
subclass of BaseException to actually abort the program if extension order subclass of BaseException to actually abort the program if extension order
is incorrect. That's why this class exists. is incorrect. That's why this class exists.
''' '''
pass pass
def uisetup(ui): def uisetup(ui):
deps = {} deps = {}
preferlast = [] preferlast = []
preferfirst = [] preferfirst = []
# The configs being read here are user defined, so we need to suppress
# warnings telling us to register them.
with ui.configoverride({("devel", "all-warnings"): False}):
for item, _v in ui.configitems('extorder'): for item, _v in ui.configitems('extorder'):
val = ui.configlist('extorder', item) val = ui.configlist('extorder', item)
if item == 'preferlast': if item == 'preferlast':
preferlast.extend(val) preferlast.extend(val)
elif item == 'preferfirst': elif item == 'preferfirst':
preferfirst.extend(val) preferfirst.extend(val)
else: else:
deps[item] = val deps[item] = val
exts = list(extensions._order) exts = list(extensions._order)
for e in preferfirst + preferlast: for e in preferfirst + preferlast:
exts.remove(e) exts.remove(e)
unvisited = preferfirst + exts + preferlast unvisited = preferfirst + exts + preferlast
temp = set() temp = set()
order = list() order = list()

hgext3rd/fbamend/__init__.py

cmdtable.update(fold.cmdtable) cmdtable.update(fold.cmdtable)
cmdtable.update(hide.cmdtable) cmdtable.update(hide.cmdtable)
cmdtable.update(metaedit.cmdtable) cmdtable.update(metaedit.cmdtable)
cmdtable.update(movement.cmdtable) cmdtable.update(movement.cmdtable)
cmdtable.update(prune.cmdtable) cmdtable.update(prune.cmdtable)
cmdtable.update(split.cmdtable) cmdtable.update(split.cmdtable)
cmdtable.update(unamend.cmdtable) cmdtable.update(unamend.cmdtable)
configtable = {}
configitem = registrar.configitem(configtable)
configitem('fbamend', 'alwaysnewest', default=False)
configitem('fbamend', 'date', default=None)
configitem('fbamend', 'education', default=None)
configitem('fbamend', 'safestrip', default=True)
configitem('fbamend', 'userestack', default=False)
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
amendopts = [ amendopts = [
('', 'rebase', None, _('rebases children after the amend')), ('', 'rebase', None, _('rebases children after the amend')),
('', 'fixup', None, _('rebase children from a previous amend')), ('', 'fixup', None, _('rebase children from a previous amend')),
('', 'to', '', _('amend to a specific commit in the current stack')), ('', 'to', '', _('amend to a specific commit in the current stack')),
] ]

hgext3rd/fbamend/prune.py

stripmod = extensions.find('strip') stripmod = extensions.find('strip')
except KeyError: except KeyError:
pass pass
else: else:
extensions.wrapcommand(stripmod.cmdtable, 'strip', safestrip) extensions.wrapcommand(stripmod.cmdtable, 'strip', safestrip)
def uisetup(ui): def uisetup(ui):
# developer config: fbamend.safestrip # developer config: fbamend.safestrip
if ui.configbool('fbamend', 'safestrip', True): if ui.configbool('fbamend', 'safestrip'):
extensions.afterloaded('strip', wrapstrip) extensions.afterloaded('strip', wrapstrip)

hgext3rd/fbhistedit.py

from mercurial import pycompat from mercurial import pycompat
from mercurial import registrar from mercurial import registrar
from mercurial import scmutil from mercurial import scmutil
from mercurial.i18n import _ from mercurial.i18n import _
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {}
configitem = registrar.configitem(configtable)
configitem('fbhistedit', 'exec_in_user_shell', default=None)
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
def defineactions(): def defineactions():
histedit = extensions.find('histedit') histedit = extensions.find('histedit')
@histedit.action(['stop', 's'], @histedit.action(['stop', 's'],
_('pick changeset, and stop after committing changes')) _('pick changeset, and stop after committing changes'))
class stop(histedit.histeditaction): class stop(histedit.histeditaction):
def run(self): def run(self):

hgext3rd/grpcheck.py

# if the user is not a member of any of those groups, override chgserver # if the user is not a member of any of those groups, override chgserver
# config to make chgserver exit earlier # config to make chgserver exit earlier
overrides.chgserver.idletimeout = 2 overrides.chgserver.idletimeout = 2
""" """
import os import os
import grp import grp
from mercurial import (
registrar,
)
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
_missinggroup = None _missinggroup = None
configtable = {}
configitem = registrar.configitem(configtable)
configitem('grpcheck', 'groups', default=[])
def _grpname2gid(name): def _grpname2gid(name):
try: try:
return grp.getgrnam(name).gr_gid return grp.getgrnam(name).gr_gid
except KeyError: except KeyError:
return None return None
def _firstmissinggroup(groupnames): def _firstmissinggroup(groupnames):
usergids = set(os.getgroups()) usergids = set(os.getgroups())

hgext3rd/logginghelper.py

configoptions = section1.option1,section2.option2 configoptions = section1.option1,section2.option2
""" """
import os import os
from mercurial import ( from mercurial import (
extensions, extensions,
localrepo, localrepo,
registrar,
) )
configtable = {}
configitem = registrar.configitem(configtable)
configitem('logging', 'configoptions', default=[])
def _localrepoinit(orig, self, baseui, path=None, create=False): def _localrepoinit(orig, self, baseui, path=None, create=False):
orig(self, baseui, path, create) orig(self, baseui, path, create)
reponame = self.ui.config('paths', 'default') reponame = self.ui.config('paths', 'default')
if reponame: if reponame:
reponame = os.path.basename(reponame) reponame = os.path.basename(reponame)
configoptstolog = self.ui.configlist('logging', 'configoptions') configoptstolog = self.ui.configlist('logging', 'configoptions')
kwargs = {'repo': reponame} kwargs = {'repo': reponame}
# The configs being read here are user defined, so we need to suppress
# warnings telling us to register them.
with self.ui.configoverride({("devel", "all-warnings"): False}):
for option in configoptstolog: for option in configoptstolog:
splitted = option.split('.') splitted = option.split('.')
if len(splitted) != 2: if len(splitted) != 2:
continue continue
section, name = splitted section, name = splitted
value = self.ui.config(section, name) value = self.ui.config(section, name)
if value is not None: if value is not None:
kwargs[name] = value kwargs[name] = value
obsstore_size = 0 obsstore_size = 0
try: try:
obsstore_size = self.svfs.stat('obsstore').st_size obsstore_size = self.svfs.stat('obsstore').st_size
except Exception: except Exception:
# just ignore exception, it's better than failing the whole command # just ignore exception, it's better than failing the whole command
pass pass

hgext3rd/morestatus.py

import os import os
from mercurial import commands from mercurial import commands
from mercurial.extensions import wrapcommand from mercurial.extensions import wrapcommand
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import merge as mergemod from mercurial import merge as mergemod
from mercurial import scmutil from mercurial import scmutil
from mercurial import (
registrar,
)
UPDATEARGS = 'updateargs' UPDATEARGS = 'updateargs'
configtable = {}
configitem = registrar.configitem(configtable)
configitem('morestatus', 'show', default=False)
def prefixlines(raw): def prefixlines(raw):
'''Surround lineswith a comment char and a new line''' '''Surround lineswith a comment char and a new line'''
lines = raw.splitlines() lines = raw.splitlines()
commentedlines = ['# %s' % line for line in lines] commentedlines = ['# %s' % line for line in lines]
return '\n'.join(commentedlines) + '\n' return '\n'.join(commentedlines) + '\n'
def conflictsmsg(repo, ui): def conflictsmsg(repo, ui):
# be in a merge or update state (eg. rebase, histedit, graft, etc). # be in a merge or update state (eg. rebase, histedit, graft, etc).
# We want those to have priority. # We want those to have priority.
('merge', mergepredicate, mergemsg), ('merge', mergepredicate, mergemsg),
('update', fileexistspredicate('updatestate'), updatemsg), ('update', fileexistspredicate('updatestate'), updatemsg),
) )
def extsetup(ui): def extsetup(ui):
if ui.configbool('morestatus', 'show', False) and not ui.plain(): if ui.configbool('morestatus', 'show') and not ui.plain():
wrapcommand(commands.table, 'status', statuscmd) wrapcommand(commands.table, 'status', statuscmd)
# Write down `hg update` args to show the continue command in # Write down `hg update` args to show the continue command in
# interrupted update state. # interrupted update state.
ui.setconfig('hooks', 'pre-update.morestatus', saveupdateargs) ui.setconfig('hooks', 'pre-update.morestatus', saveupdateargs)
ui.setconfig('hooks', 'post-update.morestatus', cleanupdateargs) ui.setconfig('hooks', 'post-update.morestatus', cleanupdateargs)
def saveupdateargs(repo, args, **kwargs): def saveupdateargs(repo, args, **kwargs):
# args is a string containing all flags and arguments # args is a string containing all flags and arguments

hgext3rd/phrevset.py

Example for www: Example for www:
[phrevset] [phrevset]
callsign = E callsign = E
""" """
from mercurial import hg from mercurial import (
from mercurial import extensions error,
from mercurial import revset, smartset extensions,
from mercurial import error hg,
registrar,
revset,
smartset,
)
from mercurial.i18n import _ from mercurial.i18n import _
try: try:
from hgsubversion import util as svnutil from hgsubversion import util as svnutil
except ImportError: except ImportError:
svnutil = None svnutil = None
import os import os
import signal import signal
import json import json
import re import re
import subprocess import subprocess
configtable = {}
configitem = registrar.configitem(configtable)
configitem('phrevset', 'callsign', default=None)
DIFFERENTIAL_REGEX = re.compile( DIFFERENTIAL_REGEX = re.compile(
'Differential Revision: http.+?/' # Line start, URL 'Differential Revision: http.+?/' # Line start, URL
'D(?P<id>[0-9]+)', # Differential ID, just numeric part 'D(?P<id>[0-9]+)', # Differential ID, just numeric part
flags = re.LOCALE flags = re.LOCALE
) )
DESCRIPTION_REGEX = re.compile( DESCRIPTION_REGEX = re.compile(
'Commit r' # Prefix 'Commit r' # Prefix

hgext3rd/sampling.py

# sampling.py - sample collection extension # sampling.py - sample collection extension
# #
# Copyright 2016 Facebook # Copyright 2016 Facebook
# #
# 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.
# #
# Usage: # Usage:
# - This extension enhances ui.log(category, message, key=value, ...) # - This extension enhances ui.log(category, message, key=value, ...)
# to also append filtered logged events as JSON to a file. # to also append filtered logged events as JSON to a file.
# - The events are separated by NULL characters: '\0'. # - The events are separated by NULL characters: '\0'.
# - The file is either specified with the SCM_SAMPLING_FILEPATH environment # - The file is either specified with the SCM_SAMPLING_FILEPATH environment
# variable or the sampling.filepath configuration. # variable or the sampling.filepath configuration.
# - If the file cannot be created or accessed, fails silently # - If the file cannot be created or accessed, fails silently
# #
# The configuration details can be found in the documentation of ui.log below # The configuration details can be found in the documentation of ui.log below
from mercurial import encoding, util from mercurial import encoding, registrar, util
import json, os import json, os
configtable = {}
configitem = registrar.configitem(configtable)
configitem('sampling', 'filepath', default='')
def _parentfolderexists(f): def _parentfolderexists(f):
return (f is not None and return (f is not None and
os.path.exists(os.path.dirname(os.path.normpath(f)))) os.path.exists(os.path.dirname(os.path.normpath(f))))
def _getcandidatelocation(ui): def _getcandidatelocation(ui):
for candidatelocation in ( for candidatelocation in (
encoding.environ.get("SCM_SAMPLING_FILEPATH", None), encoding.environ.get("SCM_SAMPLING_FILEPATH", None),
ui.config("sampling", "filepath", "")): ui.config("sampling", "filepath")):
if _parentfolderexists(candidatelocation): if _parentfolderexists(candidatelocation):
return candidatelocation return candidatelocation
return None return None
def uisetup(ui): def uisetup(ui):
class logtofile(ui.__class__): class logtofile(ui.__class__):
@classmethod @classmethod
def computesamplingfilters(cls, self): def computesamplingfilters(cls, self):

hgext3rd/sigtrace.py

""" """
import os import os
import signal import signal
import sys import sys
import time import time
import traceback import traceback
from mercurial import (
registrar,
)
pathformat = '/tmp/trace-%(pid)s-%(time)s.log' pathformat = '/tmp/trace-%(pid)s-%(time)s.log'
configtable = {}
configitem = registrar.configitem(configtable)
configitem('sigtrace', 'pathformat', default=pathformat)
configitem('sigtrace', 'signal', default='USR1')
def printstacks(sig, currentframe): def printstacks(sig, currentframe):
content = '' content = ''
for tid, frame in sys._current_frames().iteritems(): for tid, frame in sys._current_frames().iteritems():
content += ('Thread %s:\n%s\n' content += ('Thread %s:\n%s\n'
% (tid, ''.join(traceback.format_stack(frame)))) % (tid, ''.join(traceback.format_stack(frame))))
with open(pathformat % {'time': time.time(), 'pid': os.getpid()}, 'w') as f: with open(pathformat % {'time': time.time(), 'pid': os.getpid()}, 'w') as f:
f.write(content) f.write(content)
def uisetup(ui): def uisetup(ui):
global pathformat global pathformat
pathformat = ui.config('sigtrace', 'pathformat', pathformat) pathformat = ui.config('sigtrace', 'pathformat')
signame = ui.config('sigtrace', 'signal', 'USR1') signame = ui.config('sigtrace', 'signal')
sig = getattr(signal, 'SIG' + signame, None) sig = getattr(signal, 'SIG' + signame, None)
if sig is not None: if sig is not None:
signal.signal(sig, printstacks) signal.signal(sig, printstacks)

hgext3rd/tweakdefaults.py

bmnodesthint = '' bmnodesthint = ''
bmnodestmsg = '' bmnodestmsg = ''
branchmessage = '' branchmessage = ''
branchesmessage = '' branchesmessage = ''
mergemessage = '' mergemessage = ''
nodesthint = '' nodesthint = ''
nodestmsg = '' nodestmsg = ''
rollbackhint = '' rollbackhint = ''
rollbackmessage = ''
singlecolonmsg = '' singlecolonmsg = ''
tagmessage = ''
tagsmessage = '' tagsmessage = ''
# output new hashes when nodes get updated # output new hashes when nodes get updated
showupdated = False showupdated = False
""" """
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
globaldata = 'globaldata' globaldata = 'globaldata'
createmarkersoperation = 'createmarkersoperation' createmarkersoperation = 'createmarkersoperation'
logopts = [ logopts = [
('', 'all', None, _('shows all changesets in the repo')), ('', 'all', None, _('shows all changesets in the repo')),
] ]
configtable = {}
configitem = registrar.configitem(configtable)
configitem('grep', 'command', default='grep')
configitem(globaldata, createmarkersoperation, default=None)
configitem('tweakdefaults', 'singlecolonabort', default=False)
configitem('tweakdefaults', 'singlecolonwarn', default=False)
configitem('tweakdefaults', 'showupdated', default=False)
configitem('tweakdefaults', 'nooprebase', default=True)
configitem('tweakdefaults', 'amendkeepdate', default=False)
configitem('tweakdefaults', 'graftkeepdate', default=False)
configitem('tweakdefaults', 'histeditkeepdate', default=False)
configitem('tweakdefaults', 'rebasekeepdate', default=False)
configitem('tweakdefaults', 'allowbranch', default=True)
configitem('tweakdefaults', 'allowfullrepohistgrep', default=False)
configitem('tweakdefaults', 'allowmerge', default=True)
configitem('tweakdefaults', 'allowrollback', default=True)
configitem('tweakdefaults', 'allowtags', default=True)
rebasemsg = _('you must use a bookmark with tracking '
'or manually specify a destination for the rebase')
configitem('tweakdefaults', 'bmnodesthint', default=
_('set up tracking with `hg book -t <destination>` '
'or manually supply --dest / -d'))
configitem('tweakdefaults', 'bmnodestmsg', default=rebasemsg)
configitem('tweakdefaults', 'branchmessage', default=
_('new named branches are disabled in this repository'))
configitem('tweakdefaults', 'branchesmessage', default=None)
configitem('tweakdefaults', 'mergemessage', default=
_('merging is not supported for this repository'))
configitem('tweakdefaults', 'nodesthint', default=
_('set up tracking with `hg book <name> -t <destination>` '
'or manually supply --dest / -d'))
configitem('tweakdefaults', 'nodestmsg', default=rebasemsg)
configitem('tweakdefaults', 'rollbackmessage', default=
_('the use of rollback is disabled'))
configitem('tweakdefaults', 'rollbackhint', default=None)
configitem('tweakdefaults', 'singlecolonmsg', default=
_("use of ':' is deprecated"))
configitem('tweakdefaults', 'tagmessage', default=
_('new tags are disabled in this repository'))
configitem('tweakdefaults', 'tagsmessage', default='')
def uisetup(ui): def uisetup(ui):
tweakorder() tweakorder()
# if we want to replace command's docstring (not just add stuff to it), # if we want to replace command's docstring (not just add stuff to it),
# we need to do it in uisetup, not extsetup # we need to do it in uisetup, not extsetup
commands.table['^annotate|blame'][0].__doc__ = blame.__doc__ commands.table['^annotate|blame'][0].__doc__ = blame.__doc__
def extsetup(ui): def extsetup(ui):
entry = wrapcommand(commands.table, 'update', update) entry = wrapcommand(commands.table, 'update', update)
mess = _('specify either rebase or update, not both') mess = _('specify either rebase or update, not both')
raise error.Abort(mess) raise error.Abort(mess)
if dest and not (isrebase or update): if dest and not (isrebase or update):
mess = _('only specify a destination if rebasing or updating') mess = _('only specify a destination if rebasing or updating')
raise error.Abort(mess) raise error.Abort(mess)
if (isrebase or update) and not dest: if (isrebase or update) and not dest:
rebasemsg = _('you must use a bookmark with tracking '
'or manually specify a destination for the rebase')
if isrebase and bmactive(repo): if isrebase and bmactive(repo):
mess = ui.config('tweakdefaults', 'bmnodestmsg', rebasemsg) mess = ui.config('tweakdefaults', 'bmnodestmsg')
hint = ui.config('tweakdefaults', 'bmnodesthint', _( hint = ui.config('tweakdefaults', 'bmnodesthint')
'set up tracking with `hg book -t <destination>` '
'or manually supply --dest / -d'))
elif isrebase: elif isrebase:
mess = ui.config('tweakdefaults', 'nodestmsg', rebasemsg) mess = ui.config('tweakdefaults', 'nodestmsg')
hint = ui.config('tweakdefaults', 'nodesthint', _( hint = ui.config('tweakdefaults', 'nodesthint')
'set up tracking with `hg book <name> -t <destination>` '
'or manually supply --dest / -d'))
else: # update else: # update
mess = _('you must specify a destination for the update') mess = _('you must specify a destination for the update')
hint = _('use `hg pull --update --dest <destination>`') hint = _('use `hg pull --update --dest <destination>`')
raise error.Abort(mess, hint=hint) raise error.Abort(mess, hint=hint)
if 'rebase' in opts: if 'rebase' in opts:
del opts['rebase'] del opts['rebase']
tool = opts.pop('tool', '') tool = opts.pop('tool', '')
In future we may add or modify other behaviours here. In future we may add or modify other behaviours here.
""" """
# noop rebase returns 0 # noop rebase returns 0
def _nothingtorebase(orig, *args, **kwargs): def _nothingtorebase(orig, *args, **kwargs):
return 0 return 0
if ui.configbool("tweakdefaults", "nooprebase", True): if ui.configbool("tweakdefaults", "nooprebase"):
try: try:
rebase = extensions.find("rebase") rebase = extensions.find("rebase")
extensions.wrapfunction( extensions.wrapfunction(
rebase, "_nothingtorebase", _nothingtorebase rebase, "_nothingtorebase", _nothingtorebase
) )
except (KeyError, AttributeError): except (KeyError, AttributeError):
pass pass
def grep(ui, repo, pattern, *pats, **opts): def grep(ui, repo, pattern, *pats, **opts):
"""search for a pattern in tracked files in the working directory """search for a pattern in tracked files in the working directory
The default regexp style is POSIX basic regexps. If no FILE parameters are The default regexp style is POSIX basic regexps. If no FILE parameters are
passed in, the current directory and its subdirectories will be searched. passed in, the current directory and its subdirectories will be searched.
For the old 'hg grep', see 'histgrep'.""" For the old 'hg grep', see 'histgrep'."""
grepcommandstr = ui.config('grep', 'command', default='grep') grepcommandstr = ui.config('grep', 'command')
# Use shlex.split() to split up grepcommandstr into multiple arguments. # Use shlex.split() to split up grepcommandstr into multiple arguments.
# this allows users to specify a command plus arguments (e.g., "grep -i"). # this allows users to specify a command plus arguments (e.g., "grep -i").
# We don't use a real shell to execute this, which ensures we won't do # We don't use a real shell to execute this, which ensures we won't do
# bad stuff if their command includes redirects, semicolons, or other # bad stuff if their command includes redirects, semicolons, or other
# special characters etc. # special characters etc.
cmd = ['xargs', '-0'] + shlex.split(grepcommandstr) + [ cmd = ['xargs', '-0'] + shlex.split(grepcommandstr) + [
'--no-messages', '--no-messages',
'--binary-files=without-match', '--binary-files=without-match',
abort = ui.configbool('tweakdefaults', 'singlecolonabort') abort = ui.configbool('tweakdefaults', 'singlecolonabort')
enabled = warn or abort enabled = warn or abort
# The last condition is added so that warnings are not shown if # The last condition is added so that warnings are not shown if
# hg log --follow is invoked w/o arguments # hg log --follow is invoked w/o arguments
if enabled and isinstance(x, tuple) and \ if enabled and isinstance(x, tuple) and \
(x[0] in ('range', 'rangepre', 'rangepost')) and \ (x[0] in ('range', 'rangepre', 'rangepost')) and \
x != ('rangepre', ('symbol', '.')): x != ('rangepre', ('symbol', '.')):
msg = ui.config('tweakdefaults', 'singlecolonmsg', msg = ui.config('tweakdefaults', 'singlecolonmsg')
_("use of ':' is deprecated"))
if abort: if abort:
raise error.Abort('%s' % msg) raise error.Abort('%s' % msg)
if warn: if warn:
ui.warn(_('warning: %s\n') % msg) ui.warn(_('warning: %s\n') % msg)
return result return result
def _rebase(orig, ui, repo, **opts): def _rebase(orig, ui, repo, **opts):
return result return result
return orig(ui, repo, **opts) return orig(ui, repo, **opts)
# set of commands which define their own formatter and prints the hash changes # set of commands which define their own formatter and prints the hash changes
formattercommands = set() formattercommands = set()
def cleanupnodeswrapper(orig, repo, mapping, operation, *args, **kwargs): def cleanupnodeswrapper(orig, repo, mapping, operation, *args, **kwargs):
if (repo.ui.configbool('tweakdefaults', 'showupdated', False) and if (repo.ui.configbool('tweakdefaults', 'showupdated') and
operation not in formattercommands): operation not in formattercommands):
maxoutput = 10 maxoutput = 10
oldnodes = sorted(mapping.keys()) oldnodes = sorted(mapping.keys())
for i in range(0, min(len(oldnodes), maxoutput)): for i in range(0, min(len(oldnodes), maxoutput)):
oldnode = oldnodes[i] oldnode = oldnodes[i]
newnodes = mapping[oldnode] newnodes = mapping[oldnode]
_printupdatednode(repo, oldnode, newnodes) _printupdatednode(repo, oldnode, newnodes)
if len(oldnodes) > maxoutput + 1: if len(oldnodes) > maxoutput + 1:
# 'hg log' defaults to -f # 'hg log' defaults to -f
# All special uses of log (--date, --branch, etc) will also now do follow. # All special uses of log (--date, --branch, etc) will also now do follow.
if not opts.get('rev') and not opts.get('all'): if not opts.get('rev') and not opts.get('all'):
opts['follow'] = True opts['follow'] = True
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)
def branchcmd(orig, ui, repo, label=None, **opts): def branchcmd(orig, ui, repo, label=None, **opts):
message = ui.config('tweakdefaults', 'branchmessage', message = ui.config('tweakdefaults', 'branchmessage')
_('new named branches are disabled in this repository')) enabled = ui.configbool('tweakdefaults', 'allowbranch')
enabled = ui.configbool('tweakdefaults', 'allowbranch', True)
if (enabled and opts.get('new')) or label is None: if (enabled and opts.get('new')) or label is None:
if 'new' in opts: if 'new' in opts:
del opts['new'] del opts['new']
return orig(ui, repo, label, **opts) return orig(ui, repo, label, **opts)
elif enabled: elif enabled:
raise error.Abort( raise error.Abort(
_('do not use branches; use bookmarks instead'), _('do not use branches; use bookmarks instead'),
hint=_('use --new if you are certain you want a branch')) hint=_('use --new if you are certain you want a branch'))
else: else:
raise error.Abort(message) raise error.Abort(message)
def branchescmd(orig, ui, repo, active, closed, **opts): def branchescmd(orig, ui, repo, active, closed, **opts):
message = ui.config('tweakdefaults', 'branchesmessage') message = ui.config('tweakdefaults', 'branchesmessage')
if message: if message:
ui.warn(message + '\n') ui.warn(message + '\n')
return orig(ui, repo, active, closed, **opts) return orig(ui, repo, active, closed, **opts)
def mergecmd(orig, ui, repo, node=None, **opts): def mergecmd(orig, ui, repo, node=None, **opts):
""" """
Allowing to disable merges Allowing to disable merges
""" """
if ui.configbool('tweakdefaults','allowmerge', True): if ui.configbool('tweakdefaults','allowmerge', True):
return orig(ui, repo, node, **opts) return orig(ui, repo, node, **opts)
else: else:
message = ui.config('tweakdefaults', 'mergemessage', message = ui.config('tweakdefaults', 'mergemessage')
_('merging is not supported for this repository'))
hint = ui.config('tweakdefaults', 'mergehint', _('use rebase instead')) hint = ui.config('tweakdefaults', 'mergehint', _('use rebase instead'))
raise error.Abort(message, hint=hint) raise error.Abort(message, hint=hint)
def statuscmd(orig, ui, repo, *pats, **opts): def statuscmd(orig, ui, repo, *pats, **opts):
""" """
Make status relative by default for interactive usage Make status relative by default for interactive usage
""" """
if opts.get('root_relative'): if opts.get('root_relative'):
elif not pats or (len(pats) == 1 and pats[0] == 're:'): elif not pats or (len(pats) == 1 and pats[0] == 're:'):
pats = [''] pats = ['']
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)
def rollbackcmd(orig, ui, repo, **opts): def rollbackcmd(orig, ui, repo, **opts):
""" """
Allowing to disable the rollback command Allowing to disable the rollback command
""" """
if ui.configbool('tweakdefaults', 'allowrollback', True): if ui.configbool('tweakdefaults', 'allowrollback'):
return orig(ui, repo, **opts) return orig(ui, repo, **opts)
else: else:
message = ui.config('tweakdefaults', 'rollbackmessage', message = ui.config('tweakdefaults', 'rollbackmessage')
_('the use of rollback is disabled')) hint = ui.config('tweakdefaults', 'rollbackhint')
hint = ui.config('tweakdefaults', 'rollbackhint', None)
raise error.Abort(message, hint=hint) raise error.Abort(message, hint=hint)
def tagcmd(orig, ui, repo, name1, *names, **opts): def tagcmd(orig, ui, repo, name1, *names, **opts):
""" """
Allowing to disable tags Allowing to disable tags
""" """
message = ui.config('tweakdefaults', 'tagmessage', message = ui.config('tweakdefaults', 'tagmessage')
_('new tags are disabled in this repository')) if ui.configbool('tweakdefaults', 'allowtags'):
if ui.configbool('tweakdefaults', 'allowtags', True):
return orig(ui, repo, name1, *names, **opts) return orig(ui, repo, name1, *names, **opts)
else: else:
raise error.Abort(message) raise error.Abort(message)
def tagscmd(orig, ui, repo, **opts): def tagscmd(orig, ui, repo, **opts):
message = ui.config('tweakdefaults', 'tagsmessage', '') message = ui.config('tweakdefaults', 'tagsmessage')
if message: if message:
ui.warn(message + '\n') ui.warn(message + '\n')
return orig(ui, repo, **opts) return orig(ui, repo, **opts)
def bookmarkcmd(orig, ui, repo, *names, **opts): def bookmarkcmd(orig, ui, repo, *names, **opts):
strip = opts.pop('strip') strip = opts.pop('strip')
if not strip: if not strip:
return orig(ui, repo, *names, **opts) return orig(ui, repo, *names, **opts)
def bmactive(repo): def bmactive(repo):
try: try:
return repo._activebookmark return repo._activebookmark
except AttributeError: except AttributeError:
return repo._bookmarkcurrent return repo._bookmarkcurrent
def _createmarkers(orig, repo, relations, flag=0, date=None, metadata=None, def _createmarkers(orig, repo, relations, flag=0, date=None, metadata=None,
operation=None): operation=None):
operation = repo.ui.config(globaldata, createmarkersoperation, operation) configoperation = repo.ui.config(globaldata, createmarkersoperation)
if configoperation is not None:
operation = configoperation
if operation is None: if operation is None:
return orig(repo, relations, flag, date, metadata) return orig(repo, relations, flag, date, metadata)
# While _createmarkers in newer Mercurial does have an operation argument, # While _createmarkers in newer Mercurial does have an operation argument,
# it is ignored unless certain configs are set. Let's just continue to set # it is ignored unless certain configs are set. Let's just continue to set
# it directly on the metadata for now. # it directly on the metadata for now.
if metadata is None: if metadata is None:
metadata = {} metadata = {}

hgext3rd/undo.py

from hgext3rd import ( from hgext3rd import (
interactiveui, interactiveui,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
configtable = {}
configitem = registrar.configitem(configtable)
configitem('undo', '_duringundologlock', default=False)
# Setup # Setup
def extsetup(ui): def extsetup(ui):
extensions.wrapfunction(dispatch, 'runcommand', _runcommandwrapper) extensions.wrapfunction(dispatch, 'runcommand', _runcommandwrapper)
# undo has its own locking, whitelist itself to bypass repo lock audit # undo has its own locking, whitelist itself to bypass repo lock audit
localrepo.localrepository._wlockfreeprefix.add('undolog/') localrepo.localrepository._wlockfreeprefix.add('undolog/')

tests/test-check-config-hg.t

undocumented: fastmanifest.cachecutoffdays (int) [60] undocumented: fastmanifest.cachecutoffdays (int) [60]
undocumented: fastmanifest.cacheonchange (bool) undocumented: fastmanifest.cacheonchange (bool)
undocumented: fastmanifest.cacheonchangebackground (bool) [True] undocumented: fastmanifest.cacheonchangebackground (bool) [True]
undocumented: fastmanifest.debugfastmanifest (bool) undocumented: fastmanifest.debugfastmanifest (bool)
undocumented: fastmanifest.debugmetrics (bool) undocumented: fastmanifest.debugmetrics (bool)
undocumented: fastmanifest.logfile (str) undocumented: fastmanifest.logfile (str)
undocumented: fastmanifest.maxinmemoryentries (str) [DEFAULT_MAX_MEMORY_ENTRIES] undocumented: fastmanifest.maxinmemoryentries (str) [DEFAULT_MAX_MEMORY_ENTRIES]
undocumented: fastmanifest.silent (bool) undocumented: fastmanifest.silent (bool)
undocumented: fastmanifest.usecache (bool) [True] undocumented: fastmanifest.usecache (bool)
undocumented: fastmanifest.usetree (bool) undocumented: fastmanifest.usetree (bool)
undocumented: fbconduit.backingrepos (list) [[reponame]] undocumented: fbconduit.backingrepos (list) [[reponame]]
undocumented: fbconduit.gitcallsigns (list) undocumented: fbconduit.gitcallsigns (list)
undocumented: fbconduit.host (str) undocumented: fbconduit.host (str)
undocumented: fbconduit.path (str) undocumented: fbconduit.path (str)
undocumented: fbconduit.protocol (str) undocumented: fbconduit.protocol (str)
undocumented: fbconduit.reponame (str) undocumented: fbconduit.reponame (str)
undocumented: fbhistedit.exec_in_user_shell (str) undocumented: fbhistedit.exec_in_user_shell (str)
undocumented: grep.command (str) ['grep'] undocumented: grep.command (str)
undocumented: morestatus.show (bool) undocumented: morestatus.show (bool)
undocumented: nointerrupt.interactiveonly (bool) [True] undocumented: nointerrupt.interactiveonly (bool) [True]
undocumented: perftweaks.cachenoderevs (bool) [True] undocumented: perftweaks.cachenoderevs (bool) [True]
undocumented: perftweaks.disablebranchcache (bool) undocumented: perftweaks.disablebranchcache (bool)
undocumented: perftweaks.disablecasecheck (bool) undocumented: perftweaks.disablecasecheck (bool)
undocumented: perftweaks.disabletags (bool) undocumented: perftweaks.disabletags (bool)
undocumented: perftweaks.preferdeltas (bool) undocumented: perftweaks.preferdeltas (bool)
undocumented: phabstatus.logpeekahead (int) [30] undocumented: phabstatus.logpeekahead (int) [30]

tests/test-fbamend-to.t

Set up test environment. Set up test environment.
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> debuginhibit=$TESTDIR/../hgext3rd/debuginhibit.py > debuginhibit=$TESTDIR/../hgext3rd/debuginhibit.py
> directaccess=$TESTDIR/../hgext3rd/directaccess.py > directaccess=$TESTDIR/../hgext3rd/directaccess.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> histedit=
durhamAuthorUnsubmitted
Not Done

This was needed because fbamend calls histedit.histedit which requires that the histedit extension be configured (because it needs to register it's configs).

durham: This was needed because fbamend calls histedit.histedit which requires that the histedit…
> rebase= > rebase=
> [experimental] > [experimental]
> evolution = createmarkers, allowunstable > evolution = createmarkers, allowunstable
> EOF > EOF
Test that amend --to option Test that amend --to option
$ hg init repo && cd repo $ hg init repo && cd repo
$ mkcommit() { $ mkcommit() {
> echo "$1" > "$1" > echo "$1" > "$1"