##// END OF EJS Templates
exchangev2: start to implement pull with wire protocol v2...
exchangev2: start to implement pull with wire protocol v2 Wire protocol version 2 will take a substantially different approach to exchange than version 1 (at least as far as pulling is concerned). This commit establishes a new exchangev2 module for holding code related to exchange using wire protocol v2. I could have added things to the existing exchange module. But it is already quite big. And doing things inline isn't in question because the existing code is already littered with conditional code for various states of support for the existing wire protocol as it evolved over 10+ years. A new module gives us a chance to make a clean break. This approach does mean we'll end up writing some duplicate code. And there's a significant chance we'll miss functionality as code is ported. The plan is to eventually add #testcase's to existing tests so the new wire protocol is tested side-by-side with the existing one. This will hopefully tease out any features that weren't ported properly. But before we get there, we need to build up support for the new exchange methods. Our journey towards implementing a new exchange begins with pulling. And pulling begins with discovery. The discovery code added to exchangev2 is heavily drawn from the following functions: * exchange._pulldiscoverychangegroup * discovery.findcommonincoming For now, we build on top of existing discovery mechanisms. The new wire protocol should be capable of doing things more efficiently. But I'd rather defer on this problem. To foster the transition, we invent a fake capability on the HTTPv2 peer and have the main pull code in exchange.py call into exchangev2 when the new wire protocol is being used. Differential Revision: https://phab.mercurial-scm.org/D4480

File last commit:

r34646:75979c8d default
r39665:a86d21e7 default
Show More
rcutil.py
98 lines | 3.1 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,
)
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
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
Yuya Nishihara
osutil: proxy through util (and platform) modules (API)...
r32203 return [join(p, f) for f, k in util.listdir(p) if f.endswith('.rc')]
Jun Wu
rcutil: extract rc directory listing logic...
r31681 return [p]
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 = [
('EDITOR', 'ui', 'editor'),
('VISUAL', 'ui', 'editor'),
('PAGER', 'pager', 'pager'),
]
result = []
for envname, section, configname in checklist:
if envname not in env:
continue
result.append((section, configname, env[envname], '$%s' % envname))
return result
Jun Wu
rcutil: split osrcpath to return default.d paths (API)...
r31680 def defaultrcpath():
'''return rc paths in default.d'''
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 path = []
defaultpath = os.path.join(util.datapath, 'default.d')
if os.path.isdir(defaultpath):
Jun Wu
rcutil: extract rc directory listing logic...
r31681 path = _expandrcpath(defaultpath)
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 return path
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.
type could be either 'path' or 'items', 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.
'''
Jun Wu
rcutil: let environ override system configs (BC)...
r31685 envrc = ('items', envrcitems())
Jun Wu
rcutil: unindent a block...
r31693 if 'HGRCPATH' in encoding.environ:
# assume HGRCPATH is all about user configs so environments can be
# overridden.
_rccomponents = [envrc]
for p in encoding.environ['HGRCPATH'].split(pycompat.ospathsep):
if not p:
continue
_rccomponents.extend(('path', p) for p in _expandrcpath(p))
else:
Jun Wu
rcutil: extract duplicated logic to a lambda...
r31694 normpaths = lambda paths: [('path', os.path.normpath(p)) for p in paths]
_rccomponents = normpaths(defaultrcpath() + 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
def defaultpagerenv():
'''return a dict of default environment variables and their values,
intended to be set before starting a pager.
'''
return {'LESS': 'FRX', 'LV': '-c'}