Merge lp:~jelmer/brz/propose-sets-submit into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/propose-sets-submit
Merge into: lp:brz
Diff against target: 30 lines (+2/-1)
2 files modified
breezy/plugins/propose/cmds.py (+2/-0)
breezy/plugins/propose/github.py (+0/-1)
To merge this branch: bzr merge lp:~jelmer/brz/propose-sets-submit
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+368883@code.launchpad.net

Commit message

Set the submit branch after 'brz publish' / 'brz propose'

Description of the change

Set the submit branch after 'brz publish' / 'brz propose'

Remove an undefined decorator from the github module in brz-propose.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Looks good, thanks!

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/propose/cmds.py'
2--- breezy/plugins/propose/cmds.py 2019-06-15 11:54:12 +0000
3+++ breezy/plugins/propose/cmds.py 2019-06-16 15:51:50 +0000
4@@ -91,6 +91,7 @@
5 overwrite=overwrite)
6 local_branch.set_push_location(remote_branch.user_url)
7 local_branch.set_public_branch(public_url)
8+ local_branch.set_submit_branch(submit_branch.user_url)
9 note(gettext("Pushed to %s") % public_url)
10
11
12@@ -178,6 +179,7 @@
13 remote_branch, public_branch_url = hoster.publish_derived(
14 branch, target, name=name, allow_lossy=not no_allow_lossy)
15 branch.set_push_location(remote_branch.user_url)
16+ branch.set_submit_branch(target.user_url)
17 note(gettext('Published branch to %s') % public_branch_url)
18 if prerequisite is not None:
19 prerequisite_branch = _mod_branch.Branch.open(prerequisite)
20
21=== modified file 'breezy/plugins/propose/github.py'
22--- breezy/plugins/propose/github.py 2019-06-16 12:04:31 +0000
23+++ breezy/plugins/propose/github.py 2019-06-16 15:51:50 +0000
24@@ -364,7 +364,6 @@
25 yield GitHubMergeProposal(
26 self.transport.request('GET', issue['pull_request']['url']).json)
27
28- @convert_github_error
29 def get_proposal_by_url(self, url):
30 raise UnsupportedHoster(url)
31

Subscribers

People subscribed via source and target branches