diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py index 33ec6ddc..95d5378d 100644 --- a/rhodecode/apps/repository/__init__.py +++ b/rhodecode/apps/repository/__init__.py @@ -29,5 +29,18 @@ def includeme(config): name='repo_maintenance_execute', pattern='/{repo_name:.*?[^/]}/maintenance/execute', repo_route=True) + + # Strip + config.add_route( + name='strip', + pattern='/{repo_name:.*?[^/]}/strip', repo_route=True) + + config.add_route( + name='strip_check', + pattern='/{repo_name:.*?[^/]}/strip_check', repo_route=True) + + config.add_route( + name='strip_execute', + pattern='/{repo_name:.*?[^/]}/strip_execute', repo_route=True) # Scan module for configuration decorators. config.scan() diff --git a/rhodecode/apps/repository/views/strip.py b/rhodecode/apps/repository/views/strip.py new file mode 100644 index 00000000..1ba26f48 --- /dev/null +++ b/rhodecode/apps/repository/views/strip.py @@ -0,0 +1,110 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2011-2017 RhodeCode GmbH +# +# 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 . +# +# 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/ + +import logging +from pyramid.view import view_config + +from rhodecode.apps._base import RepoAppView +from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator, + NotAnonymous) + + +log = logging.getLogger(__name__) + + +class StripView(RepoAppView): + def load_default_context(self): + c = self._get_local_tmpl_context() + + # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead + c.repo_info = self.db_repo + + self._register_global_c(c) + return c + + @LoginRequired() + @NotAnonymous() + @HasRepoPermissionAnyDecorator('repository.admin') + @view_config( + route_name='strip', request_method='GET', + renderer='rhodecode:templates/admin/repos/repo_edit.mako') + def strip(self): + c = self.load_default_context() + c.active = 'strip' + c.strip_limit = 10 + + return self._get_template_context(c) + + @LoginRequired() + @NotAnonymous() + @HasRepoPermissionAnyDecorator('repository.admin') + @view_config( + route_name='strip_check', request_method='POST', + renderer='json', xhr=True + ) + def strip_check(self): + from rhodecode.lib.vcs.backends.base import EmptyCommit + data = {} + rp = self.request.POST + for i in range(1, 11): + chset = 'changeset_id-%d'%(i,) + check = rp.get(chset) + if check: + data[i] = self.db_repo.get_changeset(rp[chset]) + if isinstance(data[i], EmptyCommit): + data[i] = {'rev': None, 'commit': rp[chset]} + else: + data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch, 'author': data[i].author, + 'comment': data[i].message} + else: + break + return data + + @LoginRequired() + @NotAnonymous() + @HasRepoPermissionAnyDecorator('repository.admin') + @view_config( + route_name='strip_execute', request_method='POST', + renderer='json', xhr=True + ) + def strip_execute(self): + + from rhodecode.model.scm import ScmModel + from rhodecode.lib.ext_json import json + + c = self.load_default_context() + user = self._rhodecode_user + rp = self.request.POST + data = {} + for idx in rp: + commit = json.loads(rp[idx]) + #If someone put two times the same branch + if commit['branch'] in data.keys(): + continue + try: + ScmModel().strip(repo=c.repo_info, + commit_id=commit['rev'], branch=commit['branch']) + log.info('Stripped commit %s from repo `%s` by %s' % (commit['rev'], c.repo_info.repo_name, user)) + data[commit['rev']] = True + except Exception, e: + data[commit['rev']] = False + log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (commit['rev'], + c.repo_info.repo_name, user, e.message)) + return data diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako index 6cf89f52..8b698ae1 100644 --- a/rhodecode/templates/admin/repos/repo_edit.mako +++ b/rhodecode/templates/admin/repos/repo_edit.mako @@ -74,6 +74,9 @@
  • ${_('Maintenance')}
    • +
  • + ${_('Strip')} +
    • ## TODO: dan: replace repo navigation with navlist registry like with ## admin menu. First must find way to allow runtime configuration ## it to account for the c.repo_info.repo_type != 'svn' call above diff --git a/rhodecode/templates/admin/repos/repo_edit_strip.mako b/rhodecode/templates/admin/repos/repo_edit_strip.mako new file mode 100644 index 00000000..35f827ad --- /dev/null +++ b/rhodecode/templates/admin/repos/repo_edit_strip.mako @@ -0,0 +1,169 @@ +
    +
    +

    ${_('Strip')}

    +
    +
    + %if c.repo_info.repo_type != 'svn': +

    +

    ${_('Please provide up to %s commits commits to strip')%c.strip_limit}

    +

    +

    + ${_('In the first step commits will be verified for existance in the repository')}.
    + ${_('In the second step, correct commits will be available for stripping')}. +

    + ${h.secure_form(h.route_path('strip_check', repo_name=c.repo_info.repo_name), method='post')} +
    +
    + +
    + ${_('Add another commit')} +
    +
    +
    + +
    + +
    + + + ${h.end_form()} + %else: +

    +

    ${_('Sorry this functionality is not available for SVN repository')}

    +

    + + + %endif + +
    +
    + + +