Server : Apache System : Linux iad1-shared-b8-43 6.6.49-grsec-jammy+ #10 SMP Thu Sep 12 23:23:08 UTC 2024 x86_64 User : dh_edsupp ( 6597262) PHP Version : 8.2.26 Disable Function : NONE Directory : /lib/python3/dist-packages/tracopt/versioncontrol/svn/ |
Upload File : |
# -*- coding: utf-8 -*- # # Copyright (C) 2005-2021 Edgewall Software # Copyright (C) 2005 Christopher Lenz <cmlenz@gmx.de> # Copyright (C) 2005-2007 Christian Boos <cboos@edgewall.org> # All rights reserved. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms # are also available at https://trac.edgewall.org/wiki/TracLicense. # # This software consists of voluntary contributions made by many # individuals. For the exact contribution history, see the revision # history and logs, available at https://trac.edgewall.org/log/. # # Author: Christopher Lenz <cmlenz@gmx.de> # Christian Boos <cboos@edgewall.org> """ Note about Unicode ------------------ The Subversion bindings are not unicode-aware and they expect to receive UTF-8 encoded `string` parameters, On the other hand, all paths manipulated by Trac are `str` objects. Therefore: * before being handed out to SVN, the Trac paths have to be encoded to UTF-8, using `_to_svn()` * before being handed out to Trac, a SVN path has to be decoded from UTF-8, using `_from_svn()` Whenever a value has to be stored as utf8, we explicitly mark the variable name with "_utf8", in order to avoid any possible confusion. Warning: `SubversionNode.get_content()` returns an object from which one can read a stream of bytes. NO guarantees can be given about what that stream of bytes represents. It might be some text, encoded in some way or another. SVN properties *might* give some hints about the content, but they actually only reflect the beliefs of whomever set those properties... """ import functools import os.path import re import posixpath from urllib.parse import quote from trac.api import ISystemInfoProvider from trac.config import ListOption, ChoiceOption from trac.core import * from trac.versioncontrol import Changeset, Node, Repository, \ IRepositoryConnector, InvalidRepository, \ NoSuchChangeset, NoSuchNode from trac.versioncontrol.cache import CachedRepository from trac.util import embedded_numbers from trac.util.concurrency import threading from trac.util.text import exception_to_unicode, to_unicode, to_utf8 from trac.util.translation import _ from trac.util.datefmt import from_utimestamp, to_datetime, utc from trac.web.href import Href def _import_svn(): global fs, repos, core, delta, _kindmap from svn import fs, repos, core, delta _kindmap = {core.svn_node_dir: Node.DIRECTORY, core.svn_node_file: Node.FILE} def _to_svn(pool, *args): """Expect a pool and a list of `str` path components. Returns an UTF-8 encoded string suitable for the Subversion python bindings (the returned path never starts with a leading "/") """ return core.svn_path_canonicalize('/'.join(args).lstrip('/') .encode('utf-8'), pool) def _from_svn(path): """Expect an UTF-8 encoded string and transform it to a `str` object But Subversion repositories built from conversion utilities can have non-UTF-8 byte strings, so we have to convert using `to_unicode`. """ if isinstance(path, bytes): path = to_unicode(path, 'utf-8') return path def _quote_b(value): return quote(value).encode('ascii') # The following 3 helpers deal with unicode paths def _normalize_path(path): """Remove leading "/", except for the root.""" return path and path.strip('/') or '/' def _path_within_scope(scope, fullpath): """Remove the leading scope from repository paths. Return `None` if the path is not is scope. """ if fullpath is not None: fullpath = fullpath.lstrip('/') if scope == '/': return _normalize_path(fullpath) scope = scope.strip('/') if (fullpath + '/').startswith(scope + '/'): return fullpath[len(scope) + 1:] or '/' def _is_path_within_scope(scope, fullpath): """Check whether the given `fullpath` is within the given `scope`""" if scope == '/': return fullpath is not None fullpath = fullpath.lstrip('/') if fullpath else '' scope = scope.strip('/') return (fullpath + '/').startswith(scope + '/') # svn_opt_revision_t helpers def _svn_rev(num): value = core.svn_opt_revision_value_t() value.number = num revision = core.svn_opt_revision_t() revision.kind = core.svn_opt_revision_number revision.value = value return revision def _svn_head(): revision = core.svn_opt_revision_t() revision.kind = core.svn_opt_revision_head return revision def Pool(parent=None): return core.Pool(parent or core.application_pool) def _pool_destroy(pool): if pool and pool.valid(): pool.destroy() class SvnCachedRepository(CachedRepository): """Subversion-specific cached repository, zero-pads revision numbers in the cache tables. """ has_linear_changesets = True def db_rev(self, rev): return '%010d' % rev def rev_db(self, rev): return int(rev or 0) def normalize_rev(self, rev): return self.repos.normalize_rev(rev) class SubversionConnector(Component): implements(ISystemInfoProvider, IRepositoryConnector) branches = ListOption('svn', 'branches', 'trunk, branches/*', doc= """Comma separated list of paths categorized as branches. If a path ends with '*', then all the directory entries found below that path will be included. Example: `/trunk, /branches/*, /projectAlpha/trunk, /sandbox/*` """) tags = ListOption('svn', 'tags', 'tags/*', doc= """Comma separated list of paths categorized as tags. If a path ends with '*', then all the directory entries found below that path will be included. Example: `/tags/*, /projectAlpha/tags/A-1.0, /projectAlpha/tags/A-v1.1` """) eol_style = ChoiceOption( 'svn', 'eol_style', ['native', 'LF', 'CRLF', 'CR'], doc= """End-of-Line character sequences when `svn:eol-style` property is `native`. If `native`, substitute with the native EOL marker on the server. Otherwise, if `LF`, `CRLF` or `CR`, substitute with the specified EOL marker. (''since 1.0.2'')""") error = None def __init__(self): self._version = None try: _import_svn() except ImportError as e: self.error = e self.log.info('Failed to load Subversion bindings', exc_info=True) else: self.log.debug("Subversion bindings imported") version = (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, core.SVN_VER_MICRO) self._version = str(b'%d.%d.%d' % version + core.SVN_VER_TAG, 'utf-8') if version[0] < 1: self.error = _("Subversion >= 1.0 required, found %(version)s", version=self._version) # ISystemInfoProvider methods def get_system_info(self): if self._version: yield 'Subversion', self._version # IRepositoryConnector methods def get_supported_types(self): prio = 1 if self.error: prio = -1 yield ("direct-svnfs", prio * 4) yield ("svnfs", prio * 4) yield ("svn", prio * 2) def get_repository(self, type, dir, params): """Return a `SubversionRepository`. The repository is wrapped in a `CachedRepository`, unless `type` is 'direct-svnfs'. """ params.update(tags=self.tags, branches=self.branches) params.setdefault('eol_style', self.eol_style) repos = SubversionRepository(dir, params, self.log) if type != 'direct-svnfs': repos = SvnCachedRepository(self.env, repos, self.log) return repos class SubversionRepository(Repository): """Repository implementation based on the svn.fs API.""" has_linear_changesets = True def __init__(self, path, params, log): self.log = log self.pool = Pool() # note that this should usually not happen (str arg expected) if isinstance(path, bytes): path = to_unicode(path) # Remove any trailing slash or else subversion might abort path = posixpath.normpath(path.replace('\\', '/')) path_utf8 = core.svn_path_canonicalize(path.encode('utf-8')) path = str(path_utf8, 'utf-8') root_path_utf8 = repos.svn_repos_find_root_path(path_utf8, self.pool) if root_path_utf8 is None: raise InvalidRepository( _("%(path)s does not appear to be a Subversion repository.", path=path)) root_path = str(root_path_utf8, 'utf-8') self.path = path try: self.repos = repos.svn_repos_open(root_path_utf8, self.pool) except core.SubversionException as e: raise InvalidRepository( _("Couldn't open Subversion repository %(path)s: " "%(svn_error)s", path=path, svn_error=exception_to_unicode(e))) self.fs_ptr = repos.svn_repos_fs(self.repos) self.uuid = fs.get_uuid(self.fs_ptr, self.pool) self.base = 'svn:%s:%s' % (self.uuid, root_path) name = 'svn:%s:%s' % (self.uuid, path) Repository.__init__(self, name, params, log) # if root_path is shorter than the path, the difference is # this scope (which always starts with a '/') if root_path != path: self.scope = path[len(root_path):] if not self.scope[-1] == '/': self.scope += '/' else: self.scope = '/' assert self.scope.startswith('/') # we keep root_path_utf8 for RA ra_prefix = b'file:///' if os.name == 'nt' else b'file://' self.ra_url_utf8 = core.svn_uri_canonicalize(ra_prefix + _quote_b(root_path_utf8)) self.clear() def clear(self, youngest_rev=None): """Reset notion of `youngest` and `oldest`""" self.youngest = None if youngest_rev is not None: self.youngest = self.normalize_rev(youngest_rev) self.oldest = None def has_node(self, path, rev=None, pool=None): """Check if `path` exists at `rev` (or latest if unspecified)""" if not pool: pool = self.pool rev = self.normalize_rev(rev) rev_root = fs.revision_root(self.fs_ptr, rev, pool) node_type = fs.check_path(rev_root, _to_svn(pool, self.scope, path), pool) return node_type in _kindmap def normalize_path(self, path): """Take any path specification and produce a path suitable for the rest of the API """ return _normalize_path(path) def normalize_rev(self, rev): """Take any revision specification and produce a revision suitable for the rest of the API """ if rev is None or isinstance(rev, str) and \ rev.lower() in ('', 'head', 'latest', 'youngest'): return self.youngest_rev else: try: normrev = int(rev) if 0 <= normrev <= self.youngest_rev: return normrev else: self.log.debug("%r cannot be normalized in %s: out of [0, " "%r]", rev, self.reponame or '(default)', self.youngest_rev) except (ValueError, TypeError) as e: self.log.debug("%r cannot be normalized in %s: %s", rev, self.reponame or '(default)', exception_to_unicode(e)) raise NoSuchChangeset(rev) def close(self): """Dispose of low-level resources associated to this repository.""" self.repos = None self.fs_ptr = None _pool_destroy(self.pool) self.pool = None def get_base(self): """Retrieve the base path corresponding to the Subversion repository itself. This is the same as the `.path` property minus the intra-repository scope, if one was specified. """ return self.base def _get_tags_or_branches(self, paths): """Retrieve known branches or tags.""" for path in self.params.get(paths, []): if path.endswith('*'): folder = posixpath.dirname(path) try: entries = [n for n in self.get_node(folder).get_entries()] for node in sorted(entries, key=lambda n: embedded_numbers(n.path.lower())): if node.kind == Node.DIRECTORY: yield node except Exception: # no right (TODO: use a specific Exception) pass else: try: yield self.get_node(path) except Exception: # no right pass def get_quickjump_entries(self, rev): """Retrieve known branches, as (name, id) pairs. Purposedly ignores `rev` and always takes the last revision. """ for n in self._get_tags_or_branches('branches'): yield 'branches', n.path, n.path, None for n in self._get_tags_or_branches('tags'): yield 'tags', n.path, n.created_path, n.created_rev def get_path_url(self, path, rev): """Retrieve the "native" URL from which this repository is reachable from Subversion clients. """ url = self.params.get('url', '').rstrip('/') if url: href = Href(url) if path: path = path.lstrip('/') return href(path) def get_changeset(self, rev): """Produce a `SubversionChangeset` from given revision specification""" rev = self.normalize_rev(rev) return SubversionChangeset(self, rev, self.scope, self.pool) def get_changeset_uid(self, rev): """Build a value identifying the `rev` in this repository.""" return self.uuid, rev def get_node(self, path, rev=None): """Produce a `SubversionNode` from given path and optionally revision specifications. No revision given means use the latest. """ path = path or '' if path and path != '/' and path[-1] == '/': path = path[:-1] rev = self.normalize_rev(rev) or self.youngest_rev return SubversionNode(path, rev, self, self.pool) def _get_node_revs(self, path, last=None, first=None): """Return the revisions affecting `path` between `first` and `last` revs. If `first` is not given, it goes down to the revision in which the branch was created. """ node = self.get_node(path, last) revs = [] for (p, r, chg) in node.get_history(): if p != path or (first and r < first): break revs.append(r) return revs def _get_changed_revs(self, node_infos): path_revs = {} for node, first in node_infos: path = node.path revs = [] for p, r, chg in node.get_history(): if p != path or r < first: break revs.append(r) path_revs[path] = revs return path_revs def _history(self, path, start, end, pool): """`path` is a str path in the scope. Generator yielding `(path, rev)` pairs, where `path` is a `str` object. Must start with `(path, created rev)`. (wraps ``fs.node_history``) """ path_utf8 = _to_svn(pool, self.scope, path) if start < end: start, end = end, start if (start, end) == (1, 0): # only happens for empty repos return root = fs.revision_root(self.fs_ptr, start, pool) # fs.node_history leaks when path doesn't exist (#6588) if fs.check_path(root, path_utf8, pool) == core.svn_node_none: return tmp1 = Pool(pool) tmp2 = Pool(pool) history_ptr = fs.node_history(root, path_utf8, tmp1) cross_copies = 1 while history_ptr: history_ptr = fs.history_prev(history_ptr, cross_copies, tmp2) tmp1.clear() tmp1, tmp2 = tmp2, tmp1 if history_ptr: path_utf8, rev = fs.history_location(history_ptr, tmp2) tmp2.clear() if rev < end: break path = _from_svn(path_utf8) yield path, rev del tmp1 del tmp2 def _previous_rev(self, rev, path='', pool=None): if rev > 1: # don't use oldest here, as it's too expensive for _, prev in self._history(path, 1, rev-1, pool or self.pool): return prev return None def get_oldest_rev(self): """Gives an approximation of the oldest revision.""" if self.oldest is None: self.oldest = 1 # trying to figure out the oldest rev for scoped repository # is too expensive and uncovers a big memory leak (#5213) # if self.scope != '/': # self.oldest = self.next_rev(0, find_initial_rev=True) return self.oldest def get_youngest_rev(self): """Retrieve the latest revision in the repository. (wraps ``fs.youngest_rev``) """ if not self.youngest: self.youngest = fs.youngest_rev(self.fs_ptr, self.pool) if self.scope != '/': for path, rev in self._history('', 1, self.youngest, self.pool): self.youngest = rev break return self.youngest def previous_rev(self, rev, path=''): """Return revision immediately preceeding `rev`, eventually below given `path` or globally. """ # FIXME optimize for non-scoped rev = self.normalize_rev(rev) return self._previous_rev(rev, path) def next_rev(self, rev, path='', find_initial_rev=False): """Return revision immediately following `rev`, eventually below given `path` or globally. """ rev = self.normalize_rev(rev) next = rev + 1 youngest = self.youngest_rev subpool = Pool(self.pool) while next <= youngest: subpool.clear() for _, next in self._history(path, rev+1, next, subpool): return next else: if not find_initial_rev and \ not self.has_node(path, next, subpool): return next # a 'delete' event is also interesting... next += 1 return None def rev_older_than(self, rev1, rev2): """Check relative order between two revision specifications.""" return self.normalize_rev(rev1) < self.normalize_rev(rev2) def get_path_history(self, path, rev=None, limit=None): """Retrieve creation and deletion events that happened on given `path`. """ path = self.normalize_path(path) rev = self.normalize_rev(rev) expect_deletion = False subpool = Pool(self.pool) numrevs = 0 while rev and (not limit or numrevs < limit): subpool.clear() if self.has_node(path, rev, subpool): if expect_deletion: # it was missing, now it's there again: # rev+1 must be a delete numrevs += 1 yield path, rev+1, Changeset.DELETE newer = None # 'newer' is the previously seen history tuple older = None # 'older' is the currently examined history tuple for p, r in self._history(path, 1, rev, subpool): older = (_path_within_scope(self.scope, p), r, Changeset.ADD) rev = self._previous_rev(r, pool=subpool) if newer: numrevs += 1 if older[0] == path: # still on the path: 'newer' was an edit yield newer[0], newer[1], Changeset.EDIT else: # the path changed: 'newer' was a copy rev = self._previous_rev(newer[1], pool=subpool) # restart before the copy op yield newer[0], newer[1], Changeset.COPY older = (older[0], older[1], 'unknown') break newer = older if older: # either a real ADD or the source of a COPY numrevs += 1 yield older else: expect_deletion = True rev = self._previous_rev(rev, pool=subpool) def get_changes(self, old_path, old_rev, new_path, new_rev, ignore_ancestry=0): """Determine differences between two arbitrary pairs of paths and revisions. (wraps ``repos.svn_repos_dir_delta``) """ old_node = new_node = None old_rev = self.normalize_rev(old_rev) new_rev = self.normalize_rev(new_rev) if self.has_node(old_path, old_rev): old_node = self.get_node(old_path, old_rev) else: raise NoSuchNode(old_path, old_rev, 'The Base for Diff is invalid') if self.has_node(new_path, new_rev): new_node = self.get_node(new_path, new_rev) else: raise NoSuchNode(new_path, new_rev, 'The Target for Diff is invalid') if new_node.kind != old_node.kind: raise TracError(_('Diff mismatch: Base is a %(oldnode)s ' '(%(oldpath)s in revision %(oldrev)s) and ' 'Target is a %(newnode)s (%(newpath)s in ' 'revision %(newrev)s).', oldnode=old_node.kind, oldpath=old_path, oldrev=old_rev, newnode=new_node.kind, newpath=new_path, newrev=new_rev)) subpool = Pool(self.pool) if new_node.isdir: editor = DiffChangeEditor() e_ptr, e_baton = delta.make_editor(editor, subpool) old_root = fs.revision_root(self.fs_ptr, old_rev, subpool) new_root = fs.revision_root(self.fs_ptr, new_rev, subpool) def authz_cb(root, path, pool): return 1 text_deltas = 0 # as this is anyway re-done in Diff.py... entry_props = 0 # "... typically used only for working copy updates" repos.svn_repos_dir_delta(old_root, _to_svn(subpool, self.scope, old_path), '', new_root, _to_svn(subpool, self.scope, new_path), e_ptr, e_baton, authz_cb, text_deltas, 1, # directory entry_props, ignore_ancestry, subpool) # sort deltas by path before creating `SubversionNode`s to reduce # memory usage (#10978) deltas = sorted(((_from_svn(path), kind, change) for path, kind, change in editor.deltas), key=lambda entry: entry[0]) # Workaround for ref-count leak due to delta.make_editor() editor.__dict__.clear() for path, kind, change in deltas: old_node = new_node = None if change != Changeset.ADD: old_node = self.get_node(posixpath.join(old_path, path), old_rev) if change != Changeset.DELETE: new_node = self.get_node(posixpath.join(new_path, path), new_rev) else: kind = _kindmap[fs.check_path(old_root, _to_svn(subpool, self.scope, old_node.path), subpool)] yield (old_node, new_node, kind, change) else: old_root = fs.revision_root(self.fs_ptr, old_rev, subpool) new_root = fs.revision_root(self.fs_ptr, new_rev, subpool) if fs.contents_changed(old_root, _to_svn(subpool, self.scope, old_path), new_root, _to_svn(subpool, self.scope, new_path), subpool): yield (old_node, new_node, Node.FILE, Changeset.EDIT) class SubversionNode(Node): def __init__(self, path, rev, repos, pool=None, parent_root=None): self.fs_ptr = repos.fs_ptr self.scope = repos.scope self.pool = Pool(pool) pool = self.pool self._scoped_path_utf8 = _to_svn(pool, self.scope, path) if parent_root: self.root = parent_root else: try: self.root = fs.revision_root(self.fs_ptr, rev, pool) except core.SubversionException as e: raise NoSuchNode(path, rev, exception_to_unicode(e)) from e node_type = fs.check_path(self.root, self._scoped_path_utf8, pool) if node_type not in _kindmap: raise NoSuchNode(path, rev) cp_utf8 = fs.node_created_path(self.root, self._scoped_path_utf8, pool) cp = _from_svn(cp_utf8) cr = fs.node_created_rev(self.root, self._scoped_path_utf8, pool) # Note: `cp` differs from `path` if the last change was a copy, # In that case, `path` doesn't even exist at `cr`. # The only guarantees are: # * this node exists at (path,rev) # * the node existed at (created_path,created_rev) # Also, `cp` might well be out of the scope of the repository, # in this case, we _don't_ use the ''create'' information. if _is_path_within_scope(self.scope, cp): self.created_rev = cr self.created_path = _path_within_scope(self.scope, cp) else: self.created_rev, self.created_path = rev, path # TODO: check node id Node.__init__(self, repos, path, rev, _kindmap[node_type]) def get_content(self): """Retrieve raw content as a "read()"able object.""" if self.isdir: return None return FileContentStream(self) def get_processed_content(self, keyword_substitution=True, eol_hint=None): """Retrieve processed content as a "read()"able object.""" if self.isdir: return None eol_style = self.repos.params.get('eol_style') if eol_hint is None \ else eol_hint return FileContentStream(self, keyword_substitution, eol_style) def get_entries(self): """Yield `SubversionNode` corresponding to entries in this directory. (wraps ``fs.dir_entries``) """ if self.isfile: return pool = Pool(self.pool) entries = fs.dir_entries(self.root, self._scoped_path_utf8, pool) for item in entries: path = posixpath.join(self.path, _from_svn(item)) yield SubversionNode(path, self.rev, self.repos, self.pool, self.root) def get_history(self, limit=None): """Yield change events that happened on this path""" newer = None # 'newer' is the previously seen history tuple older = None # 'older' is the currently examined history tuple pool = Pool(self.pool) numrevs = 0 for path, rev in self.repos._history(self.path, 1, self.rev, pool): path = _path_within_scope(self.scope, path) if rev > 0 and path: older = (path, rev, Changeset.ADD) if newer: if newer[0] == older[0]: # stay on same path change = Changeset.EDIT else: change = Changeset.COPY newer = (newer[0], newer[1], change) numrevs += 1 yield newer newer = older if limit and numrevs >= limit: break if newer and (not limit or numrevs < limit): yield newer def get_annotations(self): """Return a list the last changed revision for each line. (wraps ``client.blame2``) """ annotations = [] if self.isfile: def blame_receiver(line_no, revision, author, date, line, pool): annotations.append(revision) try: rev = _svn_rev(self.rev) start = _svn_rev(0) file_url_utf8 = posixpath.join( self.repos.ra_url_utf8, _quote_b(self._scoped_path_utf8)) # svn_client_blame2() requires a canonical uri since # Subversion 1.7 (#11167) file_url_utf8 = core.svn_uri_canonicalize(file_url_utf8) self.repos.log.info('opening ra_local session to %r', file_url_utf8) from svn import client client.blame2(file_url_utf8, rev, start, rev, blame_receiver, client.create_context(), self.pool) except (core.SubversionException, AttributeError) as e: # svn thinks file is a binary or blame not supported raise TracError(_('svn blame failed on %(path)s: %(error)s', path=self.path, error=to_unicode(e))) from e return annotations # def get_previous(self): # # FIXME: redo it with fs.node_history def get_properties(self): """Return `dict` of node properties at current revision. (wraps ``fs.node_proplist``) """ props = fs.node_proplist(self.root, self._scoped_path_utf8, self.pool) # Note that property values can be arbitrary binary values # so we can't assume they are UTF-8 strings... return {_from_svn(name): _from_svn(value) for name, value in props.items()} def get_content_length(self): """Retrieve byte size of a file. Return `None` for a folder. (wraps ``fs.file_length``) """ if self.isdir: return None return fs.file_length(self.root, self._scoped_path_utf8, self.pool) def get_content_type(self): """Retrieve mime-type property of a file. Return `None` for a folder. (wraps ``fs.revision_prop``) """ if self.isdir: return None return self._get_prop(core.SVN_PROP_MIME_TYPE) def get_last_modified(self): """Retrieve timestamp of last modification, in micro-seconds. (wraps ``fs.revision_prop``) """ _date = fs.revision_prop(self.fs_ptr, self.created_rev, core.SVN_PROP_REVISION_DATE, self.pool) if not _date: return None return from_utimestamp(core.svn_time_from_cstring(_date, self.pool)) def _get_prop(self, name): value = fs.node_prop(self.root, self._scoped_path_utf8, name, self.pool) return to_unicode(value) def get_branch_origin(self): """Return the revision in which the node's path was created. (wraps ``fs.revision_root_revision(fs.closest_copy)``) """ root_and_path = fs.closest_copy(self.root, self._scoped_path_utf8) if root_and_path: return fs.revision_root_revision(root_and_path[0]) def get_copy_ancestry(self): """Retrieve the list of `(path,rev)` copy ancestors of this node. Most recent ancestor first. Each ancestor `(path, rev)` corresponds to the path and revision of the source at the time the copy or move operation was performed. """ ancestors = [] previous = (self._scoped_path_utf8, self.rev, self.root) while previous: (previous_path, previous_rev, previous_root) = previous previous = None root_path = fs.closest_copy(previous_root, previous_path) if root_path: (root, path) = root_path path = path.lstrip(b'/') rev = fs.revision_root_revision(root) relpath = None if path != previous_path: # `previous_path` is a subfolder of `path` and didn't # change since `path` was copied relpath = previous_path[len(path):].strip(b'/') copied_from = fs.copied_from(root, path) if copied_from: (rev, path) = copied_from path = path.lstrip(b'/') root = fs.revision_root(self.fs_ptr, rev, self.pool) if relpath: path += b'/' + relpath ui_path = _path_within_scope(self.scope, _from_svn(path)) if ui_path: ancestors.append((ui_path, rev)) previous = (path, rev, root) return ancestors class SubversionChangeset(Changeset): def __init__(self, repos, rev, scope, pool=None): self.log = repos.log self.rev = rev self.scope = scope self.fs_ptr = repos.fs_ptr self.pool = Pool(pool) try: message = self._get_revprop(core.SVN_PROP_REVISION_LOG) except core.SubversionException: raise NoSuchChangeset(rev) author = self._get_revprop(core.SVN_PROP_REVISION_AUTHOR) # we _hope_ it's UTF-8, but can't be 100% sure (#4321) message = _from_svn(message) author = _from_svn(author) _date = self._get_revprop(core.SVN_PROP_REVISION_DATE) if _date: ts = core.svn_time_from_cstring(_date, self.pool) date = from_utimestamp(ts) else: date = None Changeset.__init__(self, repos, rev, message, author, date) def get_properties(self): """Retrieve `dict` of Subversion properties for this revision (revprops) """ props = fs.revision_proplist(self.fs_ptr, self.rev, self.pool) # Note: the above `_from_svn` has a small probability # to mess-up binary properties, like icons. return {_from_svn(k): _from_svn(v) for k, v in props.items() if k not in (core.SVN_PROP_REVISION_LOG, core.SVN_PROP_REVISION_AUTHOR, core.SVN_PROP_REVISION_DATE)} def get_changes(self): """Retrieve file changes for a given revision. (wraps ``repos.svn_repos_replay``) """ pool = Pool(self.pool) tmp = Pool(pool) root = fs.revision_root(self.fs_ptr, self.rev, pool) try: editor = repos.ChangeCollector(self.fs_ptr, root, pool) except AttributeError: editor = repos.RevisionChangeCollector(self.fs_ptr, self.rev, pool) e_ptr, e_baton = delta.make_editor(editor, pool) repos.svn_repos_replay(root, e_ptr, e_baton, pool) idx = 0 copies, deletions = {}, {} changes = [] revroots = {} for path_utf8, change in editor.changes.items(): new_path = _from_svn(path_utf8) # Filtering on `path` if not _is_path_within_scope(self.scope, new_path): continue path_utf8 = change.path base_path_utf8 = change.base_path path = _from_svn(path_utf8) base_path = _from_svn(base_path_utf8) base_rev = change.base_rev change_action = getattr(change, 'action', None) # Ensure `base_path` is within the scope if not _is_path_within_scope(self.scope, base_path): base_path, base_rev = None, -1 # Determine the action if not path and not new_path and self.scope == '/': action = Changeset.EDIT # root property change elif not path or change_action == repos.CHANGE_ACTION_DELETE: if new_path: # deletion action = Changeset.DELETE deletions[new_path.lstrip('/')] = idx else: # deletion outside of scope, ignore continue elif change.added or not base_path: # add or copy action = Changeset.ADD if base_path and base_rev: action = Changeset.COPY copies[base_path.lstrip('/')] = idx else: action = Changeset.EDIT # identify the most interesting base_path/base_rev # in terms of last changed information (see r2562) if base_rev in revroots: b_root = revroots[base_rev] else: b_root = fs.revision_root(self.fs_ptr, base_rev, pool) revroots[base_rev] = b_root tmp.clear() cbase_path_utf8 = fs.node_created_path(b_root, base_path_utf8, tmp) cbase_path = _from_svn(cbase_path_utf8) cbase_rev = fs.node_created_rev(b_root, base_path_utf8, tmp) # give up if the created path is outside the scope if _is_path_within_scope(self.scope, cbase_path): base_path, base_rev = cbase_path, cbase_rev kind = _kindmap[change.item_kind] path = _path_within_scope(self.scope, new_path or base_path) base_path = _path_within_scope(self.scope, base_path) changes.append([path, kind, action, base_path, base_rev]) idx += 1 # Workaround for ref-count leak due to delta.make_editor() editor.__dict__.clear() moves = set() # a MOVE is a COPY whose `base_path` corresponds to a `new_path` # which has been deleted for k, v in copies.items(): if k in deletions: changes[v][2] = Changeset.MOVE moves.add(deletions[k]) changes = [change for i, change in enumerate(changes) if i not in moves] changes.sort() for change in changes: yield tuple(change) def _get_revprop(self, name): try: return fs.revision_prop(self.fs_ptr, self.rev, name, self.pool) except core.SubversionException as e: self.log.debug("%r of the %r cannot be retrieved", name, self.rev) raise # # Delta editor for diffs between arbitrary nodes # # Note 1: the 'copyfrom_path' and 'copyfrom_rev' information is not used # because 'repos.svn_repos_dir_delta' *doesn't* provide it. # # Note 2: the 'dir_baton' is the path of the parent directory # def DiffChangeEditor(): class DiffChangeEditor(delta.Editor): def __init__(self): self.deltas = [] # -- svn.delta.Editor callbacks def open_root(self, base_revision, dir_pool): return '/', Changeset.EDIT def add_directory(self, path, dir_baton, copyfrom_path, copyfrom_rev, dir_pool): self.deltas.append((path, Node.DIRECTORY, Changeset.ADD)) return path, Changeset.ADD def open_directory(self, path, dir_baton, base_revision, dir_pool): return path, dir_baton[1] def change_dir_prop(self, dir_baton, name, value, pool): path, change = dir_baton if change != Changeset.ADD: self.deltas.append((path, Node.DIRECTORY, change)) def delete_entry(self, path, revision, dir_baton, pool): self.deltas.append((path, None, Changeset.DELETE)) def add_file(self, path, dir_baton, copyfrom_path, copyfrom_revision, dir_pool): self.deltas.append((path, Node.FILE, Changeset.ADD)) def open_file(self, path, dir_baton, dummy_rev, file_pool): self.deltas.append((path, Node.FILE, Changeset.EDIT)) return DiffChangeEditor() class FileContentStream(object): KEYWORD_GROUPS = { 'rev': ['LastChangedRevision', 'Rev', 'Revision'], 'date': ['LastChangedDate', 'Date'], 'author': ['LastChangedBy', 'Author'], 'url': ['HeadURL', 'URL'], 'id': ['Id'], 'header': ['Header'], } KEYWORDS = functools.reduce(set.union, map(set, KEYWORD_GROUPS.values())) KEYWORD_SPLIT_RE = re.compile(r'[ \t\v\n\b\r\f]+') KEYWORD_EXPAND_RE = re.compile(r'%[abdDPrRu_%HI]') NEWLINES = {'LF': b'\n', 'CRLF': b'\r\n', 'CR': b'\r', 'native': b'\r\n' if os.name == 'nt' else b'\n'} KEYWORD_MAX_SIZE = 255 CHUNK_SIZE = 4096 keywords_re = None native_eol = None newline = b'\n' def __init__(self, node, keyword_substitution=None, eol=None): self.translated = b'' self.buffer = b'' self.repos = node.repos self.node = node self.fs_ptr = node.fs_ptr self.pool = Pool() # Note: we _must_ use a detached pool here, as the lifetime of # this object can exceed those of the node or even the repository if keyword_substitution: self.keywords = self._get_keyword_values( node._get_prop(core.SVN_PROP_KEYWORDS)) self.keywords_re = self._build_keywords_re(self.keywords) if self.NEWLINES.get(eol, '\n') != '\n' and \ node._get_prop(core.SVN_PROP_EOL_STYLE) == 'native': self.native_eol = True self.newline = self.NEWLINES[eol] self.stream = core.Stream(fs.file_contents(node.root, node._scoped_path_utf8, self.pool)) def __enter__(self): return self def __exit__(self, et, ev, tb): self.close() def close(self): self.stream = None self.fs_ptr = None _pool_destroy(self.pool) self.pool = None def read(self, n=None): if self.stream is None: raise ValueError('I/O operation on closed file') if self.keywords_re is None and not self.native_eol: return self._read_dumb(self.stream, n) else: return self._read_substitute(self.stream, n) def _get_revprop(self, name, rev): return fs.revision_prop(self.fs_ptr, rev, name, self.pool) def _get_keyword_values(self, keywords): if not keywords: return None keywords = list(filter(None, self.KEYWORD_SPLIT_RE.split(keywords))) if not keywords: return None node = self.node mtime = to_datetime(node.last_modified, utc) shortdate = self._format_shortdate(mtime) longdate = self._format_longdate(mtime) created_rev = str(node.created_rev) # Note that the `_from_svn` has a small probability to mess-up binary # properties, see #4321. author = _from_svn(self._get_revprop(core.SVN_PROP_REVISION_AUTHOR, node.created_rev)) path = node.path.lstrip('/') url = node.repos.get_path_url(path, node.rev) or path root_url = node.repos.get_path_url('', node.rev) or '/' id_ = ' '.join((node.name, created_rev, shortdate, author)) data = { 'rev': created_rev, 'author': author, 'url': url, 'date': longdate, 'id': id_, 'header': ' '.join((url, created_rev, shortdate, author)), '%a': author, '%b': node.name, '%d': shortdate, '%D': longdate, '%P': path, '%r': created_rev, '%R': root_url, '%u': url, '%_': ' ', '%%': '%', '%I': id_, '%H': ' '.join((path, created_rev, shortdate, author)), } def expand(match): match = match.group(0) return data.get(match, match) values = {} for name, aliases in self.KEYWORD_GROUPS.items(): if any(kw in keywords for kw in aliases): values.update((kw, data[name]) for kw in aliases) for keyword in keywords: if '=' not in keyword: continue name, definition = keyword.split('=', 1) if name not in self.KEYWORDS: values[name] = self.KEYWORD_EXPAND_RE.sub(expand, definition) if values: return {key.encode('utf-8'): str(value).encode('utf-8') for key, value in values.items()} else: return None def _build_keywords_re(self, keywords): if keywords: return re.compile(b""" [$] (?P<keyword>%s) (?: :[ ][^$\r\n]+?[ ] | ::[ ](?P<fixed>[^$\r\n]+?)[ #] )? [$]""" % b'|'.join(map(re.escape, keywords)), re.VERBOSE) else: return None def _format_shortdate(self, mtime): return mtime.strftime('%Y-%m-%d %H:%M:%SZ') def _format_longdate(self, mtime): text = mtime.strftime('%Y-%m-%d %H:%M:%S +0000 (%%(a)s, %d %%(b)s %Y)') weekdays = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun') months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec') return text % {'a': weekdays[mtime.weekday()], 'b': months[mtime.month - 1]} def _read_dumb(self, stream, n): return stream.read(n) def _read_substitute(self, stream, n): if n is None: n = -1 buffer = self.buffer translated = self.translated while True: if 0 <= n <= len(translated): self.buffer = buffer self.translated = translated[n:] return translated[:n] if len(buffer) < self.KEYWORD_MAX_SIZE: buffer += stream.read(self.CHUNK_SIZE) or b'' if not buffer: self.buffer = buffer self.translated = b'' return translated # search first "$" character pos = buffer.find(b'$') if self.keywords_re else -1 if pos == -1: translated += self._translate_newline(buffer) buffer = b'' continue if pos > 0: # move to the first "$" character translated += self._translate_newline(buffer[:pos]) buffer = buffer[pos:] match = None while True: # search second "$" character pos = buffer.find(b'$', 1) if pos == -1: translated += self._translate_newline(buffer) buffer = b'' break if pos < self.KEYWORD_MAX_SIZE: match = self.keywords_re.match(buffer) if match: break # found "$Keyword$" in the first 255 bytes # move to the second "$" character translated += self._translate_newline(buffer[:pos]) buffer = buffer[pos:] if pos == -1 or not match: continue # move to the next character of the second "$" character pos += 1 translated += self._translate_keyword(buffer[:pos], match) buffer = buffer[pos:] continue def _translate_newline(self, data): if self.native_eol: data = data.replace(b'\n', self.newline) return data def _translate_keyword(self, text, match): keyword = match.group('keyword') value = self.keywords.get(keyword) if value is None: return text fixed = match.group('fixed') if fixed is None: n = self.KEYWORD_MAX_SIZE - len(keyword) - 5 return b'$%s: %.*s $' % (keyword, n, value) if n >= 0 else text else: n = len(fixed) return b'$%s:: %-*.*s%s$' % \ (keyword, n, n, value, b'#' if n < len(value) else b' ')