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

pr-shadow: Adapt to new merge response object.

Browse source
This commit is contained in:
Martin Bornhold 2016-10-23 16:03:46 +02:00
parent 929f1ab661
commit ff69018a3e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rhodecode/model/pull_request.py
View file

@ -450,7 +450,7 @@ class PullRequestModel(BaseModel):
return merge_state
def _comment_and_close_pr(self, pull_request, user, merge_state):
pull_request.merge_rev = merge_state.merge_commit_id
pull_request.merge_rev = merge_state.merge_ref.commit_id
pull_request.updated_on = datetime.datetime.now()
ChangesetCommentsModel().create(
@ -598,7 +598,7 @@ class PullRequestModel(BaseModel):
version._last_merge_source_rev = pull_request._last_merge_source_rev
version._last_merge_target_rev = pull_request._last_merge_target_rev
version._last_merge_status = pull_request._last_merge_status
version.last_merge_rev = pull_request.last_merge_rev
version.shadow_merge_ref = pull_request.shadow_merge_ref
version.merge_rev = pull_request.merge_rev
version.revisions = pull_request.revisions
@ -1010,7 +1010,7 @@ class PullRequestModel(BaseModel):
pull_request.source_ref_parts.commit_id
pull_request._last_merge_target_rev = target_reference.commit_id
pull_request._last_merge_status = merge_state.failure_reason
pull_request.last_merge_rev = merge_state.merge_commit_id
pull_request.shadow_merge_ref = merge_state.merge_ref
Session().add(pull_request)
Session().commit()

6
rhodecode/templates/pullrequests/pullrequest_show.html
View file

@ -102,7 +102,7 @@
</div>
## Link to the shadow repository.
%if not c.pull_request.is_closed() and c.pull_request.last_merge_rev:
%if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
<div class="field">
<div class="label-summary">
<label>Merge:</label>
@ -110,9 +110,9 @@
<div class="input">
<div class="pr-mergeinfo">
%if h.is_hg(c.pull_request.target_repo):
<input type="text" value="hg clone -u pr-merge ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
<input type="text" value="hg clone -u ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
%elif h.is_git(c.pull_request.target_repo):
<input type="text" value="git clone --branch pr-merge ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
<input type="text" value="git clone --branch ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
%endif
</div>
</div>