##// END OF EJS Templates
fix(2fa): fixed various typos
fix(2fa): fixed various typos

File last commit:

r5096:a0018795 default
r5377:1ab522cf default
Show More
commit.py
403 lines | 12.7 KiB | text/x-python | PythonLexer
copyrights: updated for 2023
r5088 # Copyright (C) 2014-2023 RhodeCode GmbH
project: added all source files and assets
r1 #
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
"""
HG commit module
"""
import os
from zope.cachedescriptors.property import Lazy as LazyProperty
dan
vcs: make commit datetimes utc
r154 from rhodecode.lib.datelib import utcdate_fromtimestamp
vcs-lib: bulk of changes for python3 support
r5074 from rhodecode.lib.str_utils import safe_bytes, safe_str
project: added all source files and assets
r1 from rhodecode.lib.vcs import path as vcspath
from rhodecode.lib.vcs.backends import base
from rhodecode.lib.vcs.exceptions import CommitError
from rhodecode.lib.vcs.nodes import (
AddedFileNodesGenerator, ChangedFileNodesGenerator, DirNode, FileNode,
NodeKind, RemovedFileNodesGenerator, RootNode, SubModuleNode,
vcs-lib: bulk of changes for python3 support
r5074 LargeFileNode)
project: added all source files and assets
r1 from rhodecode.lib.vcs.utils.paths import get_dirs_for_path
class MercurialCommit(base.BaseCommit):
"""
Represents state of the repository at the single commit.
"""
_filter_pre_load = [
# git specific property not supported here
"_commit",
]
def __init__(self, repository, raw_id, idx, pre_load=None):
raw_id = safe_str(raw_id)
self.repository = repository
self._remote = repository._remote
self.raw_id = raw_id
mercurial: compatability changes for mercurial 4.6.0 release
r2735 self.idx = idx
project: added all source files and assets
r1
self._set_bulk_properties(pre_load)
# caches
self.nodes = {}
vcs-lib: bulk of changes for python3 support
r5074 self._stat_modes = {} # stat info for paths
project: added all source files and assets
r1
def _set_bulk_properties(self, pre_load):
if not pre_load:
return
pre_load = [entry for entry in pre_load
if entry not in self._filter_pre_load]
if not pre_load:
return
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 result = self._remote.bulk_request(self.raw_id, pre_load)
python3: fixed various code issues...
r4973
project: added all source files and assets
r1 for attr, value in result.items():
if attr in ["author", "branch", "message"]:
vcs-lib: bulk of changes for python3 support
r5074 value = safe_str(value)
project: added all source files and assets
r1 elif attr == "affected_files":
vcs-lib: bulk of changes for python3 support
r5074 value = list(map(safe_str, value))
project: added all source files and assets
r1 elif attr == "date":
dan
vcs: make commit datetimes utc
r154 value = utcdate_fromtimestamp(*value)
project: added all source files and assets
r1 elif attr in ["children", "parents"]:
value = self._make_commits(value)
changelog: fix and optimize loading of chunks for file history....
r2130 elif attr in ["phase"]:
value = self._get_phase_text(value)
project: added all source files and assets
r1 self.__dict__[attr] = value
@LazyProperty
def tags(self):
python3: removed usage of .iteritems()
r4932 tags = [name for name, commit_id in self.repository.tags.items()
project: added all source files and assets
r1 if commit_id == self.raw_id]
return tags
@LazyProperty
def branch(self):
vcs-lib: bulk of changes for python3 support
r5074 return safe_str(self._remote.ctx_branch(self.raw_id))
project: added all source files and assets
r1
@LazyProperty
def bookmarks(self):
bookmarks = [
python3: removed usage of .iteritems()
r4932 name for name, commit_id in self.repository.bookmarks.items()
project: added all source files and assets
r1 if commit_id == self.raw_id]
return bookmarks
@LazyProperty
def message(self):
vcs-lib: bulk of changes for python3 support
r5074 return safe_str(self._remote.ctx_description(self.raw_id))
project: added all source files and assets
r1
@LazyProperty
def committer(self):
vcs-lib: bulk of changes for python3 support
r5074 return safe_str(self.author)
project: added all source files and assets
r1
@LazyProperty
def author(self):
vcs-lib: bulk of changes for python3 support
r5074 return safe_str(self._remote.ctx_user(self.raw_id))
project: added all source files and assets
r1
@LazyProperty
def date(self):
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 return utcdate_fromtimestamp(*self._remote.ctx_date(self.raw_id))
project: added all source files and assets
r1
@LazyProperty
def status(self):
"""
Returns modified, added, removed, deleted files for current commit
"""
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 return self._remote.ctx_status(self.raw_id)
project: added all source files and assets
r1
@LazyProperty
def _file_paths(self):
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 return self._remote.ctx_list(self.raw_id)
project: added all source files and assets
r1
@LazyProperty
def _dir_paths(self):
vcs-lib: bulk of changes for python3 support
r5074 dir_paths = ['']
dir_paths.extend(list(set(get_dirs_for_path(*self._file_paths))))
return dir_paths
project: added all source files and assets
r1
@LazyProperty
def _paths(self):
return self._dir_paths + self._file_paths
@LazyProperty
def id(self):
if self.last:
vcs-lib: bulk of changes for python3 support
r5074 return 'tip'
project: added all source files and assets
r1 return self.short_id
@LazyProperty
def short_id(self):
return self.raw_id[:12]
mercurial: use commit_ids for parents/children instead of revisions which could change when evolve is used.
r3935 def _make_commits(self, commit_ids, pre_load=None):
return [self.repository.get_commit(commit_id=commit_id, pre_load=pre_load)
for commit_id in commit_ids]
project: added all source files and assets
r1
@LazyProperty
def parents(self):
"""
Returns list of parent commits.
"""
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 parents = self._remote.ctx_parents(self.raw_id)
project: added all source files and assets
r1 return self._make_commits(parents)
changelog: fix and optimize loading of chunks for file history....
r2130 def _get_phase_text(self, phase_id):
return {
0: 'public',
1: 'draft',
2: 'secret',
}.get(phase_id) or ''
project: added all source files and assets
r1 @LazyProperty
mercurial: show phases status in changelog....
r1674 def phase(self):
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 phase_id = self._remote.ctx_phase(self.raw_id)
changelog: fix and optimize loading of chunks for file history....
r2130 phase_text = self._get_phase_text(phase_id)
mercurial: show phases status in changelog....
r1674
vcs-lib: bulk of changes for python3 support
r5074 return safe_str(phase_text)
mercurial: show phases status in changelog....
r1674
@LazyProperty
mercurial-evolve: enable evolve setting on repositories.
r1738 def obsolete(self):
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 obsolete = self._remote.ctx_obsolete(self.raw_id)
mercurial-evolve: enable evolve setting on repositories.
r1738 return obsolete
@LazyProperty
def hidden(self):
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 hidden = self._remote.ctx_hidden(self.raw_id)
mercurial-evolve: enable evolve setting on repositories.
r1738 return hidden
@LazyProperty
project: added all source files and assets
r1 def children(self):
"""
Returns list of child commits.
"""
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 children = self._remote.ctx_children(self.raw_id)
project: added all source files and assets
r1 return self._make_commits(children)
def _get_kind(self, path):
path = self._fix_path(path)
if path in self._file_paths:
return NodeKind.FILE
elif path in self._dir_paths:
return NodeKind.DIR
else:
vcs-lib: bulk of changes for python3 support
r5074 raise CommitError(f"Node does not exist at the given path '{path}'")
project: added all source files and assets
r1
vcs-lib: bulk of changes for python3 support
r5074 def _assert_is_path(self, path) -> str:
project: added all source files and assets
r1 path = self._fix_path(path)
if self._get_kind(path) != NodeKind.FILE:
vcs-lib: bulk of changes for python3 support
r5074 raise CommitError(f"File does not exist for commit {self.raw_id} at '{path}'")
project: added all source files and assets
r1 return path
vcs-lib: bulk of changes for python3 support
r5074 def get_file_mode(self, path: bytes):
project: added all source files and assets
r1 """
Returns stat mode of the file at the given ``path``.
"""
vcs-lib: bulk of changes for python3 support
r5074 path = self._assert_is_path(path)
if path not in self._stat_modes:
self._stat_modes[path] = self._remote.fctx_flags(self.raw_id, path)
if 'x' in self._stat_modes[path]:
project: added all source files and assets
r1 return base.FILEMODE_EXECUTABLE
vcs-lib: bulk of changes for python3 support
r5074 return base.FILEMODE_DEFAULT
project: added all source files and assets
r1
def is_link(self, path):
vcs-lib: bulk of changes for python3 support
r5074 path = self._assert_is_path(path)
if path not in self._stat_modes:
self._stat_modes[path] = self._remote.fctx_flags(self.raw_id, path)
return 'l' in self._stat_modes[path]
project: added all source files and assets
r1
dan
vcsserver: made binary content check be calculated on vcsserver...
r3896 def is_node_binary(self, path):
vcs-lib: bulk of changes for python3 support
r5074 path = self._assert_is_path(path)
dan
vcsserver: made binary content check be calculated on vcsserver...
r3896 return self._remote.is_binary(self.raw_id, path)
vcs-lib: bulk of changes for python3 support
r5074 def node_md5_hash(self, path):
path = self._assert_is_path(path)
return self._remote.md5_hash(self.raw_id, path)
project: added all source files and assets
r1 def get_file_content(self, path):
"""
Returns content of the file at given ``path``.
"""
vcs-lib: bulk of changes for python3 support
r5074 path = self._assert_is_path(path)
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 return self._remote.fctx_node_data(self.raw_id, path)
project: added all source files and assets
r1
dan
file-nodes: added streaming remote attributes for vcsserver....
r3895 def get_file_content_streamed(self, path):
vcs-lib: bulk of changes for python3 support
r5074 path = self._assert_is_path(path)
dan
file-nodes: added streaming remote attributes for vcsserver....
r3895 stream_method = getattr(self._remote, 'stream:fctx_node_data')
return stream_method(self.raw_id, path)
project: added all source files and assets
r1 def get_file_size(self, path):
"""
Returns size of the file at given ``path``.
"""
vcs-lib: bulk of changes for python3 support
r5074 path = self._assert_is_path(path)
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 return self._remote.fctx_size(self.raw_id, path)
project: added all source files and assets
r1
vcs: rename get_file_history to get_path_history as it better reflects what it does.
r3275 def get_path_history(self, path, limit=None, pre_load=None):
project: added all source files and assets
r1 """
Returns history of file as reversed list of `MercurialCommit` objects
for which file at given ``path`` has been modified.
"""
vcs-lib: bulk of changes for python3 support
r5074 path = self._assert_is_path(path)
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 hist = self._remote.node_history(self.raw_id, path, limit)
project: added all source files and assets
r1 return [
self.repository.get_commit(commit_id=commit_id, pre_load=pre_load)
for commit_id in hist]
def get_file_annotate(self, path, pre_load=None):
"""
Returns a generator of four element tuples with
lineno, commit_id, commit lazy loader and line
"""
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 result = self._remote.fctx_annotate(self.raw_id, path)
project: added all source files and assets
r1
for ln_no, commit_id, content in result:
yield (
ln_no, commit_id,
git: replaced some raw subprocess commands with dedicated GIT vcsserver commands.
r3862 lambda: self.repository.get_commit(commit_id=commit_id, pre_load=pre_load),
project: added all source files and assets
r1 content)
vcs-lib: bulk of changes for python3 support
r5074 def get_nodes(self, path, pre_load=None):
project: added all source files and assets
r1 """
Returns combined ``DirNode`` and ``FileNode`` objects list representing
state of commit at the given ``path``. If node at the given ``path``
is not instance of ``DirNode``, CommitError would be raised.
"""
if self._get_kind(path) != NodeKind.DIR:
raise CommitError(
modernize: python3 updates
r5096 f"Directory does not exist for idx {self.raw_id} at '{path}'")
project: added all source files and assets
r1 path = self._fix_path(path)
filenodes = [
vcs-lib: bulk of changes for python3 support
r5074 FileNode(safe_bytes(f), commit=self, pre_load=pre_load) for f in self._file_paths
project: added all source files and assets
r1 if os.path.dirname(f) == path]
# TODO: johbo: Check if this can be done in a more obvious way
dirs = path == '' and '' or [
d for d in self._dir_paths
if d and vcspath.dirname(d) == path]
dirnodes = [
vcs-lib: bulk of changes for python3 support
r5074 DirNode(safe_bytes(d), commit=self) for d in dirs
project: added all source files and assets
r1 if os.path.dirname(d) == path]
alias = self.repository.alias
python3: removed usage of .iteritems()
r4932 for k, vals in self._submodules.items():
mercurial-submodules: only show submodule in the path that it belongs too....
r3471 if vcspath.dirname(k) == path:
loc = vals[0]
commit = vals[1]
dirnodes.append(SubModuleNode(k, url=loc, commit=commit, alias=alias))
git: adjusted code for new libgit2 backend...
r3842
project: added all source files and assets
r1 nodes = dirnodes + filenodes
for node in nodes:
git: adjusted code for new libgit2 backend...
r3842 if node.path not in self.nodes:
self.nodes[node.path] = node
project: added all source files and assets
r1 nodes.sort()
return nodes
vcs: added possibility to pre-load attributes for FileNodes.
r1355 def get_node(self, path, pre_load=None):
project: added all source files and assets
r1 """
Returns `Node` object from the given `path`. If there is no node at
the given `path`, `NodeDoesNotExistError` would be raised.
"""
path = self._fix_path(path)
if path not in self.nodes:
if path in self._file_paths:
vcs-lib: bulk of changes for python3 support
r5074 node = FileNode(safe_bytes(path), commit=self, pre_load=pre_load)
project: added all source files and assets
r1 elif path in self._dir_paths:
if path == '':
node = RootNode(commit=self)
else:
vcs-lib: bulk of changes for python3 support
r5074 node = DirNode(safe_bytes(path), commit=self)
project: added all source files and assets
r1 else:
raise self.no_node_at_path(path)
# cache node
self.nodes[path] = node
return self.nodes[path]
def get_largefile_node(self, path):
dan
files: ensure we ask hg vcsserver check for largefiles for path and commit, else we cache path that might become a LF node later on
r3899 pointer_spec = self._remote.is_large_file(self.raw_id, path)
files: only check for git_lfs/hg_largefiles if they are enabled....
r3894 if pointer_spec:
project: added all source files and assets
r1 # content of that file regular FileNode is the hash of largefile
file_id = self.get_file_content(path).strip()
largefiles: enabled download of largefiles for git and mercurial from web interface....
r1577
if self._remote.in_largefiles_store(file_id):
lf_path = self._remote.store_path(file_id)
vcs-lib: bulk of changes for python3 support
r5074 return LargeFileNode(safe_bytes(lf_path), commit=self, org_path=path)
project: added all source files and assets
r1 elif self._remote.in_user_cache(file_id):
largefiles: enabled download of largefiles for git and mercurial from web interface....
r1577 lf_path = self._remote.store_path(file_id)
project: added all source files and assets
r1 self._remote.link(file_id, path)
vcs-lib: bulk of changes for python3 support
r5074 return LargeFileNode(safe_bytes(lf_path), commit=self, org_path=path)
project: added all source files and assets
r1
@LazyProperty
def _submodules(self):
"""
Returns a dictionary with submodule information from substate file
of hg repository.
"""
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 return self._remote.ctx_substate(self.raw_id)
project: added all source files and assets
r1
@LazyProperty
def affected_files(self):
"""
Gets a fast accessible file changes for given commit
"""
mercurial: use hash as vcsserver parameters instead of ints which can change even on a server side when a strip is performed.
r3859 return self._remote.ctx_files(self.raw_id)
project: added all source files and assets
r1
@property
def added(self):
"""
Returns list of added ``FileNode`` objects.
"""
api: exposed modified added/modified/deleted functions of commit to return only paths....
r4242 return AddedFileNodesGenerator(self.added_paths, self)
@LazyProperty
def added_paths(self):
return [n for n in self.status[1]]
project: added all source files and assets
r1
@property
def changed(self):
"""
Returns list of modified ``FileNode`` objects.
"""
api: exposed modified added/modified/deleted functions of commit to return only paths....
r4242 return ChangedFileNodesGenerator(self.changed_paths, self)
@LazyProperty
def changed_paths(self):
return [n for n in self.status[0]]
project: added all source files and assets
r1
@property
def removed(self):
"""
Returns list of removed ``FileNode`` objects.
"""
api: exposed modified added/modified/deleted functions of commit to return only paths....
r4242 return RemovedFileNodesGenerator(self.removed_paths, self)
@LazyProperty
def removed_paths(self):
return [n for n in self.status[2]]