get-merge-proposal-info : lp:~cjwatson/turnip : Git : Code : turnip

Get this branch:: git clone -b get-merge-proposal-info https://git.launchpad.net/~cjwatson/turnip

Only Colin Watson can upload to this branch. If you are Colin Watson please log in for upload directions.

Branch merges

On hold for merging into turnip:master

Simone Pelosi: Approve on 2023-08-07

Branch information

Name:: get-merge-proposal-info

Repository:: lp:~cjwatson/turnip

Recent commits

fb73b31... by Colin Watson on 2023-08-07

Use a more general interface for getting merge proposal information

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.

LP: #1910680

87c305c... by Colin Watson on 2023-08-07

Simplify getMergeProposalURL fault handling

The XML-RPC fault handling for `getMergeProposalURL` was apparently
copied from `checkRefPermissions`, and included some specific handling
of `NOT_FOUND` and `UNAUTHORIZED` exceptions that isn't needed here; all
it did in this case was change the logging behaviour slightly. Simplify
it.

43f9153... by Colin Watson on 2023-08-04

charm: Fix final part name

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/448495

0df1e34... by Colin Watson on 2023-08-04

charm: Fix final part name

The example in
https://juju.is/docs/sdk/charmcraft-yaml#heading--the-reactive-plugin
calls the final (and in that case only) part "charm". I'd thought that
was just an example. However, as of
https://github.com/canonical/charmcraft/commit/35adadf42c625c5ee5ed6d611c9bdec10413ae59
in charmcraft 2.4.0, calling the final part anything else causes charms
to be misbuilt; they end up containing unmodified copies of the
top-level `actions.yaml`, `config.yaml`, and `metadata.yaml` files
rather than merging the information provided by each layer.

2b5464a... by Colin Watson on 2023-08-03

charm: Add type/description to overridden haproxy_service_options

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/448421

fa76c21... by Colin Watson on 2023-08-03

charm: Add type/description to overridden haproxy_service_options

Copied from `charm/layer/turnip-base/config.yaml`. `charmcraft` seems
to be a bit pickier about this nowadays and is failing if we try to
override just the default values.

0e864e5... by Simone Pelosi on 2023-08-03