Merge lp:~abentley/bzr/find-proposal-revid into lp:~abentley/bzr/dev
Status: | Superseded |
---|---|
Proposed branch: | lp:~abentley/bzr/find-proposal-revid |
Merge into: | lp:~abentley/bzr/dev |
Prerequisite: | lp:~abentley/bzr/lucid-launchpadlib |
Diff against target: |
111 lines (+18/-48) 2 files modified
bzrlib/plugins/launchpad/cmds.py (+15/-46) bzrlib/plugins/launchpad/lp_api.py (+3/-2) |
To merge this branch: | bzr merge lp:~abentley/bzr/find-proposal-revid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Aaron Bentley | Pending | ||
Review via email: mp+116009@code.launchpad.net |
This proposal has been superseded by a proposal from 2012-07-23.
Commit message
Look up merge proposals by revision-id.
Description of the change
This branch changes the lp-find-proposal logic to use only the revision-id (not
revno and branch) to look up merge proposals.
Since the previous version used the branch in and revno API requests, it meant that lp-find-proposal only worked when the correct branch was specified. This way, it works no matter how the revision-id is determined.
The old code also required that the revision was on the mainline of the current branch, so for non-mainline revisions, it found the mainline revision that merged them. This code doesn't do that, but the user can prefix their revision spec with "mainline:" to restore that behaviour if it is desirable.