##// END OF EJS Templates
Implemented issue #387 side-by-side diffs view
Implemented issue #387 side-by-side diffs view

File last commit:

r4012:55dbc440 default
r4043:a1bc4af2 default
Show More
utils.py
821 lines | 27.6 KiB | text/x-python | PythonLexer
fidex corrent variables passed to dnconfig,...
r783 # -*- coding: utf-8 -*-
"""
added dbmigrate package, added model changes...
r833 rhodecode.lib.utils
~~~~~~~~~~~~~~~~~~~
fidex corrent variables passed to dnconfig,...
r783
Utilities library for RhodeCode
source code cleanup: remove trailing white space, normalize file endings
r1203
fidex corrent variables passed to dnconfig,...
r783 :created_on: Apr 18, 2010
:author: marcink
2012 copyrights
r1824 :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
fidex corrent variables passed to dnconfig,...
r783 :license: GPLv3, see COPYING for more details.
"""
fixed license issue #149
r1206 # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
source code cleanup: remove trailing white space, normalize file endings
r1203 #
renamed project to rhodecode
r547 # 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.
source code cleanup: remove trailing white space, normalize file endings
r1203 #
renamed project to rhodecode
r547 # You should have received a copy of the GNU General Public License
fixed license issue #149
r1206 # along with this program. If not, see <http://www.gnu.org/licenses/>.
fidex corrent variables passed to dnconfig,...
r783
import os
fixed issues with removed repos was accidentally added as groups, after...
r2069 import re
fidex corrent variables passed to dnconfig,...
r783 import logging
import datetime
import traceback
Code refactor number 2
r1022 import paste
import beaker
Notification fixes...
r1717 import tarfile
import shutil
fixed issue #671 commenting on pull requests sometimes used old JSON encoder and broke. This changeset replaces it's with RhodeCode json encoder to ensure all data is properly serializable
r3061 import decorator
import warnings
Notification fixes...
r1717 from os.path import abspath
fixes issue #197 Relative paths for pidlocks
r1354 from os.path import dirname as dn, join as jn
Code refactor number 2
r1022
from paste.script.command import Command, BadCommand
Move changes for git implementation
r633
Code refactor number 2
r1022 from webhelpers.text import collapse, remove_formatting, strip_tags
complete rewrite of paster commands,...
r785
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs import get_backend
from rhodecode.lib.vcs.backends.base import BaseChangeset
from rhodecode.lib.vcs.utils.lazy import LazyProperty
Moved all Mercurial imports into hgcompat from vcs
r3941 from rhodecode.lib.vcs.utils.hgcompat import ui, config
Added VCS into rhodecode core for faster and easier deployments of new versions
r2007 from rhodecode.lib.vcs.utils.helpers import get_scm
from rhodecode.lib.vcs.exceptions import VCSError
fidex corrent variables passed to dnconfig,...
r783
moved caching query to libs
r1669 from rhodecode.lib.caching_query import FromCache
Hacking for git support,and new faster repo scan
r631 from rhodecode.model import meta
Notification fixes...
r1717 from rhodecode.model.db import Repository, User, RhodeCodeUi, \
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 UserLog, RepoGroup, RhodeCodeSetting, CacheInvalidation, UserGroup
another major refactoring with session management
r1734 from rhodecode.model.meta import Session
#227 Initial version of repository groups permissions system...
r1982 from rhodecode.model.repos_group import ReposGroupModel
Fixed bug with log_delete hook didn't properly store...
r4012 from rhodecode.lib.utils2 import safe_str, safe_unicode, get_current_rhodecode_user
utils/conf...
r2109 from rhodecode.lib.vcs.utils.fakemod import create_module
New default permissions definition for user group create
r3734 from rhodecode.model.users_group import UserGroupModel
project refactoring, cleaned up lib.utils from rarly used functions, and place them...
r756
renamed project to rhodecode
r547 log = logging.getLogger(__name__)
fixed issues with removed repos was accidentally added as groups, after...
r2069 REMOVED_REPO_PAT = re.compile(r'rm__\d{8}_\d{6}_\d{6}__.*')
renamed project to rhodecode
r547
User usermodel instead of db model to manage accounts...
r1634 def recursive_replace(str_, replace=' '):
utils/conf...
r2109 """
Recursive replace of given sign to just one instance
source code cleanup: remove trailing white space, normalize file endings
r1203
User usermodel instead of db model to manage accounts...
r1634 :param str_: given string
Code refactor number 2
r1022 :param replace: char to find and replace multiple instances
source code cleanup: remove trailing white space, normalize file endings
r1203
Code refactor number 2
r1022 Examples::
>>> recursive_replace("Mighty---Mighty-Bo--sstones",'-')
'Mighty-Mighty-Bo-sstones'
"""
User usermodel instead of db model to manage accounts...
r1634 if str_.find(replace * 2) == -1:
return str_
Code refactor number 2
r1022 else:
User usermodel instead of db model to manage accounts...
r1634 str_ = str_.replace(replace * 2, replace)
return recursive_replace(str_, replace)
Code refactor number 2
r1022
files: fixes error when passing a diff without parameters and caused server crash...
r1224
Code refactor number 2
r1022 def repo_name_slug(value):
utils/conf...
r2109 """
Return slug of name of repository
Code refactor number 2
r1022 This function is called on each creation/modification
of repository to prevent bad names in repo
"""
slug = remove_formatting(value)
slug = strip_tags(slug)
Filter more special chars in validation of repo name
r2786 for c in """`?=[]\;'"<>,/~!@#$%^&*()+{}|: """:
Code refactor number 2
r1022 slug = slug.replace(c, '-')
slug = recursive_replace(slug, '-')
slug = collapse(slug, '-')
return slug
files: fixes error when passing a diff without parameters and caused server crash...
r1224
New default permissions definition for user group create
r3734 #==============================================================================
# PERM DECORATOR HELPERS FOR EXTRACTING NAMES FOR PERM CHECKS
#==============================================================================
fixed @repo into :repo for docs...
r604 def get_repo_slug(request):
fixed issue #370
r2055 _repo = request.environ['pylons.routes_dict'].get('repo_name')
if _repo:
_repo = _repo.rstrip('/')
return _repo
renamed project to rhodecode
r547
files: fixes error when passing a diff without parameters and caused server crash...
r1224
#227 Initial version of repository groups permissions system...
r1982 def get_repos_group_slug(request):
fixed issue #370
r2055 _group = request.environ['pylons.routes_dict'].get('group_name')
if _group:
_group = _group.rstrip('/')
return _group
#227 Initial version of repository groups permissions system...
r1982
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 def get_user_group_slug(request):
_group = request.environ['pylons.routes_dict'].get('id')
New default permissions definition for user group create
r3734 try:
_group = UserGroup.get(_group)
if _group:
_group = _group.users_group_name
except Exception:
log.debug(traceback.format_exc())
#catch all failures here
pass
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 return _group
#235 forking page repo group selection...
r1722 def action_logger(user, action, repo, ipaddr='', sa=None, commit=False):
renamed project to rhodecode
r547 """
added action loggers to following repositories,...
r735 Action logger for various actions made by users
source code cleanup: remove trailing white space, normalize file endings
r1203
added action loggers to following repositories,...
r735 :param user: user that made this action, can be a unique username string or
fixes #59, notifications for user registrations + some changes to mailer
r689 object containing user_id attribute
:param action: action to log, should be on of predefined unique actions for
easy translations
added action loggers to following repositories,...
r735 :param repo: string name of repository or object containing repo_id,
that action was made on
fixes #59, notifications for user registrations + some changes to mailer
r689 :param ipaddr: optional ip address from what the action was made
:param sa: optional sqlalchemy session
source code cleanup: remove trailing white space, normalize file endings
r1203
renamed project to rhodecode
r547 """
fixed @repo into :repo for docs...
r604
renamed project to rhodecode
r547 if not sa:
Added functional test create repo with a group...
r2529 sa = meta.Session()
action logger will try to get IP address automatically based...
r4001 # if we don't get explicit IP address try to get one from registered user
# in tmpl context var
Fixed bug with log_delete hook didn't properly store...
r4012 if not ipaddr:
ipaddr = getattr(get_current_rhodecode_user(), 'ip_addr', '')
fixed @repo into :repo for docs...
r604
renamed project to rhodecode
r547 try:
if hasattr(user, 'user_id'):
Implemented better support for Wildcard queries...
r3063 user_obj = User.get(user.user_id)
renamed project to rhodecode
r547 elif isinstance(user, basestring):
Refactoring of model get functions
r1530 user_obj = User.get_by_username(user)
renamed project to rhodecode
r547 else:
Andrew Shadura
Fix typos.
r2899 raise Exception('You have to provide a user object or a username')
fixed @repo into :repo for docs...
r604
added action loggers to following repositories,...
r735 if hasattr(repo, 'repo_id'):
User usermodel instead of db model to manage accounts...
r1634 repo_obj = Repository.get(repo.repo_id)
added action loggers to following repositories,...
r735 repo_name = repo_obj.repo_name
action logger will try to get IP address automatically based...
r4001 elif isinstance(repo, basestring):
fixes #59, notifications for user registrations + some changes to mailer
r689 repo_name = repo.lstrip('/')
User usermodel instead of db model to manage accounts...
r1634 repo_obj = Repository.get_by_repo_name(repo_name)
fixes #59, notifications for user registrations + some changes to mailer
r689 else:
Implemented #467 Journal logs comments on changesets...
r2375 repo_obj = None
repo_name = ''
fixes #59, notifications for user registrations + some changes to mailer
r689
renamed project to rhodecode
r547 user_log = UserLog()
#48 rewrite action loggers into hooks with all changesets that are inside a push
r654 user_log.user_id = user_obj.user_id
Implemented better support for Wildcard queries...
r3063 user_log.username = user_obj.username
fixed UnicodeWarning on pushing from sqlalchemy
r2249 user_log.action = safe_unicode(action)
project refactoring, cleaned up lib.utils from rarly used functions, and place them...
r756
Implemented #467 Journal logs comments on changesets...
r2375 user_log.repository = repo_obj
renamed project to rhodecode
r547 user_log.repository_name = repo_name
project refactoring, cleaned up lib.utils from rarly used functions, and place them...
r756
renamed project to rhodecode
r547 user_log.action_date = datetime.datetime.now()
user_log.user_ip = ipaddr
sa.add(user_log)
removed raise from log user action
r621
better logging
r3545 log.info('Logging action:%s on %s by user:%s ip:%s' %
(action, safe_unicode(repo), user_obj, ipaddr))
#235 forking page repo group selection...
r1722 if commit:
sa.commit()
Don't catch all exceptions
r3631 except Exception:
#48 rewrite action loggers into hooks with all changesets that are inside a push
r654 log.error(traceback.format_exc())
#235 forking page repo group selection...
r1722 raise
fixed @repo into :repo for docs...
r604
files: fixes error when passing a diff without parameters and caused server crash...
r1224
Mads Kiilerich
util: remove attempt of renaming get_filesystem_repos while remaining backward compatible
r3649 def get_filesystem_repos(path, recursive=False, skip_removed_repos=True):
Hacking for git support,and new faster repo scan
r631 """
source code cleanup: remove trailing white space, normalize file endings
r1203 Scans given path for repos and return (name,(type,path)) tuple
normalize path using os.sep
r1836 :param path: path to scan for repositories
source code cleanup: remove trailing white space, normalize file endings
r1203 :param recursive: recursive search and return names with subdirs in front
Hacking for git support,and new faster repo scan
r631 """
Move changes for git implementation
r633
fixes issue #331 RC mangles repository names if the a repository group contains the "full path" to the repositories
r1820 # remove ending slash for better results
normalize path using os.sep
r1836 path = path.rstrip(os.sep)
reposcann should skip directories with starting with '.'...
r3228 log.debug('now scanning in %s location recursive:%s...' % (path, recursive))
Hacking for git support,and new faster repo scan
r631
Added recursive scanning for repositories in directory
r877 def _get_repos(p):
accept that repos are read-only - very convenient for testing....
r3980 if not os.access(p, os.R_OK) or not os.access(p, os.X_OK):
use consistent string formatting
r3981 log.warn('ignoring repo path without access: %s' % (p,))
accept that repos are read-only - very convenient for testing....
r3980 return
strip os.sep instead of '/' in repo scanner
r1221 if not os.access(p, os.W_OK):
use consistent string formatting
r3981 log.warn('repo path without write access: %s' % (p,))
Added recursive scanning for repositories in directory
r877 for dirpath in os.listdir(p):
if os.path.isfile(os.path.join(p, dirpath)):
continue
cur_path = os.path.join(p, dirpath)
reposcann should skip directories with starting with '.'...
r3228
# skip removed repos
if skip_removed_repos and REMOVED_REPO_PAT.match(dirpath):
continue
#skip .<somethin> dirs
if dirpath.startswith('.'):
continue
Added recursive scanning for repositories in directory
r877 try:
scm_info = get_scm(cur_path)
fixes issue #331 RC mangles repository names if the a repository group contains the "full path" to the repositories
r1820 yield scm_info[1].split(path, 1)[-1].lstrip(os.sep), scm_info
Added recursive scanning for repositories in directory
r877 except VCSError:
if not recursive:
continue
#check if this dir containts other repos for recursive scan
rec_path = os.path.join(p, dirpath)
if os.path.isdir(rec_path):
for inner_scm in _get_repos(rec_path):
yield inner_scm
return _get_repos(path)
Hacking for git support,and new faster repo scan
r631
files: fixes error when passing a diff without parameters and caused server crash...
r1224
use os.environ as a fallback for getting special info from hooks, this will allow...
r2716 def is_valid_repo(repo_name, base_path, scm=None):
ldap auth rewrite, moved split authfunc into two functions,...
r761 """
use os.environ as a fallback for getting special info from hooks, this will allow...
r2716 Returns True if given path is a valid repository False otherwise.
White space cleanup
r2815 If scm param is given also compare if given scm is the same as expected
use os.environ as a fallback for getting special info from hooks, this will allow...
r2716 from scm parameter
fixed some unicode problems with waitress...
r2100
ldap auth rewrite, moved split authfunc into two functions,...
r761 :param repo_name:
:param base_path:
use os.environ as a fallback for getting special info from hooks, this will allow...
r2716 :param scm:
source code cleanup: remove trailing white space, normalize file endings
r1203
Fixed methods for checking if path in routes is a repo...
r1505 :return True: if given path is a valid repository
ldap auth rewrite, moved split authfunc into two functions,...
r761 """
fixed some unicode problems with waitress...
r2100 full_path = os.path.join(safe_str(base_path), safe_str(repo_name))
fixed action logger
r1528
renamed project to rhodecode
r547 try:
use os.environ as a fallback for getting special info from hooks, this will allow...
r2716 scm_ = get_scm(full_path)
if scm:
return scm_[0] == scm
Fixed methods for checking if path in routes is a repo...
r1505 return True
except VCSError:
renamed project to rhodecode
r547 return False
Fixed methods for checking if path in routes is a repo...
r1505
#227 Initial version of repository groups permissions system...
r1982
better detection of deleting groups with subgroups inside....
r3458 def is_valid_repos_group(repos_group_name, base_path, skip_path_check=False):
Fixed methods for checking if path in routes is a repo...
r1505 """
Mads Kiilerich
Fix 'repos group' - it is 'repository group'
r3653 Returns True if given path is a repository group False otherwise
auto white-space removal
r1818
Fixed methods for checking if path in routes is a repo...
r1505 :param repo_name:
:param base_path:
"""
fixed some unicode problems with waitress...
r2100 full_path = os.path.join(safe_str(base_path), safe_str(repos_group_name))
fixed action logger
r1528
Fixed methods for checking if path in routes is a repo...
r1505 # check if it's not a repo
changed check_... functions from their stupid names to something less retarded :)
r1507 if is_valid_repo(repos_group_name, base_path):
Fixed methods for checking if path in routes is a repo...
r1505 return False
fixed action logger
r1528
Fixed bug in repos group discovery, when inner folder of bare git repos were detected as a group
r2497 try:
# we need to check bare git repos at higher level
# since we might match branches/hooks/info/objects or possible
# other things inside bare git repo
get_scm(os.path.dirname(full_path))
return False
except VCSError:
pass
Fixed methods for checking if path in routes is a repo...
r1505 # check if it's a valid path
better detection of deleting groups with subgroups inside....
r3458 if skip_path_check or os.path.isdir(full_path):
renamed project to rhodecode
r547 return True
fixed action logger
r1528
Fixed methods for checking if path in routes is a repo...
r1505 return False
fixed action logger
r1528
#227 Initial version of repository groups permissions system...
r1982
Andrew Shadura
Fix typos.
r2899 def ask_ok(prompt, retries=4, complaint='Yes or no please!'):
renamed project to rhodecode
r547 while True:
ok = raw_input(prompt)
files: fixes error when passing a diff without parameters and caused server crash...
r1224 if ok in ('y', 'ye', 'yes'):
return True
if ok in ('n', 'no', 'nop', 'nope'):
return False
renamed project to rhodecode
r547 retries = retries - 1
files: fixes error when passing a diff without parameters and caused server crash...
r1224 if retries < 0:
raise IOError
renamed project to rhodecode
r547 print complaint
fixed @repo into :repo for docs...
r604
renamed project to rhodecode
r547 #propagated from mercurial documentation
ui_sections = ['alias', 'auth',
'decode/encode', 'defaults',
'diff', 'email',
'extensions', 'format',
'merge-patterns', 'merge-tools',
'hooks', 'http_proxy',
'smtp', 'patch',
'paths', 'profiling',
'server', 'trusted',
'ui', 'web', ]
fixed @repo into :repo for docs...
r604
files: fixes error when passing a diff without parameters and caused server crash...
r1224
Added optional flag to make_ui to not clean sqlalchemy Session....
r2717 def make_ui(read_from='file', path=None, checkpaths=True, clear_session=True):
utils/conf...
r2109 """
A function that will read python rc files or database
renamed project to rhodecode
r547 and make an mercurial ui object from read options
source code cleanup: remove trailing white space, normalize file endings
r1203
fixed @repo into :repo for docs...
r604 :param path: path to mercurial config file
:param checkpaths: check the path
:param read_from: read from 'file' or 'db'
renamed project to rhodecode
r547 """
baseui = ui.ui()
changed warning log message for reading hgrc files, it was confusing. It's just an indication of the fact...
r1991 # clean the baseui object
fixed nasty bug with ui()
r724 baseui._ocfg = config.config()
baseui._ucfg = config.config()
baseui._tcfg = config.config()
renamed project to rhodecode
r547 if read_from == 'file':
if not os.path.isfile(path):
Andrew Shadura
Fix typos.
r2899 log.debug('hgrc file is not present at %s, skipping...' % path)
renamed project to rhodecode
r547 return False
garden...
r1976 log.debug('reading hgrc from %s' % path)
renamed project to rhodecode
r547 cfg = config.config()
cfg.read(path)
for section in ui_sections:
for k, v in cfg.items(section):
Mads Kiilerich
logging: make 'settings ui from db' look more like Mercurial ini file notation
r3133 log.debug('settings ui from file: [%s] %s=%s' % (section, k, v))
fix for issue #602, enforce str when setting mercurial UI object. When this is used together with mercurial internal translation system...
r2989 baseui.setconfig(safe_str(section), safe_str(k), safe_str(v))
fixed nasty bug with ui()
r724
renamed project to rhodecode
r547 elif read_from == 'db':
Added functional test create repo with a group...
r2529 sa = meta.Session()
project refactoring, cleaned up lib.utils from rarly used functions, and place them...
r756 ret = sa.query(RhodeCodeUi)\
changed warning log message for reading hgrc files, it was confusing. It's just an indication of the fact...
r1991 .options(FromCache("sql_cache_short", "get_hg_ui_settings"))\
.all()
disabled dotencode format for mercurial 1.7 usage and hg <=1.6 compatibility...
r773
project refactoring, cleaned up lib.utils from rarly used functions, and place them...
r756 hg_ui = ret
renamed project to rhodecode
r547 for ui_ in hg_ui:
fixed the push_ssl issues after mercurial 2.3 upgrade....
r2689 if ui_.ui_active:
Mads Kiilerich
logging: make 'settings ui from db' look more like Mercurial ini file notation
r3133 log.debug('settings ui from db: [%s] %s=%s', ui_.ui_section,
disabled dotencode format for mercurial 1.7 usage and hg <=1.6 compatibility...
r773 ui_.ui_key, ui_.ui_value)
fix for issue #602, enforce str when setting mercurial UI object. When this is used together with mercurial internal translation system...
r2989 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
safe_str(ui_.ui_value))
fixed the push_ssl issues after mercurial 2.3 upgrade....
r2689 if ui_.ui_key == 'push_ssl':
# force set push_ssl requirement to False, rhodecode
# handles that
fix for issue #602, enforce str when setting mercurial UI object. When this is used together with mercurial internal translation system...
r2989 baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key),
False)
Added optional flag to make_ui to not clean sqlalchemy Session....
r2717 if clear_session:
meta.Session.remove()
renamed project to rhodecode
r547 return baseui
renamed hg_app to rhodecode
r548 def set_rhodecode_config(config):
Notification fixes...
r1717 """
Updates pylons config with new settings from database
source code cleanup: remove trailing white space, normalize file endings
r1203
project refactoring, cleaned up lib.utils from rarly used functions, and place them...
r756 :param config:
"""
refactoring of models names for repoGroup permissions
r1633 hgsettings = RhodeCodeSetting.get_app_settings()
fixed @repo into :repo for docs...
r604
renamed project to rhodecode
r547 for k, v in hgsettings.items():
config[k] = v
files: fixes error when passing a diff without parameters and caused server crash...
r1224
synced vcs with upstream...
r3797 def set_vcs_config(config):
"""
Patch VCS config with some RhodeCode specific stuff
:param config: rhodecode.CONFIG
"""
import rhodecode
from rhodecode.lib.vcs import conf
from rhodecode.lib.utils2 import aslist
conf.settings.BACKENDS = {
'hg': 'rhodecode.lib.vcs.backends.hg.MercurialRepository',
'git': 'rhodecode.lib.vcs.backends.git.GitRepository',
}
conf.settings.GIT_EXECUTABLE_PATH = config.get('git_path', 'git')
conf.settings.GIT_REV_FILTER = config.get('git_rev_filter', '--all').strip()
conf.settings.DEFAULT_ENCODINGS = aslist(config.get('default_encoding',
'utf8'), sep=',')
Resolve error occurring during recursive group creation in API create-repo function
r2120 def map_groups(path):
Notification fixes...
r1717 """
Resolve error occurring during recursive group creation in API create-repo function
r2120 Given a full path to a repository, create all nested groups that this
repo is inside. This function creates parent-child relationships between
groups and creates default perms for all new groups.
source code cleanup: remove trailing white space, normalize file endings
r1203
Resolve error occurring during recursive group creation in API create-repo function
r2120 :param paths: full path to repository
Extended repo2db mapper with group creation via directory structures...
r878 """
Added functional test create repo with a group...
r2529 sa = meta.Session()
Resolve error occurring during recursive group creation in API create-repo function
r2120 groups = path.split(Repository.url_sep())
Extended repo2db mapper with group creation via directory structures...
r878 parent = None
group = None
implements #226 repo groups available by path...
r1538
# last element is repo in nested groups structure
groups = groups[:-1]
#227 Initial version of repository groups permissions system...
r1982 rgm = ReposGroupModel(sa)
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 owner = User.get_first_admin()
implements #226 repo groups available by path...
r1538 for lvl, group_name in enumerate(groups):
group_name = '/'.join(groups[:lvl] + [group_name])
#227 Initial version of repository groups permissions system...
r1982 group = RepoGroup.get_by_group_name(group_name)
desc = '%s group' % group_name
fixed issues with removed repos was accidentally added as groups, after...
r2069 # skip folders that are now removed repos
if REMOVED_REPO_PAT.match(group_name):
break
Extended repo2db mapper with group creation via directory structures...
r878 if group is None:
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 log.debug('creating group level: %s group_name: %s'
% (lvl, group_name))
refactoring of models names for repoGroup permissions
r1633 group = RepoGroup(group_name, parent)
#227 Initial version of repository groups permissions system...
r1982 group.group_description = desc
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 group.user = owner
Extended repo2db mapper with group creation via directory structures...
r878 sa.add(group)
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 perm_obj = rgm._create_default_perms(group)
sa.add(perm_obj)
Resolve error occurring during recursive group creation in API create-repo function
r2120 sa.flush()
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714
Extended repo2db mapper with group creation via directory structures...
r878 parent = group
return group
files: fixes error when passing a diff without parameters and caused server crash...
r1224
Added option to re-install githooks to repo2db mapper, and catch exception on removal so it doesn't break...
r2619 def repo2db_mapper(initial_repo_list, remove_obsolete=False,
install_git_hook=False):
User usermodel instead of db model to manage accounts...
r1634 """
maps all repos given in initial_repo_list, non existing repositories
Extended repo2db mapper with group creation via directory structures...
r878 are created, if remove_obsolete is True it also check for db entries
that are not in initial_repo_list and removes them.
source code cleanup: remove trailing white space, normalize file endings
r1203
Extended repo2db mapper with group creation via directory structures...
r878 :param initial_repo_list: list of repositories found by scanning methods
:param remove_obsolete: check for obsolete entries in database
Added option to re-install githooks to repo2db mapper, and catch exception on removal so it doesn't break...
r2619 :param install_git_hook: if this is True, also check and install githook
for a repo if missing
renamed project to rhodecode
r547 """
User usermodel instead of db model to manage accounts...
r1634 from rhodecode.model.repo import RepoModel
Added option to re-install githooks to repo2db mapper, and catch exception on removal so it doesn't break...
r2619 from rhodecode.model.scm import ScmModel
Added functional test create repo with a group...
r2529 sa = meta.Session()
#50 on point cache invalidation changes....
r692 rm = RepoModel()
- Manage User’s Groups: create, delete, rename, add/remove users inside....
r3714 user = User.get_first_admin()
extended admin rescan to show what repositories was added and what removed...
r1039 added = []
notification to commit author + gardening
r1716
Default parameters are now also used for creating repos using API calls, and initial repo scanner...
r3115 ##creation defaults
defs = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
enable_statistics = defs.get('repo_enable_statistics')
enable_locking = defs.get('repo_enable_locking')
enable_downloads = defs.get('repo_enable_downloads')
private = defs.get('repo_private')
Hacking for git support,and new faster repo scan
r631 for name, repo in initial_repo_list.items():
Resolve error occurring during recursive group creation in API create-repo function
r2120 group = map_groups(name)
fixed python2.5 compat and repo mapper issue
r2620 db_repo = rm.get_by_repo_name(name)
Do cleanup on repo2db mapper...
r2622 # found repo that is on filesystem not in RhodeCode database
fixed python2.5 compat and repo mapper issue
r2620 if not db_repo:
Andrew Shadura
Fix typos.
r2899 log.info('repository %s not found, creating now' % name)
extended admin rescan to show what repositories was added and what removed...
r1039 added.append(name)
Added functional test create repo with a group...
r2529 desc = (repo.description
if repo.description != 'unknown'
else '%s repository' % name)
Default parameters are now also used for creating repos using API calls, and initial repo scanner...
r3115
Do cleanup on repo2db mapper...
r2622 new_repo = rm.create_repo(
Added functional test create repo with a group...
r2529 repo_name=name,
repo_type=repo.alias,
description=desc,
repos_group=getattr(group, 'group_id', None),
owner=user,
Default parameters are now also used for creating repos using API calls, and initial repo scanner...
r3115 just_db=True,
enable_locking=enable_locking,
enable_downloads=enable_downloads,
enable_statistics=enable_statistics,
private=private
Added functional test create repo with a group...
r2529 )
Do cleanup on repo2db mapper...
r2622 # we added that repo just now, and make sure it has githook
# installed
if new_repo.repo_type == 'git':
ScmModel().install_git_hook(new_repo.scm_instance)
Added full last changeset info to lightweight dashboard
r3147 new_repo.update_changeset_cache()
Added option to re-install githooks to repo2db mapper, and catch exception on removal so it doesn't break...
r2619 elif install_git_hook:
fixed python2.5 compat and repo mapper issue
r2620 if db_repo.repo_type == 'git':
ScmModel().install_git_hook(db_repo.scm_instance)
Cleaned the way cache keys are invalidated...
r3020
- refactoring to overcome poor usage of global pylons config...
r1723 sa.commit()
extended admin rescan to show what repositories was added and what removed...
r1039 removed = []
renamed project to rhodecode
r547 if remove_obsolete:
- #347 when running multiple RhodeCode instances, properly invalidates cache...
r2147 # remove from database those repositories that are not in the filesystem
renamed project to rhodecode
r547 for repo in sa.query(Repository).all():
if repo.repo_name not in initial_repo_list.keys():
Andrew Shadura
Fix typos.
r2899 log.debug("Removing non-existing repository found in db `%s`" %
- #347 when running multiple RhodeCode instances, properly invalidates cache...
r2147 repo.repo_name)
Added option to re-install githooks to repo2db mapper, and catch exception on removal so it doesn't break...
r2619 try:
repo rescann should detach forks of zombie repos,...
r3694 removed.append(repo.repo_name)
RepoModel(sa).delete(repo, forks='detach', fs_remove=False)
Added option to re-install githooks to repo2db mapper, and catch exception on removal so it doesn't break...
r2619 sa.commit()
Don't catch all exceptions
r3631 except Exception:
Added option to re-install githooks to repo2db mapper, and catch exception on removal so it doesn't break...
r2619 #don't hold further removals on error
log.error(traceback.format_exc())
we must rollback if repo2db mapper cleanup fails ! Session blows up, and that code still throws an error without it
r2635 sa.rollback()
extended admin rescan to show what repositories was added and what removed...
r1039 return added, removed
files: fixes error when passing a diff without parameters and caused server crash...
r1224
#227 Initial version of repository groups permissions system...
r1982
Notification fixes...
r1717 # set cache regions for beaker so celery can utilise it
complete rewrite of paster commands,...
r785 def add_cache(settings):
files: fixes error when passing a diff without parameters and caused server crash...
r1224 cache_settings = {'regions': None}
complete rewrite of paster commands,...
r785 for key in settings.keys():
for prefix in ['beaker.cache.', 'cache.']:
if key.startswith(prefix):
name = key.split(prefix)[1].strip()
cache_settings[name] = settings[key].strip()
if cache_settings['regions']:
for region in cache_settings['regions'].split(','):
region = region.strip()
region_settings = {}
for key, value in cache_settings.items():
if key.startswith(region):
region_settings[key.split('.')[1]] = value
region_settings['expire'] = int(region_settings.get('expire',
60))
region_settings.setdefault('lock_dir',
cache_settings.get('lock_dir'))
fixed add cache defaults missing data_dir
r1032 region_settings.setdefault('data_dir',
cache_settings.get('data_dir'))
complete rewrite of paster commands,...
r785 if 'type' not in region_settings:
region_settings['type'] = cache_settings.get('type',
'memory')
beaker.cache.cache_regions[region] = region_settings
files: fixes error when passing a diff without parameters and caused server crash...
r1224
utils/conf...
r2109 def load_rcextensions(root_path):
import rhodecode
from rhodecode.config import conf
path = os.path.join(root_path, 'rcextensions', '__init__.py')
if os.path.isfile(path):
rcext = create_module('rc', path)
EXT = rhodecode.EXTENSIONS = rcext
log.debug('Found rcextensions now loading %s...' % rcext)
# Additional mappings that are not present in the pygments lexers
conf.LANGUAGES_EXTENSIONS_MAP.update(getattr(EXT, 'EXTRA_MAPPINGS', {}))
#OVERRIDE OUR EXTENSIONS FROM RC-EXTENSIONS (if present)
simplified boolean expressions
r3888 if getattr(EXT, 'INDEX_EXTENSIONS', []):
utils/conf...
r2109 log.debug('settings custom INDEX_EXTENSIONS')
conf.INDEX_EXTENSIONS = getattr(EXT, 'INDEX_EXTENSIONS', [])
#ADDITIONAL MAPPINGS
log.debug('adding extra into INDEX_EXTENSIONS')
conf.INDEX_EXTENSIONS.extend(getattr(EXT, 'EXTRA_INDEX_EXTENSIONS', []))
Add option to define custom lexers for custom extensions for code highlight in rcextension module
r3375 # auto check if the module is not missing any data, set to default if is
# this will help autoupdate new feature of rcext module
from rhodecode.config import rcextensions
for k in dir(rcextensions):
if not k.startswith('_') and not hasattr(EXT, k):
setattr(EXT, k, getattr(rcextensions, k))
def get_custom_lexer(extension):
"""
returns a custom lexer if it's defined in rcextensions module, or None
if there's no custom lexer defined
"""
import rhodecode
from pygments import lexers
#check if we didn't define this extension as other lexer
if rhodecode.EXTENSIONS and extension in rhodecode.EXTENSIONS.EXTRA_LEXERS:
_lexer_name = rhodecode.EXTENSIONS.EXTRA_LEXERS[extension]
return lexers.get_lexer_by_name(_lexer_name)
utils/conf...
r2109
files: fixes error when passing a diff without parameters and caused server crash...
r1224 #==============================================================================
Code refactoring,models renames...
r629 # TEST FUNCTIONS AND CREATORS
files: fixes error when passing a diff without parameters and caused server crash...
r1224 #==============================================================================
Unicode fixes, added safe_str method for global str() operations +better test sandboxing
r1401 def create_test_index(repo_location, config, full_index):
"""
Makes default test index
auto white-space removal
r1818
Unicode fixes, added safe_str method for global str() operations +better test sandboxing
r1401 :param config: test config
fixed @repo into :repo for docs...
r604 :param full_index:
renamed project to rhodecode
r547 """
Unicode fixes, added safe_str method for global str() operations +better test sandboxing
r1401
renamed project to rhodecode
r547 from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
from rhodecode.lib.pidlock import DaemonLock, LockHeld
Unicode fixes, added safe_str method for global str() operations +better test sandboxing
r1401
repo_location = repo_location
fixed @repo into :repo for docs...
r604
Fixed whoosh index location bug
r1411 index_location = os.path.join(config['app_conf']['index_dir'])
Unicode fixes, added safe_str method for global str() operations +better test sandboxing
r1401 if not os.path.exists(index_location):
os.makedirs(index_location)
fixed @repo into :repo for docs...
r604
renamed project to rhodecode
r547 try:
fixes #258 RhodeCode 1.2 assumes egg folder is writable
r1540 l = DaemonLock(file_=jn(dn(index_location), 'make_index.lock'))
Tests rewrite for 1.2 added some globals configs to make tests easier....
r688 WhooshIndexingDaemon(index_location=index_location,
repo_location=repo_location)\
renamed project to rhodecode
r547 .run(full_index=full_index)
l.release()
except LockHeld:
fixed @repo into :repo for docs...
r604 pass
files: fixes error when passing a diff without parameters and caused server crash...
r1224
renamed project to rhodecode
r547 def create_test_env(repos_test_path, config):
Notification fixes...
r1717 """
Makes a fresh database and
renamed project to rhodecode
r547 install test repository into tmp dir
"""
from rhodecode.lib.db_manage import DbManage
Initial version of landing revisions ref #483...
r2459 from rhodecode.tests import HG_REPO, GIT_REPO, TESTS_TMP_PATH
fixed @repo into :repo for docs...
r604
test env update
r1416 # PART ONE create db
fidex corrent variables passed to dnconfig,...
r783 dbconf = config['sqlalchemy.db1.url']
garden...
r1976 log.debug('making test db %s' % dbconf)
fixed @repo into :repo for docs...
r604
Added new random directory for each test to be better sandboxed
r1397 # create test dir if it doesn't exist
if not os.path.isdir(repos_test_path):
log.debug('Creating testdir %s' % repos_test_path)
os.makedirs(repos_test_path)
fidex corrent variables passed to dnconfig,...
r783 dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=config['here'],
removed egg info, update files for distutils build...
r552 tests=True)
renamed project to rhodecode
r547 dbmanage.create_tables(override=True)
fixed test env creator
r1099 dbmanage.create_settings(dbmanage.config_prompt(repos_test_path))
renamed project to rhodecode
r547 dbmanage.create_default_user()
dbmanage.admin_prompt()
dbmanage.create_permissions()
dbmanage.populate_default_permissions()
Added functional test create repo with a group...
r2529 Session().commit()
test env update
r1416 # PART TWO make test repo
Tests rewrite for 1.2 added some globals configs to make tests easier....
r688 log.debug('making test vcs repositories')
cleanup before start testing suite of index and data cache dirs
r1396 idx_path = config['app_conf']['index_dir']
data_path = config['app_conf']['cache_dir']
#clean index and data
if idx_path and os.path.exists(idx_path):
log.debug('remove %s' % idx_path)
shutil.rmtree(idx_path)
if data_path and os.path.exists(data_path):
log.debug('remove %s' % data_path)
shutil.rmtree(data_path)
Initial version of landing revisions ref #483...
r2459 #CREATE DEFAULT TEST REPOS
renamed project to rhodecode
r547 cur_dir = dn(dn(abspath(__file__)))
moved top-level tests to rhodecode/tests/other....
r3824 tar = tarfile.open(jn(cur_dir, 'tests', 'fixtures', "vcs_test_hg.tar.gz"))
Tests rewrite for 1.2 added some globals configs to make tests easier....
r688 tar.extractall(jn(TESTS_TMP_PATH, HG_REPO))
renamed project to rhodecode
r547 tar.close()
upgrade-db command dummy
r684
Initial version of landing revisions ref #483...
r2459 cur_dir = dn(dn(abspath(__file__)))
moved top-level tests to rhodecode/tests/other....
r3824 tar = tarfile.open(jn(cur_dir, 'tests', 'fixtures', "vcs_test_git.tar.gz"))
Initial version of landing revisions ref #483...
r2459 tar.extractall(jn(TESTS_TMP_PATH, GIT_REPO))
tar.close()
Added vcs testsuite for better integration tests + added fetching...
r2451 #LOAD VCS test stuff
from rhodecode.tests.vcs import setup_package
setup_package()
files: fixes error when passing a diff without parameters and caused server crash...
r1224
complete rewrite of paster commands,...
r785 #==============================================================================
# PASTER COMMANDS
#==============================================================================
class BasePasterCommand(Command):
"""
Abstract Base Class for paster commands.
The celery commands are somewhat aggressive about loading
celery.conf, and since our module sets the `CELERY_LOADER`
environment variable to our loader, we have to bootstrap a bit and
make sure we've had a chance to load the pylons config off of the
command line, otherwise everything fails.
"""
min_args = 1
min_args_error = "Please provide a paster config file as an argument."
takes_config_file = 1
requires_config_file = True
fixed wrong migration schema...
r837 def notify_msg(self, msg, log=False):
"""Make a notification to user, additionally if logger is passed
it logs this action using given logger
source code cleanup: remove trailing white space, normalize file endings
r1203
fixed wrong migration schema...
r837 :param msg: message that will be printed to user
:param log: logging instance, to use to additionally log this message
source code cleanup: remove trailing white space, normalize file endings
r1203
fixed wrong migration schema...
r837 """
if log and isinstance(log, logging):
log(msg)
complete rewrite of paster commands,...
r785 def run(self, args):
"""
Overrides Command.run
source code cleanup: remove trailing white space, normalize file endings
r1203
complete rewrite of paster commands,...
r785 Checks for a config file argument and loads it.
"""
if len(args) < self.min_args:
raise BadCommand(
self.min_args_error % {'min_args': self.min_args,
'actual_args': len(args)})
# Decrement because we're going to lob off the first argument.
# @@ This is hacky
self.min_args -= 1
self.bootstrap_config(args[0])
self.update_parser()
return super(BasePasterCommand, self).run(args[1:])
def update_parser(self):
"""
Abstract method. Allows for the class's parser to be updated
before the superclass's `run` method is called. Necessary to
allow options/arguments to be passed through to the underlying
celery command.
"""
raise NotImplementedError("Abstract Method.")
def bootstrap_config(self, conf):
"""
Loads the pylons configuration.
"""
from pylons import config as pylonsconfig
Whoosh logging is now controlled by the .ini files logging setup
r2102 self.path_to_ini_file = os.path.realpath(conf)
conf = paste.deploy.appconfig('config:' + self.path_to_ini_file)
auto white-space removal
r1818 pylonsconfig.init_app(conf.global_conf, conf.local_conf)
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890
unified RhodeCode paster commands...
r3340 def _init_session(self):
"""
Inits SqlAlchemy Session
"""
logging.config.fileConfig(self.path_to_ini_file)
from pylons import config
from rhodecode.model import init_model
from rhodecode.lib.utils2 import engine_from_config
#get to remove repos !!
add_cache(config)
engine = engine_from_config(config, 'sqlalchemy.db1.')
init_model(engine)
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890
def check_git_version():
"""
Checks what version of git is installed in system, and issues a warning
Andrew Shadura
Fix typos.
r2899 if it's too old for RhodeCode to properly work.
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 """
git executable is now configurable via .ini files
r3376 from rhodecode import BACKENDS
from rhodecode.lib.vcs.backends.git.repository import GitRepository
synced vcs with upstream...
r3797 from rhodecode.lib.vcs.conf import settings
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 from distutils.version import StrictVersion
--version command should be safe, and bare no modifications...
r3397 stdout, stderr = GitRepository._run_git_command('--version', _bare=True,
_safe=True)
git executable is now configurable via .ini files
r3376
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 ver = (stdout.split(' ')[-1] or '').strip() or '0.0.0'
fixed check git version function, git sometimes uses 4 element version numbering which breaks the system that function
r2911 if len(ver.split('.')) > 3:
#StrictVersion needs to be only 3 element type
ver = '.'.join(ver.split('.')[:3])
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 try:
_ver = StrictVersion(ver)
Don't catch all exceptions
r3631 except Exception:
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 _ver = StrictVersion('0.0.0')
stderr = traceback.format_exc()
req_ver = '1.7.4'
to_old_git = False
fix strict version of git check if we have 1.7.4 it's ok !
r2997 if _ver < StrictVersion(req_ver):
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 to_old_git = True
if 'git' in BACKENDS:
synced vcs with upstream...
r3797 log.debug('GIT executable: "%s" version detected: %s'
% (settings.GIT_EXECUTABLE_PATH, stdout))
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 if stderr:
Mads Kiilerich
avoid %r markup of unicode strings in user facing messages...
r3575 log.warning('Unable to detect git version, org error was: %r' % stderr)
Add git version detection to warn users that Git used in system is to old. ref #588...
r2890 elif to_old_git:
Andrew Shadura
Fix typos.
r2899 log.warning('RhodeCode detected git version %s, which is too old '
'for the system to function properly. Make sure '
Andrew Shadura
Rephrase the message.
r2900 'its version is at least %s' % (ver, req_ver))
Andrew Shadura
Fix typos.
r2899 return _ver
fixed issue #671 commenting on pull requests sometimes used old JSON encoder and broke. This changeset replaces it's with RhodeCode json encoder to ensure all data is properly serializable
r3061
@decorator.decorator
def jsonify(func, *args, **kwargs):
"""Action decorator that formats output for JSON
Given a function that will return content, this decorator will turn
the result into JSON, with a content-type of 'application/json' and
output it.
"""
from pylons.decorators.util import get_pylons
always use json from compat module
r3705 from rhodecode.lib.compat import json
fixed issue #671 commenting on pull requests sometimes used old JSON encoder and broke. This changeset replaces it's with RhodeCode json encoder to ensure all data is properly serializable
r3061 pylons = get_pylons(args)
pylons.response.headers['Content-Type'] = 'application/json; charset=utf-8'
data = func(*args, **kwargs)
if isinstance(data, (list, tuple)):
msg = "JSON responses with Array envelopes are susceptible to " \
"cross-site data leak attacks, see " \
"http://wiki.pylonshq.com/display/pylonsfaq/Warnings"
warnings.warn(msg, Warning, 2)
log.warning(msg)
log.debug("Returning JSON wrapped action output")
white space cleanup
r3149 return json.dumps(data, encoding='utf-8')