##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2487:fcee5614 default
r2784:e8c62649 default
Show More
types.py
196 lines | 5.9 KiB | text/x-python | PythonLexer
gists: use colander schema to validate input data....
r523 # -*- coding: utf-8 -*-
release: update copyright year to 2018
r2487 # Copyright (C) 2016-2018 RhodeCode GmbH
gists: use colander schema to validate input data....
r523 #
# 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/
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 import re
gists: use colander schema to validate input data....
r523 import colander
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 from rhodecode.model.validation_schema import preparers
from rhodecode.model.db import User, UserGroup
class _RootLocation(object):
pass
RootLocation = _RootLocation()
def _normalize(seperator, path):
if not path:
return ''
elif path is colander.null:
return colander.null
parts = path.split(seperator)
gists: use colander schema to validate input data....
r523
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 def bad_parts(value):
if not value:
return False
if re.match(r'^[.]+$', value):
return False
return True
def slugify(value):
value = preparers.slugify_preparer(value)
value = re.sub(r'[.]{2,}', '.', value)
return value
clean_parts = [slugify(item) for item in parts if item]
path = filter(bad_parts, clean_parts)
return seperator.join(path)
class RepoNameType(colander.String):
SEPARATOR = '/'
def deserialize(self, node, cstruct):
result = super(RepoNameType, self).deserialize(node, cstruct)
if cstruct is colander.null:
return colander.null
return self._normalize(result)
def _normalize(self, path):
return _normalize(self.SEPARATOR, path)
dan
schemas: add user/usergroup schema type
r740
gists: use colander schema to validate input data....
r523
class GroupNameType(colander.String):
SEPARATOR = '/'
def deserialize(self, node, cstruct):
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 if cstruct is RootLocation:
return cstruct
gists: use colander schema to validate input data....
r523
repo-schemas: refactor repository schemas and use it in API update/create functions....
r1153 result = super(GroupNameType, self).deserialize(node, cstruct)
if cstruct is colander.null:
return colander.null
return self._normalize(result)
def _normalize(self, path):
return _normalize(self.SEPARATOR, path)
dan
schemas: add user/usergroup schema type
r740
validation-schema: added StringBoolean type and IPAddr validator.
r1149 class StringBooleanType(colander.String):
true_values = ['true', 't', 'yes', 'y', 'on', '1']
false_values = ['false', 'f', 'no', 'n', 'off', '0']
def serialize(self, node, appstruct):
if appstruct is colander.null:
return colander.null
if not isinstance(appstruct, bool):
raise colander.Invalid(node, '%r is not a boolean' % appstruct)
return appstruct and 'true' or 'false'
def deserialize(self, node, cstruct):
if cstruct is colander.null:
return colander.null
if isinstance(cstruct, bool):
return cstruct
if not isinstance(cstruct, basestring):
raise colander.Invalid(node, '%r is not a string' % cstruct)
value = cstruct.lower()
if value in self.true_values:
return True
elif value in self.false_values:
return False
else:
raise colander.Invalid(
node, '{} value cannot be translated to bool'.format(value))
dan
schemas: add user/usergroup schema type
r740 class UserOrUserGroupType(colander.SchemaType):
""" colander Schema type for valid rhodecode user and/or usergroup """
scopes = ('user', 'usergroup')
def __init__(self):
self.users = 'user' in self.scopes
self.usergroups = 'usergroup' in self.scopes
def serialize(self, node, appstruct):
if appstruct is colander.null:
return colander.null
if self.users:
if isinstance(appstruct, User):
if self.usergroups:
return 'user:%s' % appstruct.username
return appstruct.username
if self.usergroups:
if isinstance(appstruct, UserGroup):
if self.users:
return 'usergroup:%s' % appstruct.users_group_name
return appstruct.users_group_name
raise colander.Invalid(
node, '%s is not a valid %s' % (appstruct, ' or '.join(self.scopes)))
def deserialize(self, node, cstruct):
if cstruct is colander.null:
return colander.null
user, usergroup = None, None
if self.users:
if cstruct.startswith('user:'):
user = User.get_by_username(cstruct.split(':')[1])
else:
user = User.get_by_username(cstruct)
if self.usergroups:
if cstruct.startswith('usergroup:'):
usergroup = UserGroup.get_by_group_name(cstruct.split(':')[1])
else:
usergroup = UserGroup.get_by_group_name(cstruct)
if self.users and self.usergroups:
if user and usergroup:
raise colander.Invalid(node, (
'%s is both a user and usergroup, specify which '
'one was wanted by prepending user: or usergroup: to the '
'name') % cstruct)
if self.users and user:
return user
if self.usergroups and usergroup:
return usergroup
raise colander.Invalid(
node, '%s is not a valid %s' % (cstruct, ' or '.join(self.scopes)))
class UserType(UserOrUserGroupType):
scopes = ('user',)
class UserGroupType(UserOrUserGroupType):
scopes = ('usergroup',)
comments: add comments type into comments.
r1324
class StrOrIntType(colander.String):
def deserialize(self, node, cstruct):
pull-request: extended default reviewers functionality....
r1769 if isinstance(cstruct, basestring):
comments: add comments type into comments.
r1324 return super(StrOrIntType, self).deserialize(node, cstruct)
else:
return colander.Integer().deserialize(node, cstruct)