##// END OF EJS Templates
reset charset for git rpc cals also
reset charset for git rpc cals also

File last commit:

r2570:94ae02ca beta
r2581:ee980ead beta
Show More
pullrequests.py
327 lines | 12.6 KiB | text/x-python | PythonLexer
pull requests draft UI
r2244 # -*- coding: utf-8 -*-
"""
rhodecode.controllers.pullrequests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
pull requests controller for rhodecode for initializing pull requests
:created_on: May 7, 2012
:author: marcink
:copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
:license: GPLv3, see COPYING for more details.
"""
# 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.
#
# 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 General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
import traceback
- pull request generates overview based on it's params...
r2440
Enabled inline comments in pull-requests
r2489 from webob.exc import HTTPNotFound, HTTPForbidden
Adde pull request voting recalculation
r2481 from collections import defaultdict
from itertools import groupby
pull requests draft UI
r2244
from pylons import request, response, session, tmpl_context as c, url
from pylons.controllers.util import abort, redirect
from pylons.i18n.translation import _
- added commenting to pull requests...
r2443 from pylons.decorators import jsonify
pull requests draft UI
r2244
Added dynamic data loading for other repo we open pull request against...
r2541 from rhodecode.lib.compat import json
pull requests draft UI
r2244 from rhodecode.lib.base import BaseRepoController, render
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
Added basic models for saving open pull requests...
r2434 from rhodecode.lib import helpers as h
- pull request generates overview based on it's params...
r2440 from rhodecode.lib import diffs
- added commenting to pull requests...
r2443 from rhodecode.lib.utils import action_logger
Enabled inline comments in pull-requests
r2489 from rhodecode.model.db import User, PullRequest, ChangesetStatus,\
ChangesetComment
Added basic models for saving open pull requests...
r2434 from rhodecode.model.pull_request import PullRequestModel
from rhodecode.model.meta import Session
- pull request generates overview based on it's params...
r2440 from rhodecode.model.repo import RepoModel
from rhodecode.model.comment import ChangesetCommentsModel
from rhodecode.model.changeset_status import ChangesetStatusModel
pull requests draft UI
r2244
log = logging.getLogger(__name__)
class PullrequestsController(BaseRepoController):
@LoginRequired()
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
'repository.admin')
def __before__(self):
super(PullrequestsController, self).__before__()
created pull-request overview
r2395 def _get_repo_refs(self, repo):
pull requests draft UI
r2244 hist_l = []
- pull request generates overview based on it's params...
r2440 branches_group = ([('branch:%s:%s' % (k, v), k) for
k, v in repo.branches.iteritems()], _("Branches"))
bookmarks_group = ([('book:%s:%s' % (k, v), k) for
k, v in repo.bookmarks.iteritems()], _("Bookmarks"))
white space cleanup
r2478 tags_group = ([('tag:%s:%s' % (k, v), k) for
- pull request generates overview based on it's params...
r2440 k, v in repo.tags.iteritems()], _("Tags"))
pull requests draft UI
r2244
hist_l.append(bookmarks_group)
hist_l.append(branches_group)
hist_l.append(tags_group)
return hist_l
- pull request generates overview based on it's params...
r2440 def show_all(self, repo_name):
c.pull_requests = PullRequestModel().get_all(repo_name)
c.repo_name = repo_name
return render('/pullrequests/pullrequest_show_all.html')
pull requests draft UI
r2244 def index(self):
created pull-request overview
r2395 org_repo = c.rhodecode_db_repo
data checks
r2444
if org_repo.scm_instance.alias != 'hg':
log.error('Review not available for GIT REPOS')
raise HTTPNotFound
Added dynamic data loading for other repo we open pull request against...
r2541 other_repos_info = {}
pull requests draft UI
r2244 c.org_refs = self._get_repo_refs(c.rhodecode_repo)
created pull-request overview
r2395 c.org_repos = []
c.other_repos = []
c.org_repos.append((org_repo.repo_name, '%s/%s' % (
org_repo.user.username, c.repo_name))
)
c.other_refs = c.org_refs
c.other_repos.extend(c.org_repos)
Added dynamic data loading for other repo we open pull request against...
r2541
#add orginal repo
other_repos_info[org_repo.repo_name] = {
'gravatar': h.gravatar_url(org_repo.user.email, 24),
'description': org_repo.description
}
Added basic models for saving open pull requests...
r2434 c.default_pull_request = org_repo.repo_name
created pull-request overview
r2395 #gather forks and add to this list
for fork in org_repo.forks:
c.other_repos.append((fork.repo_name, '%s/%s' % (
fork.user.username, fork.repo_name))
)
Added dynamic data loading for other repo we open pull request against...
r2541 other_repos_info[fork.repo_name] = {
'gravatar': h.gravatar_url(fork.user.email, 24),
'description': fork.description
}
created pull-request overview
r2395 #add parents of this fork also
Added basic models for saving open pull requests...
r2434 if org_repo.parent:
c.default_pull_request = org_repo.parent.repo_name
c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (
org_repo.parent.user.username,
org_repo.parent.repo_name))
)
Added dynamic data loading for other repo we open pull request against...
r2541 other_repos_info[org_repo.parent.repo_name] = {
'gravatar': h.gravatar_url(org_repo.parent.user.email, 24),
'description': org_repo.parent.description
}
created pull-request overview
r2395
Added dynamic data loading for other repo we open pull request against...
r2541 c.other_repos_info = json.dumps(other_repos_info)
created pull-request overview
r2395 c.review_members = []
Added basic models for saving open pull requests...
r2434 c.available_members = []
for u in User.query().filter(User.username != 'default').all():
uname = u.username
if org_repo.user == u:
Takumi IINO
i18n improve
r2570 uname = _('%s (owner)') % u.username
Added basic models for saving open pull requests...
r2434 # auto add owner to pull-request recipients
c.review_members.append([u.user_id, uname])
c.available_members.append([u.user_id, uname])
pull requests draft UI
r2244 return render('/pullrequests/pullrequest.html')
Added basic models for saving open pull requests...
r2434
def create(self, repo_name):
req_p = request.POST
org_repo = req_p['org_repo']
org_ref = req_p['org_ref']
other_repo = req_p['other_repo']
other_ref = req_p['other_ref']
revisions = req_p.getall('revisions')
reviewers = req_p.getall('review_members')
#TODO: wrap this into a FORM !!!
title = req_p['pullrequest_title']
description = req_p['pullrequest_desc']
try:
Added dynamic data loading for other repo we open pull request against...
r2541 pull_request = PullRequestModel().create(
self.rhodecode_user.user_id, org_repo, org_ref, other_repo,
other_ref, revisions, reviewers, title, description
)
Session().commit()
redirect to pull-request overview after creation
r2533 h.flash(_('Successfully opened new pull request'),
category='success')
Added basic models for saving open pull requests...
r2434 except Exception:
redirect to pull-request overview after creation
r2533 h.flash(_('Error occurred during sending pull request'),
Added basic models for saving open pull requests...
r2434 category='error')
log.error(traceback.format_exc())
Added dynamic data loading for other repo we open pull request against...
r2541 return redirect(url('changelog_home', repo_name=org_repo,))
Added basic models for saving open pull requests...
r2434
redirect to pull-request overview after creation
r2533 return redirect(url('pullrequest_show', repo_name=other_repo,
pull_request_id=pull_request.pull_request_id))
Added basic models for saving open pull requests...
r2434
small refactoring, moved shared for diff generation of code into pull-request model
r2442 def _load_compare_data(self, pull_request):
"""
Load context data needed for generating compare diff
- pull request generates overview based on it's params...
r2440
small refactoring, moved shared for diff generation of code into pull-request model
r2442 :param pull_request:
:type pull_request:
"""
- pull request generates overview based on it's params...
r2440
org_repo = pull_request.org_repo
org_ref_type, org_ref_, org_ref = pull_request.org_ref.split(':')
other_repo = pull_request.other_repo
other_ref_type, other_ref, other_ref_ = pull_request.other_ref.split(':')
org_ref = (org_ref_type, org_ref)
other_ref = (other_ref_type, other_ref)
c.org_repo = org_repo
c.other_repo = other_repo
small refactoring, moved shared for diff generation of code into pull-request model
r2442 c.cs_ranges, discovery_data = PullRequestModel().get_compare_data(
org_repo, org_ref, other_repo, other_ref
)
- pull request generates overview based on it's params...
r2440
c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
c.cs_ranges])
# defines that we need hidden inputs with changesets
c.as_form = request.GET.get('as_form', False)
c.org_ref = org_ref[1]
c.other_ref = other_ref[1]
# diff needs to have swapped org with other to generate proper diff
_diff = diffs.differ(other_repo, other_ref, org_repo, org_ref,
discovery_data)
diff_processor = diffs.DiffProcessor(_diff, format='gitdiff')
_parsed = diff_processor.prepare()
c.files = []
c.changes = {}
for f in _parsed:
fid = h.FID('', f['filename'])
c.files.append([fid, f['operation'], f['filename'], f['stats']])
Enabled inline comments in pull-requests
r2489 diff = diff_processor.as_html(enable_comments=True,
diff_lines=[f])
- pull request generates overview based on it's params...
r2440 c.changes[fid] = [f['operation'], f['filename'], diff]
Added basic models for saving open pull requests...
r2434 def show(self, repo_name, pull_request_id):
- pull request generates overview based on it's params...
r2440 repo_model = RepoModel()
c.users_array = repo_model.get_users_js()
c.users_groups_array = repo_model.get_users_groups_js()
use get_or_404 where possible
r2496 c.pull_request = PullRequest.get_or_404(pull_request_id)
small refactoring, moved shared for diff generation of code into pull-request model
r2442
Adde pull request voting recalculation
r2481 cc_model = ChangesetCommentsModel()
cs_model = ChangesetStatusModel()
_cs_statuses = cs_model.get_statuses(c.pull_request.org_repo,
pull_request=c.pull_request,
with_revisions=True)
cs_statuses = defaultdict(list)
for st in _cs_statuses:
cs_statuses[st.author.username] += [st]
c.pull_request_reviewers = []
for o in c.pull_request.reviewers:
st = cs_statuses.get(o.user.username, None)
if st:
sorter = lambda k: k.version
st = [(x, list(y)[0])
for x, y in (groupby(sorted(st, key=sorter), sorter))]
c.pull_request_reviewers.append([o.user, st])
data checks
r2444
# pull_requests repo_name we opened it against
# ie. other_repo must match
if repo_name != c.pull_request.other_repo.repo_name:
raise HTTPNotFound
small refactoring, moved shared for diff generation of code into pull-request model
r2442 # load compare data into template context
self._load_compare_data(c.pull_request)
- pull request generates overview based on it's params...
r2440
# inline comments
c.inline_cnt = 0
Adde pull request voting recalculation
r2481 c.inline_comments = cc_model.get_inline_comments(
c.rhodecode_db_repo.repo_id,
pull_request=pull_request_id)
- pull request generates overview based on it's params...
r2440 # count inline comments
for __, lines in c.inline_comments:
for comments in lines.values():
c.inline_cnt += len(comments)
# comments
Adde pull request voting recalculation
r2481 c.comments = cc_model.get_comments(c.rhodecode_db_repo.repo_id,
pull_request=pull_request_id)
- pull request generates overview based on it's params...
r2440
- added commenting to pull requests...
r2443 # changeset(pull-request) status
Adde pull request voting recalculation
r2481 c.current_changeset_status = cs_model.calculate_status(
c.pull_request_reviewers
)
- pull request generates overview based on it's params...
r2440 c.changeset_statuses = ChangesetStatus.STATUSES
Fixed origin repo in pull-request view
r2487 c.target_repo = c.pull_request.org_repo.repo_name
Added basic models for saving open pull requests...
r2434 return render('/pullrequests/pullrequest_show.html')
- added commenting to pull requests...
r2443
@jsonify
def comment(self, repo_name, pull_request_id):
status = request.POST.get('changeset_status')
change_status = request.POST.get('change_changeset_status')
comm = ChangesetCommentsModel().create(
text=request.POST.get('text'),
Added dynamic data loading for other repo we open pull request against...
r2541 repo=c.rhodecode_db_repo.repo_id,
user=c.rhodecode_user.user_id,
- added commenting to pull requests...
r2443 pull_request=pull_request_id,
f_path=request.POST.get('f_path'),
line_no=request.POST.get('line'),
white space cleanup
r2478 status_change=(ChangesetStatus.get_status_lbl(status)
- added commenting to pull requests...
r2443 if status and change_status else None)
)
# get status if set !
if status and change_status:
ChangesetStatusModel().set_status(
c.rhodecode_db_repo.repo_id,
status,
c.rhodecode_user.user_id,
comm,
pull_request=pull_request_id
)
action_logger(self.rhodecode_user,
'user_commented_pull_request:%s' % pull_request_id,
c.rhodecode_db_repo, self.ip_addr, self.sa)
Added dynamic data loading for other repo we open pull request against...
r2541 Session().commit()
- added commenting to pull requests...
r2443
if not request.environ.get('HTTP_X_PARTIAL_XHR'):
return redirect(h.url('pullrequest_show', repo_name=repo_name,
pull_request_id=pull_request_id))
data = {
'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
}
if comm:
c.co = comm
data.update(comm.get_dict())
data.update({'rendered_text':
render('changeset/changeset_comment_block.html')})
data checks
r2444 return data
Enabled inline comments in pull-requests
r2489
@jsonify
def delete_comment(self, repo_name, comment_id):
co = ChangesetComment.get(comment_id)
owner = lambda: co.author.user_id == c.rhodecode_user.user_id
if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
ChangesetCommentsModel().delete(comment=co)
Added dynamic data loading for other repo we open pull request against...
r2541 Session().commit()
Enabled inline comments in pull-requests
r2489 return True
else:
raise HTTPForbidden()