##// END OF EJS Templates
py3: some not-entirely-trivial removing of "unicode"
py3: some not-entirely-trivial removing of "unicode"

File last commit:

r8079:1112e440 default
r8080:f9988201 default
Show More
repository.py
617 lines | 22.5 KiB | text/x-python | PythonLexer
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 # -*- coding: utf-8 -*-
"""
vcs.backends.hg.repository
~~~~~~~~~~~~~~~~~~~~~~~~~~
Mercurial repository implementation.
:created_on: Apr 8, 2010
:copyright: (c) 2010-2011 by Marcin Kuzminski, Lukasz Balcerzak.
"""
Mads Kiilerich
scripts: initial run of import cleanup using isort
r7718 import datetime
import logging
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 import os
import time
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 import urllib.error
import urllib.parse
import urllib.request
Mads Kiilerich
compat: use collections.OrderedDict - we only support Python 2.7 and no longer need our own implementation
r7696 from collections import OrderedDict
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 import mercurial.commands
import mercurial.error
import mercurial.exchange
import mercurial.hg
import mercurial.hgweb
import mercurial.httppeer
Mads Kiilerich
vcs: fix missing import of mercurial.localrepo...
r8038 import mercurial.localrepo
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 import mercurial.match
import mercurial.mdiff
import mercurial.node
import mercurial.patch
import mercurial.scmutil
import mercurial.sshpeer
import mercurial.tags
import mercurial.ui
import mercurial.url
import mercurial.util
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 from kallithea.lib.vcs.backends.base import BaseRepository, CollectionGenerator
from kallithea.lib.vcs.exceptions import (
Mads Kiilerich
scripts: initial run of import cleanup using isort
r7718 BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError, VCSError)
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 from kallithea.lib.vcs.utils import ascii_str, author_email, author_name, date_fromtimestamp, makedate, safe_bytes, safe_str
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 from kallithea.lib.vcs.utils.lazy import LazyProperty
from kallithea.lib.vcs.utils.paths import abspath
from .changeset import MercurialChangeset
from .inmemory import MercurialInMemoryChangeset
from .workdir import MercurialWorkdir
Mads Kiilerich
scripts: initial run of import cleanup using isort
r7718
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 log = logging.getLogger(__name__)
class MercurialRepository(BaseRepository):
"""
Mercurial repository backend
"""
DEFAULT_BRANCH_NAME = 'default'
scm = 'hg'
def __init__(self, repo_path, create=False, baseui=None, src_url=None,
update_after_clone=False):
"""
Raises RepositoryError if repository could not be find at the given
``repo_path``.
:param repo_path: local path of the repository
:param create=False: if set to True, would try to create repository if
it does not exist rather than raising exception
:param baseui=None: user data
:param src_url=None: would try to clone repository from given location
:param update_after_clone=False: sets update of working copy after
making a clone
"""
if not isinstance(repo_path, str):
raise VCSError('Mercurial backend requires repository path to '
'be instance of <str> got %s instead' %
type(repo_path))
self.path = abspath(repo_path)
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 self.baseui = baseui or mercurial.ui.ui()
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 # We've set path and ui, now we can set _repo itself
self._repo = self._get_repo(create, src_url, update_after_clone)
@property
def _empty(self):
"""
Checks if repository is empty ie. without any changesets
"""
# TODO: Following raises errors when using InMemoryChangeset...
# return len(self._repo.changelog) == 0
return len(self.revisions) == 0
@LazyProperty
def revisions(self):
"""
Returns list of revisions' ids, in ascending order. Being lazy
attribute allows external tools to inject shas from cache.
"""
return self._get_all_revisions()
@LazyProperty
def name(self):
return os.path.basename(self.path)
@LazyProperty
def branches(self):
return self._get_branches()
@LazyProperty
def closed_branches(self):
return self._get_branches(normal=False, closed=True)
@LazyProperty
def allbranches(self):
"""
List all branches, including closed branches.
"""
return self._get_branches(closed=True)
def _get_branches(self, normal=True, closed=False):
"""
Gets branches for this repository
Returns only not closed branches by default
:param closed: return also closed branches for mercurial
:param normal: return also normal branches
"""
if self._empty:
return {}
Mads Kiilerich
hg: reimplement branch listings more efficiently...
r4728 bt = OrderedDict()
Mads Kiilerich
py3: start using ascii_str and ascii_bytes - we will need it later
r7960 for bn, _heads, node, isclosed in sorted(self._repo.branchmap().iterbranches()):
Mads Kiilerich
hg: reimplement branch listings more efficiently...
r4728 if isclosed:
if closed:
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 bt[safe_str(bn)] = ascii_str(mercurial.node.hex(node))
Mads Kiilerich
hg: reimplement branch listings more efficiently...
r4728 else:
if normal:
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 bt[safe_str(bn)] = ascii_str(mercurial.node.hex(node))
Mads Kiilerich
hg: reimplement branch listings more efficiently...
r4728 return bt
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
@LazyProperty
def tags(self):
"""
Gets tags for this repository
"""
return self._get_tags()
def _get_tags(self):
if self._empty:
return {}
Mads Kiilerich
cleanup: minor refactorings and simplification of dict usage...
r7906 return OrderedDict(sorted(
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 ((safe_str(n), ascii_str(mercurial.node.hex(h))) for n, h in self._repo.tags().items()),
Mads Kiilerich
cleanup: minor refactorings and simplification of dict usage...
r7906 reverse=True,
key=lambda x: x[0], # sort by name
))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
def tag(self, name, user, revision=None, message=None, date=None,
**kwargs):
"""
Creates and returns a tag for the given ``revision``.
:param name: name for new tag
:param user: full username, i.e.: "Joe Doe <joe.doe@example.com>"
:param revision: changeset id for which new tag would be created
:param message: message of the tag's commit
:param date: date of tag's commit
:raises TagAlreadyExistError: if tag with same name already exists
"""
if name in self.tags:
raise TagAlreadyExistError("Tag %s already exists" % name)
changeset = self.get_changeset(revision)
local = kwargs.setdefault('local', False)
if message is None:
message = "Added tag %s for changeset %s" % (name,
changeset.short_id)
if date is None:
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 date = safe_bytes(datetime.datetime.now().strftime('%a, %d %b %Y %H:%M:%S'))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
try:
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 mercurial.tags.tag(self._repo, safe_bytes(name), changeset._ctx.node(), safe_bytes(message), local, safe_bytes(user), date)
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 except mercurial.error.Abort as e:
Mads Kiilerich
py3: use exception .args instead of .message...
r8044 raise RepositoryError(e.args[0])
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
# Reinitialize tags
self.tags = self._get_tags()
tag_id = self.tags[name]
return self.get_changeset(revision=tag_id)
def remove_tag(self, name, user, message=None, date=None):
"""
Removes tag with the given ``name``.
:param name: name of the tag to be removed
:param user: full username, i.e.: "Joe Doe <joe.doe@example.com>"
:param message: message of the tag's removal commit
:param date: date of tag's removal commit
:raises TagDoesNotExistError: if tag with given name does not exists
"""
if name not in self.tags:
raise TagDoesNotExistError("Tag %s does not exist" % name)
if message is None:
message = "Removed tag %s" % name
if date is None:
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 date = safe_bytes(datetime.datetime.now().strftime('%a, %d %b %Y %H:%M:%S'))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 local = False
try:
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 mercurial.tags.tag(self._repo, safe_bytes(name), mercurial.commands.nullid, safe_bytes(message), local, safe_bytes(user), date)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 self.tags = self._get_tags()
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 except mercurial.error.Abort as e:
Mads Kiilerich
py3: use exception .args instead of .message...
r8044 raise RepositoryError(e.args[0])
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
@LazyProperty
def bookmarks(self):
"""
Gets bookmarks for this repository
"""
return self._get_bookmarks()
def _get_bookmarks(self):
if self._empty:
return {}
Mads Kiilerich
cleanup: minor refactorings and simplification of dict usage...
r7906 return OrderedDict(sorted(
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 ((safe_str(n), ascii_str(h)) for n, h in self._repo._bookmarks.items()),
Mads Kiilerich
cleanup: minor refactorings and simplification of dict usage...
r7906 reverse=True,
key=lambda x: x[0], # sort by name
))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
def _get_all_revisions(self):
Mads Kiilerich
py3: start using ascii_str and ascii_bytes - we will need it later
r7960 return [ascii_str(self._repo[x].hex()) for x in self._repo.filtered(b'visible').changelog.revs()]
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
def get_diff(self, rev1, rev2, path='', ignore_whitespace=False,
context=3):
"""
Returns (git like) *diff*, as plain text. Shows changes introduced by
``rev2`` since ``rev1``.
:param rev1: Entry point from which diff is shown. Can be
``self.EMPTY_CHANGESET`` - in this case, patch showing all
the changes since empty state of the repository until ``rev2``
:param rev2: Until which revision changes should be shown.
:param ignore_whitespace: If set to ``True``, would not show whitespace
changes. Defaults to ``False``.
:param context: How many lines before/after changed lines should be
Branko Majic
vcs: sanitize diff context values (Issue #306)...
r7049 shown. Defaults to ``3``. If negative value is passed-in, it will be
set to ``0`` instead.
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 """
Branko Majic
vcs: sanitize diff context values (Issue #306)...
r7049
# Negative context values make no sense, and will result in
# errors. Ensure this does not happen.
if context < 0:
context = 0
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 if hasattr(rev1, 'raw_id'):
rev1 = getattr(rev1, 'raw_id')
if hasattr(rev2, 'raw_id'):
rev2 = getattr(rev2, 'raw_id')
# Check if given revisions are present at repository (may raise
# ChangesetDoesNotExistError)
if rev1 != self.EMPTY_CHANGESET:
self.get_changeset(rev1)
self.get_changeset(rev2)
if path:
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 file_filter = mercurial.match.exact(path)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 else:
file_filter = None
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 return b''.join(mercurial.patch.diff(self._repo, rev1, rev2, match=file_filter,
opts=mercurial.mdiff.diffopts(git=True,
Thomas De Schampheleire
hg: show code function in diffs...
r5090 showfunc=True,
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 ignorews=ignore_whitespace,
context=context)))
@classmethod
def _check_url(cls, url, repoui=None):
"""
Function will check given url and try to verify if it's a valid
link. Sometimes it may happened that mercurial will issue basic
auth request that can cause whole API to hang when used from python
or other external calls.
On failures it'll raise urllib2.HTTPError, exception is also thrown
when the return code is non 200
"""
# check first if it's not an local url
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 if os.path.isdir(url) or url.startswith(b'file:'):
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 return True
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 if url.startswith(b'ssh:'):
Thomas De Schampheleire
remotes: add support to clone from Mercurial repositories over ssh...
r4821 # in case of invalid uri or authentication issues, sshpeer will
# throw an exception.
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 mercurial.sshpeer.instance(repoui or mercurial.ui.ui(), url, False).lookup(b'tip')
Thomas De Schampheleire
remotes: add support to clone from Mercurial repositories over ssh...
r4821 return True
Mads Kiilerich
hg: fix clone from svn+http urls using hg-svn (Issue #72)
r4771 url_prefix = None
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 if b'+' in url[:url.find(b'://')]:
url_prefix, url = url.split(b'+', 1)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
handlers = []
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 url_obj = mercurial.util.url(url)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 test_uri, authinfo = url_obj.authinfo()
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 url_obj.passwd = b'*****'
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 cleaned_uri = str(url_obj)
if authinfo:
Lars Kruse
codingstyle: trivial whitespace fixes...
r6789 # create a password manager
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 passmgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 passmgr.add_password(*authinfo)
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 handlers.extend((mercurial.url.httpbasicauthhandler(passmgr),
mercurial.url.httpdigestauthhandler(passmgr)))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 o = urllib.request.build_opener(*handlers)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 o.addheaders = [('Content-Type', 'application/mercurial-0.1'),
('Accept', 'application/mercurial-0.1')]
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 req = urllib.request.Request(
Mads Kiilerich
vcs: minor cleanup...
r7979 "%s?%s" % (
test_uri,
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 urllib.parse.urlencode({
Mads Kiilerich
vcs: minor cleanup...
r7979 'cmd': 'between',
'pairs': "%s-%s" % ('0' * 40, '0' * 40),
})
))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
try:
resp = o.open(req)
if resp.code != 200:
raise Exception('Return Code is not 200')
Mads Kiilerich
cleanup: consistently use 'except ... as ...:'...
r5374 except Exception as e:
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 # means it cannot be cloned
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 raise urllib.error.URLError("[%s] org_exc: %s" % (cleaned_uri, e))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
Mads Kiilerich
hg: fix clone from svn+http urls using hg-svn (Issue #72)
r4771 if not url_prefix: # skip svn+http://... (and git+... too)
# now check if it's a proper hg repo
try:
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 mercurial.httppeer.instance(repoui or mercurial.ui.ui(), url, False).lookup(b'tip')
Mads Kiilerich
cleanup: consistently use 'except ... as ...:'...
r5374 except Exception as e:
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 raise urllib.error.URLError(
Mads Kiilerich
hg: fix clone from svn+http urls using hg-svn (Issue #72)
r4771 "url [%s] does not look like an hg repo org_exc: %s"
% (cleaned_uri, e))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
return True
def _get_repo(self, create, src_url=None, update_after_clone=False):
"""
Function will check for mercurial repository in given path and return
a localrepo object. If there is no repository in that path it will
raise an exception unless ``create`` parameter is set to True - in
that case repository would be created and returned.
If ``src_url`` is given, would try to clone repository from the
location at given clone_point. Additionally it'll make update to
working copy accordingly to ``update_after_clone`` flag
"""
try:
if src_url:
Mads Kiilerich
py3: trivially replace safe_str with safe_bytes in some places where that is what we need
r7961 url = safe_bytes(self._get_url(src_url))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 opts = {}
if not update_after_clone:
opts.update({'noupdate': True})
Mads Kiilerich
cleanup: avoid some 'except Exception' catching - catch specific exceptions or log it and show what happened...
r4733 MercurialRepository._check_url(url, self.baseui)
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 mercurial.commands.clone(self.baseui, url, safe_bytes(self.path), **opts)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
# Don't try to create if we've already cloned repo
create = False
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 return mercurial.localrepo.instance(self.baseui, safe_bytes(self.path), create=create)
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 except (mercurial.error.Abort, mercurial.error.RepoError) as err:
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 if create:
Mads Kiilerich
cleanup: consistent space before line continuation backslash
r5585 msg = "Cannot create repository at %s. Original error was %s" \
Mads Kiilerich
vcs: tweak how revisions and repo names are shown in error messages...
r7980 % (self.name, err)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 else:
Mads Kiilerich
cleanup: consistent space before line continuation backslash
r5585 msg = "Not valid repository at %s. Original error was %s" \
Mads Kiilerich
vcs: tweak how revisions and repo names are shown in error messages...
r7980 % (self.name, err)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 raise RepositoryError(msg)
@LazyProperty
def in_memory_changeset(self):
return MercurialInMemoryChangeset(self)
@LazyProperty
def description(self):
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 _desc = self._repo.ui.config(b'web', b'description', None, untrusted=True)
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 return safe_str(_desc or b'unknown')
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
@LazyProperty
def contact(self):
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 return safe_str(mercurial.hgweb.common.get_contact(self._repo.ui.config)
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 or b'Unknown')
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
@LazyProperty
def last_change(self):
"""
Returns last change made on this repository as datetime object
"""
return date_fromtimestamp(self._get_mtime(), makedate()[1])
def _get_mtime(self):
try:
return time.mktime(self.get_changeset().date.timetuple())
except RepositoryError:
Lars Kruse
codingstyle: trivial whitespace fixes...
r6789 # fallback to filesystem
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 cl_path = os.path.join(self.path, '.hg', "00changelog.i")
st_path = os.path.join(self.path, '.hg', "store")
if os.path.exists(cl_path):
return os.stat(cl_path).st_mtime
else:
return os.stat(st_path).st_mtime
def _get_revision(self, revision):
"""
Mads Kiilerich
vcs: refactor and simplify _get_revision...
r7939 Given any revision identifier, returns a 40 char string with revision hash.
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
:param revision: str or int or None
"""
if self._empty:
raise EmptyRepositoryError("There are no changesets yet")
Mads Kiilerich
hg: be more strict about which kinds of revision lookup we want from hg...
r7267 if revision in [-1, None]:
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 revision = b'tip'
Mads Kiilerich
vcs: refactor and simplify _get_revision...
r7939 elif isinstance(revision, unicode):
revision = safe_bytes(revision)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
try:
Mads Kiilerich
hg: be more strict about which kinds of revision lookup we want from hg...
r7267 if isinstance(revision, int):
Mads Kiilerich
py3: start using ascii_str and ascii_bytes - we will need it later
r7960 return ascii_str(self._repo[revision].hex())
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 return ascii_str(mercurial.scmutil.revsymbol(self._repo, revision).hex())
except (IndexError, ValueError, mercurial.error.RepoLookupError, TypeError):
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 msg = "Revision %r does not exist for %s" % (safe_str(revision), self.name)
domruf
hg: fix except clauses order...
r6589 raise ChangesetDoesNotExistError(msg)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 except (LookupError, ):
Mads Kiilerich
py3: rename all existing safe_unicode to safe_str
r8078 msg = "Ambiguous identifier `%s` for %s" % (safe_str(revision), self.name)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 raise ChangesetDoesNotExistError(msg)
Mads Kiilerich
compare: handle revset revision errors more gracefully
r4364 def get_ref_revision(self, ref_type, ref_name):
"""
Returns revision number for the given reference.
"""
Mads Kiilerich
hg: make get_ref_revision('rev', '00000000000000') give the null revision...
r4558 if ref_type == 'rev' and not ref_name.strip('0'):
return self.EMPTY_CHANGESET
Mads Kiilerich
compare: handle revset revision errors more gracefully
r4364 # lookup up the exact node id
_revset_predicates = {
'branch': 'branch',
'book': 'bookmark',
'tag': 'tag',
'rev': 'id',
}
Mads Kiilerich
hg: optimize get_ref_revision...
r4444 # avoid expensive branch(x) iteration over whole repo
rev_spec = "%%s & %s(%%s)" % _revset_predicates[ref_type]
Mads Kiilerich
compare: handle revset revision errors more gracefully
r4364 try:
Mads Kiilerich
hg: optimize get_ref_revision...
r4444 revs = self._repo.revs(rev_spec, ref_name, ref_name)
Mads Kiilerich
cleanup: be less verbose and less aggressive when catching exceptions
r4453 except LookupError:
Mads Kiilerich
vcs: tweak how revisions and repo names are shown in error messages...
r7980 msg = "Ambiguous identifier %s:%s for %s" % (ref_type, ref_name, self.name)
Mads Kiilerich
compare: handle revset revision errors more gracefully
r4364 raise ChangesetDoesNotExistError(msg)
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 except mercurial.error.RepoLookupError:
Mads Kiilerich
vcs: tweak how revisions and repo names are shown in error messages...
r7980 msg = "Revision %s:%s does not exist for %s" % (ref_type, ref_name, self.name)
Mads Kiilerich
compare: handle revset revision errors more gracefully
r4364 raise ChangesetDoesNotExistError(msg)
if revs:
Mads Kiilerich
hg: bump minimum version to 5.1...
r7913 revision = revs.last()
Mads Kiilerich
compare: handle revset revision errors more gracefully
r4364 else:
# TODO: just report 'not found'?
revision = ref_name
return self._get_revision(revision)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 def _get_archives(self, archive_name='tip'):
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 allowed = self.baseui.configlist(b"web", b"allow_archive",
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 untrusted=True)
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 for name, ext in [(b'zip', '.zip'), (b'gz', '.tar.gz'), (b'bz2', '.tar.bz2')]:
if name in allowed or self._repo.ui.configbool(b"web",
b"allow" + name,
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 untrusted=True):
Mads Kiilerich
py3: add safe_str where we really need it to get a str - probably from bytes
r8079 yield {"type": safe_str(name), "extension": ext, "node": archive_name}
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
def _get_url(self, url):
"""
Mads Kiilerich
py3: drop the last uses of safe_str - they are no longer relevant when we don't have a separate unicode type
r8076 Returns normalized url. If schema is not given, fall back to
filesystem (``file:///``) schema.
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 """
Lars Kruse
codingstyle: replace "not ... in ..." with "... not in ..."...
r6791 if url != 'default' and '://' not in url:
Mads Kiilerich
py3: migrate from urllib2 to urllib...
r8068 url = "file:" + urllib.request.pathname2url(url)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 return url
def get_changeset(self, revision=None):
"""
Returns ``MercurialChangeset`` object representing repository's
changeset at the given ``revision``.
"""
Mads Kiilerich
vcs: minor cleanup...
r7979 return MercurialChangeset(repository=self, revision=self._get_revision(revision))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
def get_changesets(self, start=None, end=None, start_date=None,
domruf
api: add max_revisions option to get_changesets...
r7070 end_date=None, branch_name=None, reverse=False, max_revisions=None):
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 """
Returns iterator of ``MercurialChangeset`` objects from start to end
(both are inclusive)
:param start: None, str, int or mercurial lookup format
:param end: None, str, int or mercurial lookup format
:param start_date:
:param end_date:
:param branch_name:
:param reversed: return changesets in reversed order
"""
start_raw_id = self._get_revision(start)
Mads Kiilerich
vcs: make hg get_changesets compatible with py3...
r7941 start_pos = None if start is None else self.revisions.index(start_raw_id)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 end_raw_id = self._get_revision(end)
Mads Kiilerich
vcs: make hg get_changesets compatible with py3...
r7941 end_pos = None if end is None else self.revisions.index(end_raw_id)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
Mads Kiilerich
vcs: make hg get_changesets compatible with py3...
r7941 if start_pos is not None and end_pos is not None and start_pos > end_pos:
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 raise RepositoryError("Start revision '%s' cannot be "
"after end revision '%s'" % (start, end))
Mads Kiilerich
cleanup: minor refactorings and simplification of dict usage...
r7906 if branch_name and branch_name not in self.allbranches:
Mads Kiilerich
vcs: tweak how revisions and repo names are shown in error messages...
r7980 msg = "Branch %r not found in %s" % (branch_name, self.name)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 raise BranchDoesNotExistError(msg)
if end_pos is not None:
end_pos += 1
Lars Kruse
codingstyle: trivial whitespace fixes...
r6789 # filter branches
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 filter_ = []
if branch_name:
Mads Kiilerich
py3: trivially replace safe_str with safe_bytes in some places where that is what we need
r7961 filter_.append(b'branch("%s")' % safe_bytes(branch_name))
domruf
vcs: fix get_changesets filtering on hg repo to AND the criteria instead of OR...
r7069 if start_date:
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 filter_.append(b'date(">%s")' % safe_bytes(str(start_date)))
domruf
vcs: fix get_changesets filtering on hg repo to AND the criteria instead of OR...
r7069 if end_date:
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 filter_.append(b'date("<%s")' % safe_bytes(str(end_date)))
domruf
api: add max_revisions option to get_changesets...
r7070 if filter_ or max_revisions:
if filter_:
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 revspec = b' and '.join(filter_)
domruf
api: add max_revisions option to get_changesets...
r7070 else:
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 revspec = b'all()'
domruf
api: add max_revisions option to get_changesets...
r7070 if max_revisions:
Mads Kiilerich
py3: add b'' annotations in some places where they will be needed later...
r7958 revspec = b'limit(%s, %d)' % (revspec, max_revisions)
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 revisions = mercurial.scmutil.revrange(self._repo, [revspec])
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 else:
revisions = self.revisions
Sean Farley
hg: adapt for changes in 3.2 and 3.3...
r4828 # this is very much a hack to turn this into a list; a better solution
# would be to get rid of this function entirely and use revsets
revs = list(revisions)[start_pos:end_pos]
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 if reverse:
Mads Kiilerich
vcs: fix get_changesets to .reverse() list of revision hashes in place instead of using reversed()...
r7853 revs.reverse()
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
return CollectionGenerator(self, revs)
def pull(self, url):
"""
Tries to pull changes from external location.
"""
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 other = mercurial.hg.peer(self._repo, {}, safe_bytes(self._get_url(url)))
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 try:
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 mercurial.exchange.pull(self._repo, other, heads=None, force=None)
except mercurial.error.Abort as err:
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 # Propagate error but with vcs's type
raise RepositoryError(str(err))
@LazyProperty
def workdir(self):
"""
Returns ``Workdir`` instance for this repository.
"""
return MercurialWorkdir(self)
def get_config_value(self, section, name=None, config_file=None):
"""
Returns configuration value for a given [``section``] and ``name``.
:param section: Section we want to retrieve value from
:param name: Name of configuration we want to retrieve
:param config_file: A path to file which should be used to retrieve
configuration from (might also be a list of file paths)
"""
if config_file is None:
config_file = []
Mads Kiilerich
py3: automatic migration with 2to3 -f basestring
r8064 elif isinstance(config_file, str):
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 config_file = [config_file]
config = self._repo.ui
Mads Kiilerich
tests: fix vcs Hg helper function get_config_value to not modify global state when using a custom config file...
r7307 if config_file:
Mads Kiilerich
vcs: drop the superfluous and leaky hgcompat "layer"...
r7977 config = mercurial.ui.ui()
Mads Kiilerich
tests: fix vcs Hg helper function get_config_value to not modify global state when using a custom config file...
r7307 for path in config_file:
Mads Kiilerich
py3: add safe_bytes in places where we will need it and where it doesn't do any harm
r7992 config.readconfig(safe_bytes(path))
Mads Kiilerich
py3: add safe_str where we really need it to get a str - probably from bytes
r8079 value = config.config(safe_bytes(section), safe_bytes(name))
return value if value is None else safe_str(value)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187
def get_user_name(self, config_file=None):
"""
Returns user's name from global configuration file.
:param config_file: A path to file which should be used to retrieve
configuration from (might also be a list of file paths)
"""
Mads Kiilerich
tests: fix vcs Hg helper functions get_user_name and get_user_email to actually use provided config_file...
r7306 username = self.get_config_value('ui', 'username', config_file=config_file)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 if username:
return author_name(username)
return None
def get_user_email(self, config_file=None):
"""
Returns user's email from global configuration file.
:param config_file: A path to file which should be used to retrieve
configuration from (might also be a list of file paths)
"""
Mads Kiilerich
tests: fix vcs Hg helper functions get_user_name and get_user_email to actually use provided config_file...
r7306 username = self.get_config_value('ui', 'username', config_file=config_file)
Bradley M. Kuhn
Second step in two-part process to rename directories....
r4187 if username:
return author_email(username)
return None