##// END OF EJS Templates
namespaces: let namespaces override singlenode() definition...
namespaces: let namespaces override singlenode() definition Some namespaces have multiple nodes per name (meaning that their namemap() returns multiple nodes). One such namespace is the "topics" namespace (from the evolve repo). We also have our own internal namespace at Google (for review units) that has multiple nodes per name. These namespaces may not want to use the default "pick highest revnum" resolution that we currently use when resolving a name to a single node. As an example, they may decide that `hg co <name>` should check out a commit that's last in some sense even if an earlier commit had just been amended and thus had a higher revnum [1]. This patch gives the namespace the option to continue to return multiple nodes and to override how the best node is picked. Allowing namespaces to override that may also be useful as an optimization (it may be cheaper for the namespace to find just that node). I have been arguing (in D3715) for using all the nodes returned from namemap() when resolving the symbol to a revset, so e.g. `hg log -r stable` would resolve to *all* nodes on stable, not just the one with the highest revnum (except that I don't actually think we should change it for the branch namespace because of BC). Most people seem opposed to that. If we decide not to do it, I think we can deprecate the namemap() function in favor of the new singlenode() (I find it weird to have namespaces, like the branch namespace, where namemap() isn't nodemap()'s inverse). I therefore think this patch makes sense regardless of what we decide on that issue. [1] Actually, even the branch namespace would have wanted to override singlenode() if it had supported multiple nodes. That's because closes branch heads are mostly ignored, so "hg co default" will not check out the highest-revnum node if that's a closed head. Differential Revision: https://phab.mercurial-scm.org/D3852

File last commit:

r38412:5f9d436c default
r38505:4c068365 @58 default
Show More
httpconnection.py
109 lines | 3.6 KiB | text/x-python | PythonLexer
Augie Fackler
url: use new http support if requested by the user...
r14244 # httpconnection.py - urllib2 handler for new http support
#
# Copyright 2005, 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
# Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
# Copyright 2011 Google, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
httpconnection: use absolute_import
r27521
from __future__ import absolute_import
import os
Augie Fackler
url: use new http support if requested by the user...
r14244
Gregory Szorc
httpconnection: use absolute_import
r27521 from .i18n import _
from . import (
Augie Fackler
httpconnection: convert url to bytes in readauthforuri...
r36669 pycompat,
Gregory Szorc
httpconnection: use absolute_import
r27521 util,
)
Augie Fackler
url: use new http support if requested by the user...
r14244
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 urlerr = util.urlerr
urlreq = util.urlreq
Augie Fackler
url: use new http support if requested by the user...
r14244 # moved here from url.py to avoid a cycle
class httpsendfile(object):
"""This is a wrapper around the objects returned by python's "open".
Mads Kiilerich
http: handle push of bundles > 2 GB again (issue3017)...
r15152 Its purpose is to send file-like objects via HTTP.
It do however not define a __len__ attribute because the length
might be more than Py_ssize_t can handle.
Augie Fackler
url: use new http support if requested by the user...
r14244 """
def __init__(self, ui, *args, **kwargs):
self.ui = ui
self._data = open(*args, **kwargs)
self.seek = self._data.seek
self.close = self._data.close
self.write = self._data.write
Mads Kiilerich
http: handle push of bundles > 2 GB again (issue3017)...
r15152 self.length = os.fstat(self._data.fileno()).st_size
Augie Fackler
url: use new http support if requested by the user...
r14244 self._pos = 0
# We pass double the max for total because we currently have
# to send the bundle twice in the case of a server that
# requires authentication. Since we can't know until we try
# once whether authentication will be required, just lie to
# the user and maybe the push succeeds suddenly at 50%.
Martin von Zweigbergk
httpconnection: use progress helper...
r38412 self._progress = ui.makeprogress(_('sending'), unit=_('kb'),
total=(self.length // 1024 * 2))
def read(self, *args, **kwargs):
ret = self._data.read(*args, **kwargs)
if not ret:
self._progress.complete()
return ret
self._pos += len(ret)
self._progress.update(self._pos // 1024)
Augie Fackler
url: use new http support if requested by the user...
r14244 return ret
Mads Kiilerich
largefiles: use context for file closing...
r30142 def __enter__(self):
return self
def __exit__(self, exc_type, exc_val, exc_tb):
self.close()
Augie Fackler
url: use new http support if requested by the user...
r14244 # moved here from url.py to avoid a cycle
Patrick Mezard
http: pass user to readauthforuri() (fix 4a43e23b8c55)...
r15025 def readauthforuri(ui, uri, user):
Augie Fackler
httpconnection: convert url to bytes in readauthforuri...
r36669 uri = pycompat.bytesurl(uri)
Augie Fackler
url: use new http support if requested by the user...
r14244 # Read configuration
Gregory Szorc
httpconnection: rename config to groups...
r31300 groups = {}
Augie Fackler
url: use new http support if requested by the user...
r14244 for key, val in ui.configitems('auth'):
Gregory Szorc
httpconnection: allow a global auth.cookiefile config entry...
r31935 if key in ('cookiefile',):
continue
Augie Fackler
url: use new http support if requested by the user...
r14244 if '.' not in key:
ui.warn(_("ignoring invalid [auth] key '%s'\n") % key)
continue
group, setting = key.rsplit('.', 1)
Gregory Szorc
httpconnection: rename config to groups...
r31300 gdict = groups.setdefault(group, {})
Augie Fackler
url: use new http support if requested by the user...
r14244 if setting in ('username', 'cert', 'key'):
val = util.expandpath(val)
gdict[setting] = val
# Find the best match
Pierre-Yves David
httpconnection: drop Python 2.4 specify hack...
r25206 scheme, hostpath = uri.split('://', 1)
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 bestuser = None
Augie Fackler
url: use new http support if requested by the user...
r14244 bestlen = 0
bestauth = None
Gregory Szorc
httpconnection: rename config to groups...
r31300 for group, auth in groups.iteritems():
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 if user and user != auth.get('username', user):
# If a username was set in the URI, the entry username
# must either match it or be unset
continue
Augie Fackler
url: use new http support if requested by the user...
r14244 prefix = auth.get('prefix')
if not prefix:
continue
p = prefix.split('://', 1)
if len(p) > 1:
schemes, prefix = [p[0]], p[1]
else:
schemes = (auth.get('schemes') or 'https').split()
if (prefix == '*' or hostpath.startswith(prefix)) and \
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 (len(prefix) > bestlen or (len(prefix) == bestlen and \
not bestuser and 'username' in auth)) \
and scheme in schemes:
Augie Fackler
url: use new http support if requested by the user...
r14244 bestlen = len(prefix)
bestauth = group, auth
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 bestuser = auth.get('username')
if user and not bestuser:
auth['username'] = user
Augie Fackler
url: use new http support if requested by the user...
r14244 return bestauth