Merge lp:~powersj/jenkins-launchpad-plugin/fix-git-source-branch into lp:jenkins-launchpad-plugin

Proposed by Joshua Powers
Status: Merged
Approved by: Francis Ginther
Approved revision: 133
Merged at revision: 135
Proposed branch: lp:~powersj/jenkins-launchpad-plugin/fix-git-source-branch
Merge into: lp:jenkins-launchpad-plugin
Diff against target: 12 lines (+1/-1)
1 file modified
jlp/launchpadutils.py (+1/-1)
To merge this branch: bzr merge lp:~powersj/jenkins-launchpad-plugin/fix-git-source-branch
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+326244@code.launchpad.net

Commit message

Return the bazaar source, not target branch

Grabbing the target branch is not the correct behavior here. The correct
behavior is to return the source branch of the MP. The target branch is
what the source is attempting to merge into. Tests should be run on the
source and not target.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jlp/launchpadutils.py'
2--- jlp/launchpadutils.py 2017-02-23 20:25:56 +0000
3+++ jlp/launchpadutils.py 2017-06-23 19:43:28 +0000
4@@ -13,7 +13,7 @@
5 if '+git' in mp.web_link:
6 return mp.source_git_repository.git_identity
7 else:
8- return mp.target_branch.bzr_identity
9+ return mp.source_branch.bzr_identity
10
11 def get_source_branch(mp):
12 if '+git' in mp.web_link:

Subscribers

People subscribed via source and target branches

to all changes: