##// END OF EJS Templates
overlayworkingctx: default branch to base context's branch...
overlayworkingctx: default branch to base context's branch This matches what the dirstate does (it reuses working copy parent's branch unless told otherwise). By moving the default out of `rebase.commitmemorynode()`, it will let us clean that up better later. Differential Revision: https://phab.mercurial-scm.org/D7821

File last commit:

r44484:2d4cad94 default
r44502:2ecbc4ec default
Show More
rcutil.py
114 lines | 3.4 KiB | text/x-python | PythonLexer
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 # rcutil.py - utilities about config paths, special config sections etc.
#
# Copyright Mercurial Contributors
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import os
from . import (
encoding,
pycompat,
util,
)
Martin von Zweigbergk
util: remove datapath and swith users over to resourceutil...
r44070 from .utils import resourceutil
Jun Wu
codemod: use pycompat.iswindows...
r34646 if pycompat.iswindows:
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 from . import scmwindows as scmplatform
else:
from . import scmposix as scmplatform
Yuya Nishihara
pager: use less as a fallback on Unix...
r32078 fallbackpager = scmplatform.fallbackpager
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 systemrcpath = scmplatform.systemrcpath
userrcpath = scmplatform.userrcpath
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
rcutil: extract rc directory listing logic...
r31681 def _expandrcpath(path):
'''path could be a file or a directory. return a list of file paths'''
p = util.expandpath(path)
if os.path.isdir(p):
join = os.path.join
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 return sorted(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 join(p, f) for f, k in util.listdir(p) if f.endswith(b'.rc')
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 )
Jun Wu
rcutil: extract rc directory listing logic...
r31681 return [p]
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
rcutil: add a method to convert environment variables to config items...
r31684 def envrcitems(env=None):
'''Return [(section, name, value, source)] config items.
The config items are extracted from environment variables specified by env,
used to override systemrc, but not userrc.
If env is not provided, encoding.environ will be used.
'''
if env is None:
env = encoding.environ
checklist = [
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 (b'EDITOR', b'ui', b'editor'),
(b'VISUAL', b'ui', b'editor'),
(b'PAGER', b'pager', b'pager'),
Jun Wu
rcutil: add a method to convert environment variables to config items...
r31684 ]
result = []
for envname, section, configname in checklist:
if envname not in env:
continue
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 result.append((section, configname, env[envname], b'$%s' % envname))
Jun Wu
rcutil: add a method to convert environment variables to config items...
r31684 return result
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Harbison
ui: add the ability to apply `defaultrc` configs from resources...
r44483 def default_rc_resources():
"""return rc resource IDs in defaultrc"""
rsrcs = resourceutil.contents(b'mercurial.defaultrc')
return [
(b'mercurial.defaultrc', r)
for r in sorted(rsrcs)
if resourceutil.is_resource(b'mercurial.defaultrc', r)
and r.endswith(b'.rc')
]
Jun Wu
rcutil: rename rcpath to rccomponents (API)
r31682 def rccomponents():
Jun Wu
rcutil: let rccomponents return different types of configs (API)...
r31683 '''return an ordered [(type, obj)] about where to load configs.
respect $HGRCPATH. if $HGRCPATH is empty, only .hg/hgrc of current repo is
used. if $HGRCPATH is not set, the platform default will be used.
if a directory is provided, *.rc files under it will be used.
Matt Harbison
ui: add the ability to apply `defaultrc` configs from resources...
r44483 type could be either 'path', 'items' or 'resource'. If type is 'path',
obj is a string, and is the config file path. if type is 'items', obj is a
list of (section, name, value, source) that should fill the config directly.
If type is 'resource', obj is a tuple of (package name, resource name).
Jun Wu
rcutil: let rccomponents return different types of configs (API)...
r31683 '''
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 envrc = (b'items', envrcitems())
Jun Wu
rcutil: let environ override system configs (BC)...
r31685
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'HGRCPATH' in encoding.environ:
Jun Wu
rcutil: unindent a block...
r31693 # assume HGRCPATH is all about user configs so environments can be
# overridden.
_rccomponents = [envrc]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for p in encoding.environ[b'HGRCPATH'].split(pycompat.ospathsep):
Jun Wu
rcutil: unindent a block...
r31693 if not p:
continue
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _rccomponents.extend((b'path', p) for p in _expandrcpath(p))
Jun Wu
rcutil: unindent a block...
r31693 else:
Matt Harbison
ui: add the ability to apply `defaultrc` configs from resources...
r44483 _rccomponents = [(b'resource', r) for r in default_rc_resources()]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 normpaths = lambda paths: [
(b'path', os.path.normpath(p)) for p in paths
]
Matt Harbison
rcutil: drop the `defaultrcpath()` method (API)...
r44484 _rccomponents.extend(normpaths(systemrcpath()))
Jun Wu
rcutil: unindent a block...
r31693 _rccomponents.append(envrc)
Jun Wu
rcutil: extract duplicated logic to a lambda...
r31694 _rccomponents.extend(normpaths(userrcpath()))
Jun Wu
rcutil: rename rcpath to rccomponents (API)
r31682 return _rccomponents
Jun Wu
pager: set some environment variables if they're not set...
r31954
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
pager: set some environment variables if they're not set...
r31954 def defaultpagerenv():
'''return a dict of default environment variables and their values,
intended to be set before starting a pager.
'''
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return {b'LESS': b'FRX', b'LV': b'-c'}