##// END OF EJS Templates
merge: refactor unknown file conflict checking...
merge: refactor unknown file conflict checking Previously, we would do a full working directory walk including unknown files to perform a merge. In many cases, this was painful because unknown files greatly outnumbered tracked files and generally had no useful effect on the merge. Here we instead wait until we find a file in the destination that's not tracked locally and detect if it exists and is not ignored. This is usually cheaper but can be -more- expensive in the case where we're adding a huge number of files. On the other hand, the cost of statting the new files should be dwarfed by the cost of eventually writing them. In this version, case collisions are detected implicitly by os.path.exists and wctx[f] lookup.

File last commit:

r15609:8f4bad72 stable
r16093:7e30f5f2 default
Show More
schemes.py
99 lines | 3.2 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 """
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 import os, re
Brodie Rao
url: move URL parsing functions into util to improve startup time...
r14076 from mercurial import extensions, hg, templater, util
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 from mercurial.i18n import _
Alexander Solovyov
schemes extension
r9964
class ShortRepository(object):
def __init__(self, url, scheme, templater):
self.scheme = scheme
self.templater = templater
self.url = url
try:
self.parts = max(map(int, re.findall(r'\{(\d+)\}', self.url)))
except ValueError:
self.parts = 0
def __repr__(self):
return '<ShortRepository: %s>' % self.scheme
def instance(self, ui, url, create):
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 # Should this use urlmod.url(), or is manual parsing better?
Alexander Solovyov
schemes extension
r9964 url = url.split('://', 1)[1]
parts = url.split('/', self.parts)
if len(parts) > self.parts:
tail = parts[-1]
parts = parts[:-1]
else:
tail = ''
Matt Mackall
many, many trivial check-code fixups
r10282 context = dict((str(i + 1), v) for i, v in enumerate(parts))
Alexander Solovyov
schemes extension
r9964 url = ''.join(self.templater.process(self.url, context)) + tail
Matt Mackall
hg: split peer and repo lookup tables
r14568 return hg._peerlookup(url).instance(ui, url, create)
Alexander Solovyov
schemes extension
r9964
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:
if path.startswith(scheme + ':'):
return False
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 return orig(path)
Alexander Solovyov
schemes extension
r9964 schemes = {
'py': 'http://hg.python.org/',
'bb': 'https://bitbucket.org/',
'bb+ssh': 'ssh://hg@bitbucket.org/',
Benjamin Pollack
schemes: add Kiln On Demand to default schemes
r10777 'gcode': 'https://{1}.googlecode.com/hg/',
'kiln': 'https://{1}.kilnhg.com/Repo/'
Alexander Solovyov
schemes extension
r9964 }
def extsetup(ui):
schemes.update(dict(ui.configitems('schemes')))
t = templater.engine(lambda x: x)
for scheme, url in schemes.items():
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 if (os.name == 'nt' and len(scheme) == 1 and scheme.isalpha()
and os.path.exists('%s:\\' % scheme)):
raise util.Abort(_('custom scheme %s:// conflicts with drive '
'letter %s:\\\n') % (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
Brodie Rao
url: move URL parsing functions into util to improve startup time...
r14076 extensions.wrapfunction(util, 'hasdriveletter', hasdriveletter)