##// END OF EJS Templates
procutil: make stream detection in make_line_buffered more correct and strict...
procutil: make stream detection in make_line_buffered more correct and strict In make_line_buffered(), we don’t want to wrap the stream if we know that lines get flushed to the underlying raw stream already. Previously, the heuristic was too optimistic. It assumed that any stream which is not an instance of io.BufferedIOBase doesn’t need wrapping. However, there are buffered streams that aren’t instances of io.BufferedIOBase, like Mercurial’s own winstdout. The new logic is different in two ways: First, only for the check, if unwraps any combination of WriteAllWrapper and winstdout. Second, it skips wrapping the stream only if it is an instance of io.RawIOBase (or already wrapped). If it is an instance of io.BufferedIOBase, it gets wrapped. In any other case, the function raises an exception. This ensures that, if an unknown stream is passed or we add another wrapper in the future, we don’t wrap the stream if it’s already line buffered or not wrap the stream if it’s not line buffered. In fact, this was already helpful during development of this change. Without it, I possibly would have forgot that WriteAllWrapper needs to be ignored for the check, leading to unnecessary wrapping if stdout is unbuffered. The alternative would have been to always wrap unknown streams. However, I don’t think that anyone would benefit from being less strict. We can expect streams from the standard library to be subclassing either io.RawIOBase or io.BufferedIOBase, so running Mercurial in the standard way should not regress by this change. Py2exe might replace sys.stdout and sys.stderr, but that currently breaks Mercurial anyway and also these streams don’t claim to be interactive, so this function is not called for them.

File last commit:

r49801:642e31cb default
r50273:094a5fa3 6.2 stable
Show More
schemes.py
150 lines | 4.3 KiB | text/x-python | PythonLexer
Alexander Solovyov
schemes extension
r9964 # Copyright 2009, Alexander Solovyov <piranha@piranha.org.ua>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Alexander Solovyov
schemes extension
r9964
"""extend schemes with shortcuts to repository swarms
This extension allows you to specify shortcuts for parent URLs with a
lot of repositories to act like a scheme, for example::
[schemes]
py = http://code.python.org/hg/
After that you can use it like::
hg clone py://trunk/
Additionally there is support for some more complex schemas, for
example used by Google Code::
[schemes]
gcode = http://{1}.googlecode.com/hg/
The syntax is taken from Mercurial templates, and you have unlimited
number of variables, starting with ``{1}`` and continuing with
``{2}``, ``{3}`` and so on. This variables will receive parts of URL
supplied, split by ``/``. Anything not specified as ``{part}`` will be
just appended to an URL.
For convenience, the extension adds these schemes by default::
[schemes]
py = http://hg.python.org/
bb = https://bitbucket.org/
bb+ssh = ssh://hg@bitbucket.org/
gcode = https://{1}.googlecode.com/hg/
Benjamin Pollack
schemes: add Kiln On Demand to default schemes
r10777 kiln = https://{1}.kilnhg.com/Repo/
Alexander Solovyov
schemes extension
r9964
Martin Geisler
schemes: fixed typos in module docstring
r9965 You can override a predefined scheme by defining a new scheme with the
same name.
Alexander Solovyov
schemes extension
r9964 """
timeless
schemas: use absolute_import
r28379 import os
import re
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205
from mercurial.i18n import _
timeless
schemas: use absolute_import
r28379 from mercurial import (
error,
extensions,
hg,
Pulkit Goyal
py3: replace os.name with pycompat.osname (part 2 of 2)
r30640 pycompat,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
timeless
schemas: use absolute_import
r28379 templater,
urlutil: extract `url` related code from `util` into the new module...
r47669 )
from mercurial.utils import (
urlutil,
timeless
schemas: use absolute_import
r28379 )
Alexander Solovyov
schemes extension
r9964
Jason R. Coombs
schemes: add debugexpandscheme command, resolving a scheme to canonical form
r27982 cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 testedwith = b'ships-with-hg-core'
Augie Fackler
hgext: mark all first-party extensions as such
r16743
Matt Harbison
cleanup: drop redundant character escapes outside of `[]`...
r44474 _partre = re.compile(br'{(\d+)\}')
Alexander Solovyov
schemes extension
r9964
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class ShortRepository:
Alexander Solovyov
schemes extension
r9964 def __init__(self, url, scheme, templater):
self.scheme = scheme
self.templater = templater
self.url = url
try:
Augie Fackler
schemes: move re construction to module-level and python3-ify...
r31181 self.parts = max(map(int, _partre.findall(self.url)))
Alexander Solovyov
schemes extension
r9964 except ValueError:
self.parts = 0
def __repr__(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'<ShortRepository: %s>' % self.scheme
Alexander Solovyov
schemes extension
r9964
Gregory Szorc
hg: allow extra arguments to be passed to repo creation (API)...
r39585 def instance(self, ui, url, create, intents=None, createopts=None):
Jason R. Coombs
schemes: extract scheme expansion as its own method on ShortRepository
r27981 url = self.resolve(url)
Augie Fackler
formatting: blacken the codebase...
r43346 return hg._peerlookup(url).instance(
ui, url, create, intents=intents, createopts=createopts
)
Jason R. Coombs
schemes: extract scheme expansion as its own method on ShortRepository
r27981
def resolve(self, url):
urlutil: extract `url` related code from `util` into the new module...
r47669 # Should this use the urlutil.url class, or is manual parsing better?
Mads Kiilerich
scheme: don't crash on invalid URLs
r18910 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 url = url.split(b'://', 1)[1]
Mads Kiilerich
scheme: don't crash on invalid URLs
r18910 except IndexError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b"no '://' in scheme url '%s'") % url)
parts = url.split(b'/', self.parts)
Alexander Solovyov
schemes extension
r9964 if len(parts) > self.parts:
tail = parts[-1]
parts = parts[:-1]
else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 tail = b''
Augie Fackler
cleanup: run pyupgrade on our source tree to clean up varying things...
r44937 context = {b'%d' % (i + 1): v for i, v in enumerate(parts)}
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b''.join(self.templater.process(self.url, context)) + tail
Alexander Solovyov
schemes extension
r9964
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
url: nuke some newly-introduced underbars in identifiers
r13827 def hasdriveletter(orig, path):
Patrick Mezard
util: fix url.__str__() for windows file URLs...
r15609 if path:
for scheme in schemes:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if path.startswith(scheme + b':'):
Patrick Mezard
util: fix url.__str__() for windows file URLs...
r15609 return False
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 return orig(path)
Augie Fackler
formatting: blacken the codebase...
r43346
Alexander Solovyov
schemes extension
r9964 schemes = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'py': b'http://hg.python.org/',
b'bb': b'https://bitbucket.org/',
b'bb+ssh': b'ssh://hg@bitbucket.org/',
b'gcode': b'https://{1}.googlecode.com/hg/',
b'kiln': b'https://{1}.kilnhg.com/Repo/',
Augie Fackler
formatting: blacken the codebase...
r43346 }
Alexander Solovyov
schemes extension
r9964
def extsetup(ui):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 schemes.update(dict(ui.configitems(b'schemes')))
Yuya Nishihara
templater: parse template string to tree by templater class...
r38373 t = templater.engine(templater.parse)
Alexander Solovyov
schemes extension
r9964 for scheme, url in schemes.items():
Augie Fackler
formatting: blacken the codebase...
r43346 if (
pycompat.iswindows
and len(scheme) == 1
and scheme.isalpha()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 and os.path.exists(b'%s:\\' % scheme)
Augie Fackler
formatting: blacken the codebase...
r43346 ):
raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(
b'custom scheme %s:// conflicts with drive '
b'letter %s:\\\n'
)
Augie Fackler
formatting: blacken the codebase...
r43346 % (scheme, scheme.upper())
)
Matt Mackall
hg: move peerschemes back to schemes...
r14606 hg.schemes[scheme] = ShortRepository(url, scheme, t)
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822
urlutil: extract `url` related code from `util` into the new module...
r47669 extensions.wrapfunction(urlutil, b'hasdriveletter', hasdriveletter)
Jason R. Coombs
schemes: add debugexpandscheme command, resolving a scheme to canonical form
r27982
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @command(b'debugexpandscheme', norepo=True)
Jason R. Coombs
schemes: add debugexpandscheme command, resolving a scheme to canonical form
r27982 def expandscheme(ui, url, **opts):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """given a repo path, provide the scheme-expanded path"""
Jason R. Coombs
schemes: add debugexpandscheme command, resolving a scheme to canonical form
r27982 repo = hg._peerlookup(url)
if isinstance(repo, ShortRepository):
url = repo.resolve(url)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.write(url + b'\n')