engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

events: expose permalink urls for different set of object.

Browse source 
- permalink url should provide a non-changeable url that can be used in
external sources with guarantee of beeing always valid.
This commit is contained in:
Marcin Kuzminski 2017-06-08 16:11:33 +02:00
parent 36f3dd22fb
commit 47f9f32ad9
10 changed files with 107 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rhodecode/events/pullrequest.py
View file

@ -52,6 +52,8 @@ class PullRequestEvent(RepoEvent):
'issues': issues,
'pull_request_id': self.pullrequest.pull_request_id,
'url': PullRequestModel().get_url(self.pullrequest),
'permalink_url': PullRequestModel().get_url(
self.pullrequest, permalink=True),
'status': self.pullrequest.calculated_review_status(),
'commits': commits,
}
@ -131,7 +133,9 @@ class PullRequestCommentEvent(PullRequestEvent):
'type': self.comment.comment_type,
'file': self.comment.f_path,
'line': self.comment.line_no,
'url': CommentsModel().get_url(self.comment)
'url': CommentsModel().get_url(self.comment),
'permalink_url': CommentsModel().get_url(
self.comment, permalink=True),
}
})
return data

24
rhodecode/events/repo.py
View file

@ -35,9 +35,9 @@ def _commits_as_dict(commit_ids, repos):
:param repos: list of repos to check
"""
from rhodecode.lib.utils2 import extract_mentioned_users
from rhodecode.lib import helpers as h
from rhodecode.lib.helpers import (
urlify_commit_message, process_patterns, chop_at_smart)
from rhodecode.model.repo import RepoModel
if not repos:
raise Exception('no repo defined')
@ -54,7 +54,7 @@ def _commits_as_dict(commit_ids, repos):
reviewers = []
for repo in repos:
if not needed_commits:
return commits # return early if we have the commits we need
return commits # return early if we have the commits we need
vcs_repo = repo.scm_instance(cache=False)
try:
@ -63,16 +63,15 @@ def _commits_as_dict(commit_ids, repos):
try:
cs = vcs_repo.get_changeset(commit_id)
except CommitDoesNotExistError:
continue # maybe its in next repo
continue # maybe its in next repo
cs_data = cs.__json__()
cs_data['mentions'] = extract_mentioned_users(cs_data['message'])
cs_data['reviewers'] = reviewers
cs_data['url'] = h.url('changeset_home',
repo_name=repo.repo_name,
revision=cs_data['raw_id'],
qualified=True
)
cs_data['url'] = RepoModel().get_commit_url(
repo, cs_data['raw_id'])
cs_data['permalink_url'] = RepoModel().get_commit_url(
repo, cs_data['raw_id'], permalink=True)
urlified_message, issues_data = process_patterns(
cs_data['message'], repo.repo_name)
cs_data['issues'] = issues_data
@ -130,6 +129,7 @@ class RepoEvent(RhodecodeEvent):
'repo_name': self.repo.repo_name,
'repo_type': self.repo.repo_type,
'url': RepoModel().get_url(self.repo),
'permalink_url': RepoModel().get_url(self.repo, permalink=True),
'extra_fields': extra_fields
}
})
@ -242,7 +242,10 @@ class RepoPushEvent(RepoVCSEvent):
def as_dict(self):
data = super(RepoPushEvent, self).as_dict()
branch_url = repo_url = data['repo']['url']
def branch_url(branch_name):
return '{}/changelog?branch={}'.format(
data['repo']['url'], branch_name)
commits = _commits_as_dict(
commit_ids=self.pushed_commit_ids, repos=[self.repo])
@ -258,8 +261,7 @@ class RepoPushEvent(RepoVCSEvent):
branches = [
{
'name': branch,
'url': '{}/changelog?branch={}'.format(
data['repo']['url'], branch)
'url': branch_url(branch)
}
for branch in branches
]