Merge ~cjwatson/turnip:get-merge-proposal-info into turnip:master

Proposed by Colin Watson
Status: Work in progress
Proposed branch: ~cjwatson/turnip:get-merge-proposal-info
Merge into: turnip:master
Prerequisite: ~cjwatson/turnip:simplify-hookrpc-mp-url
Diff against target: 293 lines (+62/-64)
5 files modified
turnip/pack/hookrpc.py (+14/-13)
turnip/pack/hooks/hook.py (+6/-11)
turnip/pack/tests/fake_servers.py (+8/-8)
turnip/pack/tests/test_hookrpc.py (+18/-19)
turnip/pack/tests/test_hooks.py (+16/-13)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Review via email: mp+448594@code.staging.launchpad.net

Commit message

Use a more general interface for getting merge proposal information

Description of the change

When pushing a branch, we'd like to be able to link to an existing merge proposal if there is one, rather than only ever giving people a URL to create a new merge proposal (which will fail if there's already an active one). The existing `getMergeProposalURL` XML-RPC method can't quite support this, so call a new `getMergeProposalInfo` method that also returns the preceding text.

To post a comment you must log in.
Revision history for this message
Simone Pelosi (pelpsi) wrote :

LGTM!

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches