strip: added functionality to stip choosen commits on repo settings

rhodecode/apps/repository/__init__.py

@@ -1,33 +1,46 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-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 <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/
 
 
 def includeme(config):
 
     config.add_route(
         name='repo_maintenance',
         pattern='/{repo_name:.*?[^/]}/maintenance', repo_route=True)
 
     config.add_route(
         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()

rhodecode/apps/repository/views/strip.py

@@ -1,70 +1,110 b''
 # -*- 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 <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/
 
 import logging
-
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator,
     NotAnonymous)
-from rhodecode.lib import repo_maintenance
+
 
 log = logging.getLogger(__name__)
 
 
-class RepoMaintenanceView(RepoAppView):
+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='repo_maintenance', request_method='GET',
+        route_name='strip', request_method='GET',
         renderer='rhodecode:templates/admin/repos/repo_edit.mako')
-    def repo_maintenance(self):
+    def strip(self):
         c = self.load_default_context()
-        c.active = 'maintenance'
-        maintenance = repo_maintenance.RepoMaintenance()
-        c.executable_tasks = maintenance.get_tasks_for_repo(self.db_repo)
+        c.active = 'strip'
+        c.strip_limit = 10
+
         return self._get_template_context(c)
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
-        route_name='repo_maintenance_execute', request_method='GET',
-        renderer='json', xhr=True)
-    def repo_maintenance_execute(self):
+        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()
-        c.active = 'maintenance'
-        _ = self.request.translate
-
-        maintenance = repo_maintenance.RepoMaintenance()
-        executed_types = maintenance.execute(self.db_repo)
-
-        return executed_types
+        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

rhodecode/templates/admin/repos/repo_edit.mako

@@ -1,103 +1,106 b''
 ## -*- coding: utf-8 -*-
 ##
 ## See also repo_settings.html
 ##
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('%s repository settings') % c.repo_info.repo_name}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Settings')}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='options')}
 </%def>
 
 <%def name="main_content()">
   <%include file="/admin/repos/repo_edit_${c.active}.mako"/>
 </%def>
 
 
 <%def name="main()">
 <div class="box">
   <div class="title">
       ${self.repo_page_title(c.rhodecode_db_repo)}
       ${self.breadcrumbs()}
   </div>
 
   <div class="sidebar-col-wrapper scw-small">
     ##main
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           <li class="${'active' if c.active=='settings' else ''}">
               <a href="${h.url('edit_repo', repo_name=c.repo_name)}">${_('Settings')}</a>
           </li>
           <li class="${'active' if c.active=='permissions' else ''}">
               <a href="${h.url('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>
           </li>
           <li class="${'active' if c.active=='advanced' else ''}">
               <a href="${h.url('edit_repo_advanced', repo_name=c.repo_name)}">${_('Advanced')}</a>
           </li>
           <li class="${'active' if c.active=='vcs' else ''}">
               <a href="${h.url('repo_vcs_settings', repo_name=c.repo_name)}">${_('VCS')}</a>
           </li>
           <li class="${'active' if c.active=='fields' else ''}">
               <a href="${h.url('edit_repo_fields', repo_name=c.repo_name)}">${_('Extra Fields')}</a>
           </li>
           <li class="${'active' if c.active=='issuetracker' else ''}">
               <a href="${h.url('repo_settings_issuetracker', repo_name=c.repo_name)}">${_('Issue Tracker')}</a>
           </li>
           <li class="${'active' if c.active=='caches' else ''}">
               <a href="${h.url('edit_repo_caches', repo_name=c.repo_name)}">${_('Caches')}</a>
           </li>
           %if c.repo_info.repo_type != 'svn':
           <li class="${'active' if c.active=='remote' else ''}">
               <a href="${h.url('edit_repo_remote', repo_name=c.repo_name)}">${_('Remote')}</a>
           </li>
           %endif
           <li class="${'active' if c.active=='statistics' else ''}">
               <a href="${h.url('edit_repo_statistics', repo_name=c.repo_name)}">${_('Statistics')}</a>
           </li>
           <li class="${'active' if c.active=='integrations' else ''}">
               <a href="${h.route_path('repo_integrations_home', repo_name=c.repo_name)}">${_('Integrations')}</a>
           </li>
           <li class="${'active' if c.active=='maintenance' else ''}">
               <a href="${h.route_path('repo_maintenance', repo_name=c.repo_name)}">${_('Maintenance')}</a>
           </li>
+          <li class="${'active' if c.active=='strip' else ''}">
+              <a href="${h.route_path('strip', repo_name=c.repo_name)}">${_('Strip')}</a>
+          </li>
           ## 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
           <%
           reviewer_settings = False
           try:
             import rc_reviewers
             reviewer_settings = True
           except ImportError:
             pass
           %>
           %if reviewer_settings:
           <li class="${'active' if c.active=='reviewers' else ''}">
               <a href="${h.route_path('repo_reviewers_home', repo_name=c.repo_name)}">${_('Reviewers')}</a>
           </li>
           %endif
         </ul>
     </div>
 
     <div class="main-content-full-width">
       ${self.main_content()}
     </div>
 
   </div>
 </div>
 
 </%def>
  No newline at end of file

rhodecode/templates/admin/repos/repo_edit_strip.mako

@@ -1,58 +1,169 b''
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Maintenance')}</h3>
+        <h3 class="panel-title">${_('Strip')}</h3>
     </div>
     <div class="panel-body">
-
+        %if c.repo_info.repo_type != 'svn':
+            <p>
+               <h4>${_('Please provide up to %s commits commits to strip')%c.strip_limit}</h4>
+            </p>
         <p>
-            % if c.executable_tasks:
-            ${_('Perform maintenance tasks for this repo, following tasks will be performed')}:
-            <ol>
-            % for task in c.executable_tasks:
-                <li>${task}</li>
-            % endfor
-            </ol>
+                ${_('In the first step commits will be verified for existance in the repository')}. </br>
+                ${_('In the second step, correct commits will be available for stripping')}.
+            </p>
+            ${h.secure_form(h.route_path('strip_check', repo_name=c.repo_info.repo_name), method='post')}
+                <div id="change_body" class="field">
+                    <div id="box-1" class="inputx locked_input">
+                        <input class="text" id="changeset_id-1" name="changeset_id-1"  size="59"
+                              placeholder="${_('Enter full 40 character commit sha')}"  type="text" value="">
+                                        <div id = "plus_icon-1" class="btn btn-default plus_input_button">
+                                            <i class="icon-plus" onclick="addNew(1);return false">${_('Add another commit')}</i>
+                                        </div>
+                    </div>
+                </div>
+            <div id="results" style="display:none; padding: 10px 0px;"></div>
+                <div class="buttons">
+                    <button class="btn btn-small btn-primary" onclick="check_changsets();return false">
+                   ${_('Check commits')}
+                   </button>
+                </div>
+                <div id="results" style="display:none; padding: 10px 0px;"></div>
+
+            ${h.end_form()}
             % else:
-                ${_('No maintenance tasks for this repo available')}
-            % endif
+            <p>
+               <h4>${_('Sorry this functionality is not available for SVN repository')}</h4>
         </p>
 
-        <div id="results" style="display:none; padding: 10px 0px;"></div>
 
-        % if c.executable_tasks:
-        <div class="form">
-           <div class="fields">
-               <button class="btn btn-small btn-primary" onclick="executeTask();return false">
-               ${_('Run Maintenance')}
-               </button>
-           </div>
-        </div>
         % endif
 
     </div>
 </div>
 
 
 <script>
+var plus_leaf = 1;
 
-executeTask = function() {
-    var btn = $(this);
+addNew = function(number){
+    if (number >= ${c.strip_limit}){
+        return;
+    }
+    var minus = '<i id="i_minus_icon-'+(number+1)+'" class="icon-minus" onclick="delOld('+(number+1)+');return false">${_('Remove')}</i>';
+    $('#plus_icon-'+number).detach();
+    number++;
+    var input = '<div id="box-'+number+'" class="inputx locked_input">'+
+               '<input class="text" id="changeset_id-'+number+'" name="changeset_id-'+number+'"  size="59" type="text" value="">'+
+                '<div  id="plus_icon-'+number+'" class="btn btn-default plus_input_button">'+
+                   '<i id="i_plus_icon-'+(number)+'" class="icon-plus" onclick="addNew('+number+');return false">${_('Add another commit')}</i>'+
+               '</div>'+
+                '<div  id="minus_icon-'+number+'" class="btn btn-default minus_input_button">'+
+                minus +
+               '</div>' +
+            '</div>';
+    $('#change_body').append(input);
+    plus_leaf++;
+}
+
+function re_index(number){
+    for(var i=number;i<=plus_leaf;i++){
+        var check = $('#box-'+i);
+        if (check.length == 0){
+            var change = $('#box-'+(i+1));
+
+            change.attr('id','box-'+i);
+            var plus = $('#plus_icon-'+(i+1));
+            var i_plus = $('#i_plus_icon-'+(i+1));
+            if (plus.length != 0){
+                plus.attr('id','plus_icon-'+i);
+                i_plus.attr('id','i_plus_icon-'+i);
+                i_plus.attr('onclick','addNew('+i+');return false');
+                plus_leaf--;
+            }
+            var minus = $('#minus_icon-'+(i+1));
+            var i_minus = $('#i_minus_icon-'+(i+1));
+            minus.attr('id','minus_icon-'+i);
+            i_minus.attr('id','i_minus_icon-'+i);
+            i_minus.attr('onclick','delOld('+i+');return false');
+        }
+    }
+}
+
+delOld = function(number){
+    $('#box-'+number).remove();
+    number = number - 1;
+    var box = $('#box-'+number);
+    var plus =  '<div  id="plus_icon-'+number+'" class="btn btn-default plus_input_button">'+
+            '<i id="i_plus_icon-'+number+'" class="icon-plus" onclick="addNew('+number +');return false">${_('Add another commit')}</i></div>';
+    var minus = $('#minus_icon-'+number);
+    if(number +1 == plus_leaf){
+        minus.detach();
+        box.append(plus);
+        box.append(minus);
+    }
+    re_index(number+1);
+
+}
+
+var result_data;
+
+check_changsets = function() {
+    var postData = $('form').serialize();
     $('#results').show();
-    $('#results').html('<h4>${_('Performing Maintenance')}...</h4>');
-
+    $('#results').html('<h4>${_('Checking commits')}...</h4>');
+    var url = "${h.route_path('strip_check', repo_name=c.repo_info.repo_name)}";
+    var btn = $('button');
     btn.attr('disabled', 'disabled');
     btn.addClass('disabled');
 
-    var url = "${h.route_path('repo_maintenance_execute', repo_name=c.repo_info.repo_name)}";
     var success = function (data) {
-        var displayHtml = $('<pre></pre>');
+        result_data = {};
+        var i = 0;
+        result ='';
+        $.each(data, function(index, value){
+            i= index;
+            var box = $('#box-'+index);
+            if (value.rev){
+                result_data[index] = JSON.stringify(value);
+                msg = '${_("author")}: ' + value.author + ' ${_("comment")}: ' + value.comment;
+                result += '<h4>' +value.rev+ '${_(' commit verified positive')}</br> '+ msg + '</h4>';
+            }
+            else{
+                result += '<h4>' +value.commit+ '${_('commit verified negative')}' + '</h4>';
+            }
+            box.remove();
+        });
+        var box = $('#box-'+(parseInt(i)+1));
+        box.remove();
+        $('#results').html(result);
+    };
 
-        $(displayHtml).append(data);
-        $('#results').html(displayHtml);
+    btn.html('Strip');
         btn.removeAttr('disabled');
         btn.removeClass('disabled');
+    btn.attr('onclick','strip();return false;');
+    ajaxPOST(url, postData, success, null);
     };
-    ajaxGET(url, success, null);
 
+strip = function(){
+    var url = "${h.route_path('strip_execute', repo_name=c.repo_info.repo_name)}";
+    var success = function(data){
+        result = '';
+        $.each(data, function(index, value){
+             if(data[index]){
+                 result += '<h4>' +index+ '${_(' commit striped successful')}' + '</h4>';
 }
+             else{
+                 result += '<h4>' +index+ '${_(' commit striped failed')}' + '</h4>';
+             }
+        });
+        $('#results').html(result);
+
+    };
+    ajaxPOST(url, result_data, success, null);
+    var btn = $('button');
+    btn.attr('disabled', 'disabled');
+    btn.addClass('disabled');
+
+};
 </script>