##// END OF EJS Templates
avoid %r markup of unicode strings in user facing messages...
avoid %r markup of unicode strings in user facing messages Improves Revision u'b7f4...' does not exist for this repository

File last commit:

r3575:ca7785fa beta
r3575:ca7785fa beta
Show More
changeset.py
551 lines | 19.2 KiB | text/x-python | PythonLexer
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 import re
from itertools import chain
from dulwich import objects
from subprocess import Popen, PIPE
git executable is now configurable via .ini files
r3376 import rhodecode
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs.conf import settings
from rhodecode.lib.vcs.exceptions import RepositoryError
from rhodecode.lib.vcs.exceptions import ChangesetError
from rhodecode.lib.vcs.exceptions import NodeDoesNotExistError
from rhodecode.lib.vcs.exceptions import VCSError
from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
from rhodecode.lib.vcs.exceptions import ImproperArchiveTypeError
new dulwich based implementation of added/modified/removed...
r2762 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyChangeset
Implements subrepos view inside filebrowser...
r2232 from rhodecode.lib.vcs.nodes import FileNode, DirNode, NodeKind, RootNode, \
fixes #630 git statistics do too much work making them slow....
r2968 RemovedFileNode, SubModuleNode, ChangedFileNodesGenerator,\
AddedFileNodesGenerator, RemovedFileNodesGenerator
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs.utils import safe_unicode
from rhodecode.lib.vcs.utils import date_fromtimestamp
from rhodecode.lib.vcs.utils.lazy import LazyProperty
Speed up of last_changeset extraction in VCS, in edge cases for git we can get 10x speed improvement by limiting the history extraction if we only need last changeset
r3496 from rhodecode.lib.utils2 import safe_int
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
class GitChangeset(BaseChangeset):
"""
Represents state of the repository at single revision.
"""
def __init__(self, repository, revision):
self._stat_modes = {}
self.repository = repository
When using tags in git use the link to Commit instead of messing with Tag object
r2537
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 try:
When using tags in git use the link to Commit instead of messing with Tag object
r2537 commit = self.repository._repo.get_object(revision)
Synced vcs with upstream
r2543 if isinstance(commit, objects.Tag):
When using tags in git use the link to Commit instead of messing with Tag object
r2537 revision = commit.object[1]
commit = self.repository._repo.get_object(commit.object[1])
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 except KeyError:
When using tags in git use the link to Commit instead of messing with Tag object
r2537 raise RepositoryError("Cannot get object with id %s" % revision)
self.raw_id = revision
self.id = self.raw_id
self.short_id = self.raw_id[:12]
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 self._commit = commit
Fixed lookup by Tag sha in git backend
r2536
When using tags in git use the link to Commit instead of messing with Tag object
r2537 self._tree_id = commit.tree
Mads Kiilerich
fix spelling of committer
r3492 self._committer_property = 'committer'
implements #649 added two seperate method for author and commiter to VCS changeset class...
r3004 self._author_property = 'author'
When using tags in git use the link to Commit instead of messing with Tag object
r2537 self._date_property = 'commit_time'
self._date_tz_property = 'commit_timezone'
self.revision = repository.revisions.index(revision)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
safe_unicode never fails. No need to catch decode exceptions
r2297 self.message = safe_unicode(commit.message)
fixes #625 Git-Tags are not displayed in Shortlog...
r2975
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 self.nodes = {}
self._paths = {}
@LazyProperty
Mads Kiilerich
fix spelling of committer
r3492 def committer(self):
return safe_unicode(getattr(self._commit, self._committer_property))
implements #649 added two seperate method for author and commiter to VCS changeset class...
r3004
@LazyProperty
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def author(self):
implements #649 added two seperate method for author and commiter to VCS changeset class...
r3004 return safe_unicode(getattr(self._commit, self._author_property))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
@LazyProperty
def date(self):
Fixed lookup by Tag sha in git backend
r2536 return date_fromtimestamp(getattr(self._commit, self._date_property),
getattr(self._commit, self._date_tz_property))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
@LazyProperty
Extended commit search schema with date of commit
r2693 def _timestamp(self):
return getattr(self._commit, self._date_property)
@LazyProperty
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def status(self):
"""
Returns modified, added, removed, deleted files for current changeset
"""
return self.changed, self.added, self.removed
@LazyProperty
fixes #625 Git-Tags are not displayed in Shortlog...
r2975 def tags(self):
_tags = []
for tname, tsha in self.repository.tags.iteritems():
if tsha == self.raw_id:
_tags.append(tname)
return _tags
@LazyProperty
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def branch(self):
display current heads of branches for git in changelog and shortlog
r2198
heads = self.repository._heads(reverse=False)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
display current heads of branches for git in changelog and shortlog
r2198 ref = heads.get(self.raw_id)
if ref:
return safe_unicode(ref)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def _fix_path(self, path):
"""
Paths are stored without trailing slash so we need to get rid off it if
needed.
"""
if path.endswith('/'):
path = path.rstrip('/')
return path
def _get_id_for_path(self, path):
temporarly fixed git _get_id_for_path problem in vcs....
r2116
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 # FIXME: Please, spare a couple of minutes and make those codes cleaner;
if not path in self._paths:
path = path.strip('/')
# set root tree
Fixed lookup by Tag sha in git backend
r2536 tree = self.repository._repo[self._tree_id]
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 if path == '':
self._paths[''] = tree.id
return tree.id
splitted = path.split('/')
dirs, name = splitted[:-1], splitted[-1]
curdir = ''
temporarly fixed git _get_id_for_path problem in vcs....
r2116
# initially extract things from root dir
for item, stat, id in tree.iteritems():
if curdir:
name = '/'.join((curdir, item))
else:
name = item
self._paths[name] = id
self._stat_modes[name] = stat
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 for dir in dirs:
if curdir:
curdir = '/'.join((curdir, dir))
else:
curdir = dir
dir_id = None
for item, stat, id in tree.iteritems():
if dir == item:
dir_id = id
if dir_id:
# Update tree
tree = self.repository._repo[dir_id]
if not isinstance(tree, objects.Tree):
raise ChangesetError('%s is not a directory' % curdir)
else:
raise ChangesetError('%s have not been found' % curdir)
temporarly fixed git _get_id_for_path problem in vcs....
r2116
# cache all items from the given traversed tree
for item, stat, id in tree.iteritems():
if curdir:
name = '/'.join((curdir, item))
else:
name = item
self._paths[name] = id
self._stat_modes[name] = stat
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 if not path in self._paths:
raise NodeDoesNotExistError("There is no file nor directory "
Mads Kiilerich
avoid %r markup of unicode strings in user facing messages...
r3575 "at the given path '%s' at revision %s"
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 % (path, self.short_id))
return self._paths[path]
def _get_kind(self, path):
Fixed lookup by Tag sha in git backend
r2536 obj = self.repository._repo[self._get_id_for_path(path)]
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 if isinstance(obj, objects.Blob):
return NodeKind.FILE
elif isinstance(obj, objects.Tree):
return NodeKind.DIR
Implemented file history page for showing detailed changelog for a given file...
r3039 def _get_filectx(self, path):
path = self._fix_path(path)
if self._get_kind(path) != NodeKind.FILE:
Mads Kiilerich
avoid %r markup of unicode strings in user facing messages...
r3575 raise ChangesetError("File does not exist for revision %s at "
" '%s'" % (self.raw_id, path))
Implemented file history page for showing detailed changelog for a given file...
r3039 return path
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def _get_file_nodes(self):
return chain(*(t[2] for t in self.walk()))
@LazyProperty
def parents(self):
"""
Returns list of parents changesets.
"""
return [self.repository.get_changeset(parent)
Fixed lookup by Tag sha in git backend
r2536 for parent in self._commit.parents]
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
implemented children for git changesets
r3077 @LazyProperty
def children(self):
"""
Returns list of children changesets.
"""
made git refs filter configurable ref issue #797...
r3561 rev_filter = _git_path = rhodecode.CONFIG.get('git_rev_filter',
'--all').strip()
implemented children for git changesets
r3077 so, se = self.repository.run_git_command(
made git refs filter configurable ref issue #797...
r3561 "rev-list %s --children | grep '^%s'" % (rev_filter, self.raw_id)
implemented children for git changesets
r3077 )
children = []
for l in so.splitlines():
childs = l.split(' ')[1:]
children.extend(childs)
return [self.repository.get_changeset(cs) for cs in children]
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def next(self, branch=None):
if branch and self.branch != branch:
raise VCSError('Branch option used on changeset not belonging '
'to that branch')
def _next(changeset, branch):
try:
next_ = changeset.revision + 1
next_rev = changeset.repository.revisions[next_]
except IndexError:
raise ChangesetDoesNotExistError
cs = changeset.repository.get_changeset(next_rev)
if branch and branch != cs.branch:
return _next(cs, branch)
return cs
return _next(self, branch)
def prev(self, branch=None):
if branch and self.branch != branch:
raise VCSError('Branch option used on changeset not belonging '
'to that branch')
def _prev(changeset, branch):
try:
prev_ = changeset.revision - 1
if prev_ < 0:
raise IndexError
prev_rev = changeset.repository.revisions[prev_]
except IndexError:
raise ChangesetDoesNotExistError
cs = changeset.repository.get_changeset(prev_rev)
if branch and branch != cs.branch:
return _prev(cs, branch)
return cs
return _prev(self, branch)
Added diff option into git and hg changeset objects, representing git formated patch against parent1
r2384 def diff(self, ignore_whitespace=True, context=3):
fixed git diff function when initial revision had no parents to compare with
r2499 rev1 = self.parents[0] if self.parents else self.repository.EMPTY_CHANGESET
rev2 = self
return ''.join(self.repository.get_diff(rev1, rev2,
Added diff option into git and hg changeset objects, representing git formated patch against parent1
r2384 ignore_whitespace=ignore_whitespace,
context=context))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def get_file_mode(self, path):
"""
Returns stat mode of the file at the given ``path``.
"""
# ensure path is traversed
self._get_id_for_path(path)
return self._stat_modes[path]
def get_file_content(self, path):
"""
Returns content of the file at given ``path``.
"""
id = self._get_id_for_path(path)
blob = self.repository._repo[id]
return blob.as_pretty_string()
def get_file_size(self, path):
"""
Returns size of the file at given ``path``.
"""
id = self._get_id_for_path(path)
blob = self.repository._repo[id]
return blob.raw_length()
def get_file_changeset(self, path):
"""
Returns last commit of the file at the given ``path``.
"""
Speed up of last_changeset extraction in VCS, in edge cases for git we can get 10x speed improvement by limiting the history extraction if we only need last changeset
r3496 return self.get_file_history(path, limit=1)[0]
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
Speed up of last_changeset extraction in VCS, in edge cases for git we can get 10x speed improvement by limiting the history extraction if we only need last changeset
r3496 def get_file_history(self, path, limit=None):
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 """
Returns history of file as reversed list of ``Changeset`` objects for
which file at given ``path`` has been modified.
TODO: This function now uses os underlying 'git' and 'grep' commands
which is generally not good. Should be replaced with algorithm
iterating commits.
"""
Speed up of last_changeset extraction in VCS, in edge cases for git we can get 10x speed improvement by limiting the history extraction if we only need last changeset
r3496
Implemented file history page for showing detailed changelog for a given file...
r3039 self._get_filectx(path)
Speed up of last_changeset extraction in VCS, in edge cases for git we can get 10x speed improvement by limiting the history extraction if we only need last changeset
r3496 if limit:
cmd = 'log -n %s --pretty="format: %%H" -s -p %s -- "%s"' % (
safe_int(limit, 0), self.id, path
)
else:
cmd = 'log --pretty="format: %%H" -s -p %s -- "%s"' % (
self.id, path
)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 so, se = self.repository.run_git_command(cmd)
better regex for history
r2276 ids = re.findall(r'[0-9a-fA-F]{40}', so)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 return [self.repository.get_changeset(id) for id in ids]
fixes #652 switch to generator approach when doing file annotation to prevent huge memory consumption when executed on large files. Thanks to ALexey Larikov for patch....
r3044 def get_file_history_2(self, path):
"""
Returns history of file as reversed list of ``Changeset`` objects for
which file at given ``path`` has been modified.
"""
self._get_filectx(path)
from dulwich.walk import Walker
include = [self.id]
walker = Walker(self.repository._repo.object_store, include,
paths=[path], max_entries=1)
whitespace and formatting
r3057 return [self.repository.get_changeset(sha)
fixes #652 switch to generator approach when doing file annotation to prevent huge memory consumption when executed on large files. Thanks to ALexey Larikov for patch....
r3044 for sha in (x.commit.id for x in walker)]
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def get_file_annotate(self, path):
"""
fixes #652 switch to generator approach when doing file annotation to prevent huge memory consumption when executed on large files. Thanks to ALexey Larikov for patch....
r3044 Returns a generator of four element tuples with
lineno, sha, changeset lazy loader and line
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
TODO: This function now uses os underlying 'git' command which is
generally not good. Should be replaced with algorithm iterating
commits.
"""
cmd = 'blame -l --root -r %s -- "%s"' % (self.id, path)
# -l ==> outputs long shas (and we need all 40 characters)
# --root ==> doesn't put '^' character for bounderies
# -r sha ==> blames for the given revision
so, se = self.repository.run_git_command(cmd)
fixed git annotate
r2448
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 for i, blame_line in enumerate(so.split('\n')[:-1]):
ln_no = i + 1
fixes #652 switch to generator approach when doing file annotation to prevent huge memory consumption when executed on large files. Thanks to ALexey Larikov for patch....
r3044 sha, line = re.split(r' ', blame_line, 1)
yield (ln_no, sha, lambda: self.repository.get_changeset(sha), line)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
def fill_archive(self, stream=None, kind='tgz', prefix=None,
subrepos=False):
"""
Fills up given stream.
:param stream: file like object.
:param kind: one of following: ``zip``, ``tgz`` or ``tbz2``.
Default: ``tgz``.
:param prefix: name of root directory in archive.
Default is repository name and changeset's raw_id joined with dash
(``repo-tip.<KIND>``).
:param subrepos: include subrepos in this archive.
:raise ImproperArchiveTypeError: If given kind is wrong.
:raise VcsError: If given stream is None
"""
allowed_kinds = settings.ARCHIVE_SPECS.keys()
if kind not in allowed_kinds:
raise ImproperArchiveTypeError('Archive kind not supported use one'
'of %s', allowed_kinds)
if prefix is None:
prefix = '%s-%s' % (self.repository.name, self.short_id)
elif prefix.startswith('/'):
raise VCSError("Prefix cannot start with leading slash")
elif prefix.strip() == '':
raise VCSError("Prefix cannot be empty")
if kind == 'zip':
frmt = 'zip'
else:
frmt = 'tar'
git executable is now configurable via .ini files
r3376 _git_path = rhodecode.CONFIG.get('git_path', 'git')
whitespace cleanup
r3394 cmd = '%s archive --format=%s --prefix=%s/ %s' % (_git_path,
git executable is now configurable via .ini files
r3376 frmt, prefix, self.raw_id)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 if kind == 'tgz':
cmd += ' | gzip -9'
elif kind == 'tbz2':
cmd += ' | bzip2 -9'
if stream is None:
raise VCSError('You need to pass in a valid stream for filling'
' with archival data')
popen = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True,
cwd=self.repository.path)
buffer_size = 1024 * 8
chunk = popen.stdout.read(buffer_size)
while chunk:
stream.write(chunk)
chunk = popen.stdout.read(buffer_size)
# Make sure all descriptors would be read
popen.communicate()
def get_nodes(self, path):
if self._get_kind(path) != NodeKind.DIR:
Mads Kiilerich
avoid %r markup of unicode strings in user facing messages...
r3575 raise ChangesetError("Directory does not exist for revision %s at "
" '%s'" % (self.revision, path))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 path = self._fix_path(path)
id = self._get_id_for_path(path)
tree = self.repository._repo[id]
dirnodes = []
filenodes = []
Implements subrepos view inside filebrowser...
r2232 als = self.repository.alias
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 for name, stat, id in tree.iteritems():
Implements subrepos view inside filebrowser...
r2232 if objects.S_ISGITLINK(stat):
dirnodes.append(SubModuleNode(name, url=None, changeset=id,
alias=als))
continue
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 obj = self.repository._repo.get_object(id)
if path != '':
obj_path = '/'.join((path, name))
else:
obj_path = name
if obj_path not in self._stat_modes:
self._stat_modes[obj_path] = stat
if isinstance(obj, objects.Tree):
dirnodes.append(DirNode(obj_path, changeset=self))
elif isinstance(obj, objects.Blob):
filenodes.append(FileNode(obj_path, changeset=self, mode=stat))
else:
raise ChangesetError("Requested object should be Tree "
"or Blob, is %r" % type(obj))
nodes = dirnodes + filenodes
for node in nodes:
if not node.path in self.nodes:
self.nodes[node.path] = node
nodes.sort()
return nodes
def get_node(self, path):
if isinstance(path, unicode):
path = path.encode('utf-8')
path = self._fix_path(path)
if not path in self.nodes:
try:
fixed issues with gitsubmodule diffs
r2233 id_ = self._get_id_for_path(path)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 except ChangesetError:
raise NodeDoesNotExistError("Cannot find one of parents' "
"directories for a given path: %s" % path)
fixed issues with gitsubmodule diffs
r2233
_GL = lambda m: m and objects.S_ISGITLINK(m)
if _GL(self._stat_modes.get(path)):
Fixed lookup by Tag sha in git backend
r2536 node = SubModuleNode(path, url=None, changeset=id_,
alias=self.repository.alias)
fixed issues with gitsubmodule diffs
r2233 else:
obj = self.repository._repo.get_object(id_)
When using tags in git use the link to Commit instead of messing with Tag object
r2537 if isinstance(obj, objects.Tree):
fixed issues with gitsubmodule diffs
r2233 if path == '':
node = RootNode(changeset=self)
else:
node = DirNode(path, changeset=self)
node._tree = obj
elif isinstance(obj, objects.Blob):
node = FileNode(path, changeset=self)
node._blob = obj
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 else:
fixed issues with gitsubmodule diffs
r2233 raise NodeDoesNotExistError("There is no file nor directory "
Mads Kiilerich
avoid %r markup of unicode strings in user facing messages...
r3575 "at the given path '%s' at revision %s"
fixed issues with gitsubmodule diffs
r2233 % (path, self.short_id))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 # cache node
self.nodes[path] = node
return self.nodes[path]
@LazyProperty
def affected_files(self):
"""
Get's a fast accessible file changes for given changeset
"""
new dulwich based implementation of added/modified/removed...
r2762 a, m, d = self._changes_cache
return list(a.union(m).union(d))
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
@LazyProperty
def _diff_name_status(self):
output = []
for parent in self.parents:
re implemented affected_files function for git using dulwich...
r2761 cmd = 'diff --name-status %s %s --encoding=utf8' % (parent.raw_id,
self.raw_id)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 so, se = self.repository.run_git_command(cmd)
output.append(so.strip())
return '\n'.join(output)
new dulwich based implementation of added/modified/removed...
r2762 @LazyProperty
def _changes_cache(self):
added = set()
modified = set()
deleted = set()
_r = self.repository._repo
parents = self.parents
if not self.parents:
parents = [EmptyChangeset()]
for parent in parents:
if isinstance(parent, EmptyChangeset):
oid = None
else:
oid = _r[parent.raw_id].tree
changes = _r.object_store.tree_changes(oid, _r[self.raw_id].tree)
for (oldpath, newpath), (_, _), (_, _) in changes:
if newpath and oldpath:
modified.add(newpath)
elif newpath and not oldpath:
added.add(newpath)
elif not newpath and oldpath:
deleted.add(oldpath)
return added, modified, deleted
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 def _get_paths_for_status(self, status):
"""
Returns sorted list of paths for given ``status``.
:param status: one of: *added*, *modified* or *deleted*
"""
new dulwich based implementation of added/modified/removed...
r2762 a, m, d = self._changes_cache
return sorted({
'added': list(a),
'modified': list(m),
'deleted': list(d)}[status]
)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
@LazyProperty
def added(self):
"""
Returns list of added ``FileNode`` objects.
"""
if not self.parents:
return list(self._get_file_nodes())
fixes #630 git statistics do too much work making them slow....
r2968 return AddedFileNodesGenerator([n for n in
self._get_paths_for_status('added')], self)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
@LazyProperty
def changed(self):
"""
Returns list of modified ``FileNode`` objects.
"""
if not self.parents:
return []
fixes #630 git statistics do too much work making them slow....
r2968 return ChangedFileNodesGenerator([n for n in
self._get_paths_for_status('modified')], self)
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007
@LazyProperty
def removed(self):
"""
Returns list of removed ``FileNode`` objects.
"""
if not self.parents:
return []
fixes #630 git statistics do too much work making them slow....
r2968 return RemovedFileNodesGenerator([n for n in
self._get_paths_for_status('deleted')], self)