Bazaar

Merge lp://staging/~abentley/bzr/find-proposal-branch into lp://staging/bzr

  1. find-proposal-branch
  2. Merge into bzr.dev
Proposed by Aaron Bentley
Status: Rejected
Rejected by: Aaron Bentley
Proposed branch: lp://staging/~abentley/bzr/find-proposal-branch
Merge into: lp://staging/bzr
Diff against target: 192 lines (+119/-10)
3 files modified
bzrlib/plugins/launchpad/__init__.py (+1/-0)
bzrlib/plugins/launchpad/cmds.py (+28/-10)
bzrlib/plugins/launchpad/test_cmds.py (+90/-0)
To merge this branch: bzr merge lp://staging/~abentley/bzr/find-proposal-branch
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
Review via email: mp+110615@code.staging.launchpad.net

Commit message

Add BRANCH option to the lp-find-proposal command.

Description of the change

This branch adds an optional BRANCH argument to the lp-find-proposal command.

lp-find-proposal must search the branch that any proposals were targetted against; LP does not provide a mechanism that uses solely the revision-id. This means that often, the current branch is not a suitable place to look up proposals, so it makes sense to permit an override.

At the same time, this branch introduces testing for launchpad plugin commands, starting with lp-find-proposal. Until now, these commands have gone untested, because they use Launchpad. This meant that they didn't have a way to set up test objects, and they incurred network traffic. This approach uses a fake, in-memory version of the Launchpadlib API. Only necessary functionality is implemented.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks, nice to have some extra testing.

There's an extra dot in """Specified branch is used.."""

Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve (code)
lp://staging/~abentley/bzr/find-proposal-branch updated
6528. By Aaron Bentley

Merged dev into find-proposal-branch.

6529. By Aaron Bentley

Update from review.

6530. By Aaron Bentley

Merged dev into find-proposal-branch.

Revision history for this message
Martin Packman (gz) wrote :

sent to pqm by email

Revision history for this message
Aaron Bentley (abentley) wrote :

This branch can't land because it requires launchpadlib on the build slave. But it doesn't need to land, because as of r6541 the branch is no longer considered when looking up merge proposals.

Martin Packman <email address hidden> wrote:

>The proposal to merge lp:~abentley/bzr/find-proposal-branch into lp:bzr has been updated.
>
> Status: Needs review => Approved
>
>For more details, see:
>https://code.launchpad.net/~abentley/bzr/find-proposal-branch/+merge/110615
>--
>https://code.launchpad.net/~abentley/bzr/find-proposal-branch/+merge/110615
>You are the owner of lp:~abentley/bzr/find-proposal-branch.
>

Revision history for this message
Martin Packman (gz) wrote :

Thanks Aaron, wondered why there was an approved branch from you sitting around unmerged.

Unmerged revisions

6530. By Aaron Bentley

Merged dev into find-proposal-branch.

6529. By Aaron Bentley

Update from review.

6528. By Aaron Bentley

Merged dev into find-proposal-branch.

6527. By Aaron Bentley

Cleanup.

6526. By Aaron Bentley

Support specifying branch for lp-find-proposal.

6525. By Aaron Bentley

Add tests of default behaviour.

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.