Files
@ 7efc8dcc0dc4
Branch filter:
Location: kallithea/rhodecode/controllers/pullrequests.py - annotation
7efc8dcc0dc4
20.5 KiB
text/x-python
usage of request.GET is now more consistent
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 | 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 1de45f582f9d 1bc579bcd67a a0adf8db1416 4d3032431d4f 4d3032431d4f 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 1c2ba03c42b4 77e376fdc4c6 9364776d1331 9364776d1331 9d2db665ef31 f29469677319 1bc579bcd67a 7727faad5baf 7727faad5baf 7727faad5baf 7727faad5baf a0adf8db1416 a0adf8db1416 f29469677319 f29469677319 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1de45f582f9d 5b3313a5c6fc 9d2db665ef31 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 77e376fdc4c6 9364776d1331 9364776d1331 9364776d1331 77e376fdc4c6 5b3313a5c6fc c12603d5ee13 c12603d5ee13 5b3313a5c6fc 5b3313a5c6fc 7d774f09dba5 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 5b3313a5c6fc 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 77e376fdc4c6 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 7d774f09dba5 2b672f04bfd9 c77d5c6358eb 68f9c216377d c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 7efc8dcc0dc4 9d2db665ef31 9d2db665ef31 9d2db665ef31 9d2db665ef31 9d2db665ef31 9d2db665ef31 9d2db665ef31 9d2db665ef31 1bc579bcd67a 1bc579bcd67a 6bd62617b99f 77e376fdc4c6 b262e349a7a5 b45e9fd75ac0 b45e9fd75ac0 b45e9fd75ac0 b45e9fd75ac0 b45e9fd75ac0 95923493de9a 95923493de9a 95923493de9a 95923493de9a 95923493de9a 95923493de9a 95923493de9a b19b1723ff10 b19b1723ff10 b19b1723ff10 b19b1723ff10 b19b1723ff10 b262e349a7a5 dcd1c159a132 f8c55b487c9a b19b1723ff10 1c2ba03c42b4 f285faa3a602 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd ceb6d57d1998 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd 54e011cb21fd f285faa3a602 1c2ba03c42b4 fe2bb88bf7ac 9bc052942640 b262e349a7a5 54e011cb21fd f285faa3a602 f285faa3a602 07d620f6db2e 54e011cb21fd f285faa3a602 b262e349a7a5 9bc052942640 1c2ba03c42b4 9d2db665ef31 77e376fdc4c6 f29469677319 9364776d1331 f29469677319 eb180eb16c18 1de45f582f9d eb180eb16c18 1de45f582f9d 1de45f582f9d 1de45f582f9d 0f7355d3c196 1de45f582f9d 1de45f582f9d 1de45f582f9d ec6354949623 9364776d1331 1de45f582f9d 1de45f582f9d f29469677319 1de45f582f9d 2053053e0882 1de45f582f9d 2053053e0882 1de45f582f9d 1de45f582f9d 1de45f582f9d 1de45f582f9d 1de45f582f9d f29469677319 f29469677319 1c2ba03c42b4 1c2ba03c42b4 1c2ba03c42b4 1c2ba03c42b4 1c2ba03c42b4 5a826060251f 5a826060251f f29469677319 5a826060251f f29469677319 f29469677319 1de45f582f9d f29469677319 5a826060251f 5a826060251f f29469677319 3f50a5e8fc4d 3f50a5e8fc4d 3f50a5e8fc4d 3f50a5e8fc4d 3f50a5e8fc4d 3f50a5e8fc4d 52617fb79010 52617fb79010 52617fb79010 52617fb79010 52617fb79010 7224882c4059 52617fb79010 c2a206162062 52617fb79010 52617fb79010 3f50a5e8fc4d 49a4864b11c1 49a4864b11c1 49a4864b11c1 49a4864b11c1 49a4864b11c1 49a4864b11c1 49a4864b11c1 49a4864b11c1 49a4864b11c1 49a4864b11c1 c2a206162062 52617fb79010 49a4864b11c1 58c529332e7e 3bf057a7f7e8 3bf057a7f7e8 1bc579bcd67a 3bf057a7f7e8 3bf057a7f7e8 3bf057a7f7e8 1bc579bcd67a 1de45f582f9d 1de45f582f9d 1de45f582f9d 1de45f582f9d c2a206162062 1de45f582f9d 1de45f582f9d 1de45f582f9d 1bc579bcd67a 0f7355d3c196 75e563531350 1de45f582f9d 1de45f582f9d 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a c2a206162062 c2a206162062 c2a206162062 c2a206162062 0b2214604c74 1bc579bcd67a 1bc579bcd67a 674a8fad3abc 1bc579bcd67a 674a8fad3abc c2a206162062 c2a206162062 c2a206162062 c2a206162062 c2a206162062 16af24982e30 c2a206162062 c2a206162062 1bc579bcd67a 1bc579bcd67a c2a206162062 c2a206162062 c2a206162062 c2a206162062 1bc579bcd67a 1bc579bcd67a c2a206162062 c2a206162062 1bc579bcd67a c2a206162062 c2a206162062 c2a206162062 c2a206162062 1bc579bcd67a 1bc579bcd67a 58c529332e7e 32471bd1f4ee 1bc579bcd67a 1bc579bcd67a f29469677319 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a fddd8e3fc157 c77d5c6358eb 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 7224882c4059 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 4d3032431d4f 7224882c4059 7224882c4059 4d3032431d4f b45e9fd75ac0 b45e9fd75ac0 b45e9fd75ac0 b45e9fd75ac0 b45e9fd75ac0 b45e9fd75ac0 3bf057a7f7e8 58c529332e7e 58c529332e7e 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 4d3032431d4f 4d3032431d4f 4d3032431d4f 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a 4d3032431d4f 4d3032431d4f 1bc579bcd67a 0b2214604c74 0b2214604c74 10b4e34841a4 0b2214604c74 0b2214604c74 0b2214604c74 0b2214604c74 0b2214604c74 0b2214604c74 0b2214604c74 0b2214604c74 0b2214604c74 1bc579bcd67a 0b2214604c74 b3680a200f75 2053053e0882 f29469677319 fd0a822481ec 6bd62617b99f fd0a822481ec fd0a822481ec 58c529332e7e 58c529332e7e 58c529332e7e fd0a822481ec fd0a822481ec fd0a822481ec bf3c976d02ec bbe21df7ad48 c77d5c6358eb c77d5c6358eb c77d5c6358eb ec6354949623 bf3c976d02ec bbe21df7ad48 bbe21df7ad48 bbe21df7ad48 fd0a822481ec bf3c976d02ec 1c2ba03c42b4 1c2ba03c42b4 fd0a822481ec fd0a822481ec fd0a822481ec 8eab81115660 bbe21df7ad48 bbe21df7ad48 bbe21df7ad48 fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb bbe21df7ad48 c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb c77d5c6358eb 58c529332e7e 1c2ba03c42b4 fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec fd0a822481ec b45e9fd75ac0 a0adf8db1416 6bd62617b99f a0adf8db1416 a0adf8db1416 a0adf8db1416 58c529332e7e 58c529332e7e 58c529332e7e 58c529332e7e a45191e7c7bb a0adf8db1416 a0adf8db1416 1c2ba03c42b4 a0adf8db1416 a0adf8db1416 3f50a5e8fc4d | # -*- 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
import formencode
from webob.exc import HTTPNotFound, HTTPForbidden
from collections import defaultdict
from itertools import groupby
from pylons import request, response, session, tmpl_context as c, url
from pylons.controllers.util import abort, redirect
from pylons.i18n.translation import _
from rhodecode.lib.compat import json
from rhodecode.lib.base import BaseRepoController, render
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
NotAnonymous
from rhodecode.lib.helpers import Page
from rhodecode.lib import helpers as h
from rhodecode.lib import diffs
from rhodecode.lib.utils import action_logger, jsonify
from rhodecode.lib.vcs.exceptions import EmptyRepositoryError
from rhodecode.lib.vcs.backends.base import EmptyChangeset
from rhodecode.lib.diffs import LimitedDiffContainer
from rhodecode.model.db import User, PullRequest, ChangesetStatus,\
ChangesetComment
from rhodecode.model.pull_request import PullRequestModel
from rhodecode.model.meta import Session
from rhodecode.model.repo import RepoModel
from rhodecode.model.comment import ChangesetCommentsModel
from rhodecode.model.changeset_status import ChangesetStatusModel
from rhodecode.model.forms import PullRequestForm
from mercurial import scmutil
from rhodecode.lib.utils2 import safe_int
log = logging.getLogger(__name__)
class PullrequestsController(BaseRepoController):
@LoginRequired()
@HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
'repository.admin')
def __before__(self):
super(PullrequestsController, self).__before__()
repo_model = RepoModel()
c.users_array = repo_model.get_users_js()
c.users_groups_array = repo_model.get_users_groups_js()
def _get_repo_refs(self, repo, rev=None, branch_rev=None):
"""return a structure with repo's interesting changesets, suitable for
the selectors in pullrequest.html"""
# list named branches that has been merged to this named branch - it should probably merge back
peers = []
if branch_rev:
# not restricting to merge() would also get branch point and be better
# (especially because it would get the branch point) ... but is currently too expensive
revs = ["sort(parents(branch(id('%s')) and merge()) - branch(id('%s')))" %
(branch_rev, branch_rev)]
otherbranches = {}
for i in scmutil.revrange(repo._repo, revs):
cs = repo.get_changeset(i)
otherbranches[cs.branch] = cs.raw_id
for branch, node in otherbranches.iteritems():
selected = 'branch:%s:%s' % (branch, node)
peers.append((selected, branch))
selected = None
branches = []
for branch, branchrev in repo.branches.iteritems():
n = 'branch:%s:%s' % (branch, branchrev)
branches.append((n, branch))
if rev == branchrev:
selected = n
bookmarks = []
for bookmark, bookmarkrev in repo.bookmarks.iteritems():
n = 'book:%s:%s' % (bookmark, bookmarkrev)
bookmarks.append((n, bookmark))
if rev == bookmarkrev:
selected = n
tags = []
for tag, tagrev in repo.tags.iteritems():
n = 'tag:%s:%s' % (tag, tagrev)
tags.append((n, tag))
if rev == tagrev and tag != 'tip': # tip is not a real tag - and its branch is better
selected = n
# prio 1: rev was selected as existing entry above
# prio 2: create special entry for rev; rev _must_ be used
specials = []
if rev and selected is None:
selected = 'rev:%s:%s' % (rev, rev)
specials = [(selected, '%s: %s' % (_("Changeset"), rev[:12]))]
# prio 3: most recent peer branch
if peers and not selected:
selected = peers[0][0][0]
# prio 4: tip revision
if not selected:
selected = 'tag:tip:%s' % repo.tags['tip']
groups = [(specials, _("Special")),
(peers, _("Peer branches")),
(bookmarks, _("Bookmarks")),
(branches, _("Branches")),
(tags, _("Tags")),
]
return [g for g in groups if g[0]], selected
def _get_is_allowed_change_status(self, pull_request):
owner = self.rhodecode_user.user_id == pull_request.user_id
reviewer = self.rhodecode_user.user_id in [x.user_id for x in
pull_request.reviewers]
return (self.rhodecode_user.admin or owner or reviewer)
def show_all(self, repo_name):
c.pull_requests = PullRequestModel().get_all(repo_name)
c.repo_name = repo_name
p = safe_int(request.GET.get('page', 1), 1)
c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=10)
c.pullrequest_data = render('/pullrequests/pullrequest_data.html')
if request.environ.get('HTTP_X_PARTIAL_XHR'):
return c.pullrequest_data
return render('/pullrequests/pullrequest_show_all.html')
@NotAnonymous()
def index(self):
org_repo = c.rhodecode_db_repo
if org_repo.scm_instance.alias != 'hg':
log.error('Review not available for GIT REPOS')
raise HTTPNotFound
try:
org_repo.scm_instance.get_changeset()
except EmptyRepositoryError, e:
h.flash(h.literal(_('There are no changesets yet')),
category='warning')
redirect(url('summary_home', repo_name=org_repo.repo_name))
org_rev = request.GET.get('rev_end')
# rev_start is not directly useful - its parent could however be used
# as default for other and thus give a simple compare view
#other_rev = request.POST.get('rev_start')
c.org_repos = []
c.org_repos.append((org_repo.repo_name, org_repo.repo_name))
c.default_org_repo = org_repo.repo_name
c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance, org_rev)
c.other_repos = []
other_repos_info = {}
def add_other_repo(repo, branch_rev=None):
if repo.repo_name in other_repos_info: # shouldn't happen
return
c.other_repos.append((repo.repo_name, repo.repo_name))
other_refs, selected_other_ref = self._get_repo_refs(repo.scm_instance, branch_rev=branch_rev)
other_repos_info[repo.repo_name] = {
'user': dict(user_id=repo.user.user_id,
username=repo.user.username,
firstname=repo.user.firstname,
lastname=repo.user.lastname,
gravatar_link=h.gravatar_url(repo.user.email, 14)),
'description': repo.description.split('\n', 1)[0],
'revs': h.select('other_ref', selected_other_ref, other_refs, class_='refs')
}
# add org repo to other so we can open pull request against peer branches on itself
add_other_repo(org_repo, branch_rev=org_rev)
c.default_other_repo = org_repo.repo_name
# gather forks and add to this list ... even though it is rare to
# request forks to pull from their parent
for fork in org_repo.forks:
add_other_repo(fork)
# add parents of this fork also, but only if it's not empty
if org_repo.parent and org_repo.parent.scm_instance.revisions:
add_other_repo(org_repo.parent)
c.default_other_repo = org_repo.parent.repo_name
c.default_other_repo_info = other_repos_info[c.default_other_repo]
c.other_repos_info = json.dumps(other_repos_info)
return render('/pullrequests/pullrequest.html')
@NotAnonymous()
def create(self, repo_name):
repo = RepoModel()._get_repo(repo_name)
try:
_form = PullRequestForm(repo.repo_id)().to_python(request.POST)
except formencode.Invalid, errors:
log.error(traceback.format_exc())
if errors.error_dict.get('revisions'):
msg = 'Revisions: %s' % errors.error_dict['revisions']
elif errors.error_dict.get('pullrequest_title'):
msg = _('Pull request requires a title with min. 3 chars')
else:
msg = _('Error creating pull request')
h.flash(msg, 'error')
return redirect(url('pullrequest_home', repo_name=repo_name))
org_repo = _form['org_repo']
org_ref = 'rev:merge:%s' % _form['merge_rev']
other_repo = _form['other_repo']
other_ref = 'rev:ancestor:%s' % _form['ancestor_rev']
revisions = _form['revisions']
reviewers = _form['review_members']
title = _form['pullrequest_title']
description = _form['pullrequest_desc']
try:
pull_request = PullRequestModel().create(
self.rhodecode_user.user_id, org_repo, org_ref, other_repo,
other_ref, revisions, reviewers, title, description
)
Session().commit()
h.flash(_('Successfully opened new pull request'),
category='success')
except Exception:
h.flash(_('Error occurred during sending pull request'),
category='error')
log.error(traceback.format_exc())
return redirect(url('pullrequest_home', repo_name=repo_name))
return redirect(url('pullrequest_show', repo_name=other_repo,
pull_request_id=pull_request.pull_request_id))
@NotAnonymous()
@jsonify
def update(self, repo_name, pull_request_id):
pull_request = PullRequest.get_or_404(pull_request_id)
if pull_request.is_closed():
raise HTTPForbidden()
#only owner or admin can update it
owner = pull_request.author.user_id == c.rhodecode_user.user_id
if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
reviewers_ids = map(int, filter(lambda v: v not in [None, ''],
request.POST.get('reviewers_ids', '').split(',')))
PullRequestModel().update_reviewers(pull_request_id, reviewers_ids)
Session().commit()
return True
raise HTTPForbidden()
@NotAnonymous()
@jsonify
def delete(self, repo_name, pull_request_id):
pull_request = PullRequest.get_or_404(pull_request_id)
#only owner can delete it !
if pull_request.author.user_id == c.rhodecode_user.user_id:
PullRequestModel().delete(pull_request)
Session().commit()
h.flash(_('Successfully deleted pull request'),
category='success')
return redirect(url('admin_settings_my_account', anchor='pullrequests'))
raise HTTPForbidden()
def _load_compare_data(self, pull_request, enable_comments=True):
"""
Load context data needed for generating compare diff
:param pull_request:
:type pull_request:
"""
org_repo = pull_request.org_repo
(org_ref_type,
org_ref_name,
org_ref_rev) = pull_request.org_ref.split(':')
other_repo = org_repo
(other_ref_type,
other_ref_name,
other_ref_rev) = pull_request.other_ref.split(':')
# despite opening revisions for bookmarks/branches/tags, we always
# convert this to rev to prevent changes after bookmark or branch change
org_ref = ('rev', org_ref_rev)
other_ref = ('rev', other_ref_rev)
c.org_repo = org_repo
c.other_repo = other_repo
c.fulldiff = fulldiff = request.GET.get('fulldiff')
c.cs_ranges = [org_repo.get_changeset(x) for x in pull_request.revisions]
c.statuses = org_repo.statuses([x.raw_id for x in c.cs_ranges])
c.org_ref = org_ref[1]
c.org_ref_type = org_ref[0]
c.other_ref = other_ref[1]
c.other_ref_type = other_ref[0]
diff_limit = self.cut_off_limit if not fulldiff else None
#we swap org/other ref since we run a simple diff on one repo
_diff = diffs.differ(org_repo, other_ref, other_repo, org_ref)
diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
diff_limit=diff_limit)
_parsed = diff_processor.prepare()
c.limited_diff = False
if isinstance(_parsed, LimitedDiffContainer):
c.limited_diff = True
c.files = []
c.changes = {}
c.lines_added = 0
c.lines_deleted = 0
for f in _parsed:
st = f['stats']
if st[0] != 'b':
c.lines_added += st[0]
c.lines_deleted += st[1]
fid = h.FID('', f['filename'])
c.files.append([fid, f['operation'], f['filename'], f['stats']])
diff = diff_processor.as_html(enable_comments=enable_comments,
parsed_lines=[f])
c.changes[fid] = [f['operation'], f['filename'], diff]
def show(self, repo_name, pull_request_id):
repo_model = RepoModel()
c.users_array = repo_model.get_users_js()
c.users_groups_array = repo_model.get_users_groups_js()
c.pull_request = PullRequest.get_or_404(pull_request_id)
c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request)
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 = []
c.pull_request_pending_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))]
else:
c.pull_request_pending_reviewers.append(o.user)
c.pull_request_reviewers.append([o.user, st])
# 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
# load compare data into template context
enable_comments = not c.pull_request.is_closed()
self._load_compare_data(c.pull_request, enable_comments=enable_comments)
# inline comments
c.inline_cnt = 0
c.inline_comments = cc_model.get_inline_comments(
c.rhodecode_db_repo.repo_id,
pull_request=pull_request_id)
# count inline comments
for __, lines in c.inline_comments:
for comments in lines.values():
c.inline_cnt += len(comments)
# comments
c.comments = cc_model.get_comments(c.rhodecode_db_repo.repo_id,
pull_request=pull_request_id)
try:
cur_status = c.statuses[c.pull_request.revisions[0]][0]
except Exception:
log.error(traceback.format_exc())
cur_status = 'undefined'
if c.pull_request.is_closed() and 0:
c.current_changeset_status = cur_status
else:
# changeset(pull-request) status calulation based on reviewers
c.current_changeset_status = cs_model.calculate_status(
c.pull_request_reviewers,
)
c.changeset_statuses = ChangesetStatus.STATUSES
c.as_form = False
c.ancestor = None # there is one - but right here we don't know which
return render('/pullrequests/pullrequest_show.html')
@NotAnonymous()
@jsonify
def comment(self, repo_name, pull_request_id):
pull_request = PullRequest.get_or_404(pull_request_id)
if pull_request.is_closed():
raise HTTPForbidden()
status = request.POST.get('changeset_status')
change_status = request.POST.get('change_changeset_status')
text = request.POST.get('text')
close_pr = request.POST.get('save_close')
allowed_to_change_status = self._get_is_allowed_change_status(pull_request)
if status and change_status and allowed_to_change_status:
_def = (_('Status change -> %s')
% ChangesetStatus.get_status_lbl(status))
if close_pr:
_def = _('Closing with') + ' ' + _def
text = text or _def
comm = ChangesetCommentsModel().create(
text=text,
repo=c.rhodecode_db_repo.repo_id,
user=c.rhodecode_user.user_id,
pull_request=pull_request_id,
f_path=request.POST.get('f_path'),
line_no=request.POST.get('line'),
status_change=(ChangesetStatus.get_status_lbl(status)
if status and change_status
and allowed_to_change_status else None),
closing_pr=close_pr
)
action_logger(self.rhodecode_user,
'user_commented_pull_request:%s' % pull_request_id,
c.rhodecode_db_repo, self.ip_addr, self.sa)
if allowed_to_change_status:
# 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
)
if close_pr:
if status in ['rejected', 'approved']:
PullRequestModel().close_pull_request(pull_request_id)
action_logger(self.rhodecode_user,
'user_closed_pull_request:%s' % pull_request_id,
c.rhodecode_db_repo, self.ip_addr, self.sa)
else:
h.flash(_('Closing pull request on other statuses than '
'rejected or approved forbidden'),
category='warning')
Session().commit()
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')})
return data
@NotAnonymous()
@jsonify
def delete_comment(self, repo_name, comment_id):
co = ChangesetComment.get(comment_id)
if co.pull_request.is_closed():
#don't allow deleting comments on closed pull request
raise HTTPForbidden()
owner = co.author.user_id == c.rhodecode_user.user_id
if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
ChangesetCommentsModel().delete(comment=co)
Session().commit()
return True
else:
raise HTTPForbidden()
|