##// END OF EJS Templates
strip: cleanup code.
marcink -
r1698:ca5ed56e default
parent child Browse files
Show More
@@ -1,6 +1,6 b''
1 1 # -*- coding: utf-8 -*-
2 2
3 # Copyright (C) 2011-2017 RhodeCode GmbH
3 # Copyright (C) 2017-2017 RhodeCode GmbH
4 4 #
5 5 # This program is free software: you can redistribute it and/or modify
6 6 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,7 +24,7 b' from pyramid.view import view_config'
24 24 from rhodecode.apps._base import RepoAppView
25 25 from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator,
26 26 NotAnonymous)
27
27 from rhodecode.lib.ext_json import json
28 28
29 29 log = logging.getLogger(__name__)
30 30
@@ -57,8 +57,7 b' class StripView(RepoAppView):'
57 57 @HasRepoPermissionAnyDecorator('repository.admin')
58 58 @view_config(
59 59 route_name='strip_check', request_method='POST',
60 renderer='json', xhr=True
61 )
60 renderer='json', xhr=True)
62 61 def strip_check(self):
63 62 from rhodecode.lib.vcs.backends.base import EmptyCommit
64 63 data = {}
@@ -71,7 +70,8 b' class StripView(RepoAppView):'
71 70 if isinstance(data[i], EmptyCommit):
72 71 data[i] = {'rev': None, 'commit': rp[chset]}
73 72 else:
74 data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch, 'author': data[i].author,
73 data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch,
74 'author': data[i].author,
75 75 'comment': data[i].message}
76 76 else:
77 77 break
@@ -82,12 +82,9 b' class StripView(RepoAppView):'
82 82 @HasRepoPermissionAnyDecorator('repository.admin')
83 83 @view_config(
84 84 route_name='strip_execute', request_method='POST',
85 renderer='json', xhr=True
86 )
85 renderer='json', xhr=True)
87 86 def strip_execute(self):
88
89 87 from rhodecode.model.scm import ScmModel
90 from rhodecode.lib.ext_json import json
91 88
92 89 c = self.load_default_context()
93 90 user = self._rhodecode_user
@@ -99,12 +96,14 b' class StripView(RepoAppView):'
99 96 if commit['branch'] in data.keys():
100 97 continue
101 98 try:
102 ScmModel().strip(repo=c.repo_info,
99 ScmModel().strip(
100 repo=c.repo_info,
103 101 commit_id=commit['rev'], branch=commit['branch'])
104 log.info('Stripped commit %s from repo `%s` by %s' % (commit['rev'], c.repo_info.repo_name, user))
102 log.info('Stripped commit %s from repo `%s` by %s' % (
103 commit['rev'], c.repo_info.repo_name, user))
105 104 data[commit['rev']] = True
106 except Exception, e:
105 except Exception as e:
107 106 data[commit['rev']] = False
108 log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (commit['rev'],
109 c.repo_info.repo_name, user, e.message))
107 log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (
108 commit['rev'], self.db_repo_name, user, e.message))
110 109 return data
General Comments 0
You need to be logged in to leave comments. Login now