Merge lp:~jml/bzr/rubberstamp into lp:bzr
Proposed by
Jonathan Lange
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6571 |
Proposed branch: | lp:~jml/bzr/rubberstamp |
Merge into: | lp:bzr |
Diff against target: |
86 lines (+30/-3) 3 files modified
bzrlib/plugins/launchpad/cmds.py (+2/-1) bzrlib/plugins/launchpad/lp_propose.py (+19/-1) doc/en/release-notes/bzr-2.6.txt (+9/-1) |
To merge this branch: | bzr merge lp:~jml/bzr/rubberstamp |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Review via email: mp+130850@code.launchpad.net |
Commit message
Set approved revision and vote "Approve" when using lp-propose --approve
Description of the change
The common use case for me using lp-propose --approve is when I'm creating a merge proposal that will then be taken up by another system, like tarmac, for processing and landing.
This branch caters to that use case by voting "Approve" and by setting the approved revision. Both of these enable the default tarmac set up to land the merge proposal. Altogether, this makes 'lp-propose --approve' something of a rubberstamping operation.
To post a comment you must log in.
That seems like a good feature? Could anyone be surprised by the change and
want the old behavior? Maybe not.
It should be in NEWS.
vote approve
On 23 Oct 2012 03:30, "Jonathan Lange" <email address hidden> wrote:
> Jonathan Lange has proposed merging lp:~jml/bzr/rubberstamp into lp:bzr. /code.launchpad .net/~jml/ bzr/rubberstamp /+merge/ 130850 /code.launchpad .net/~jml/ bzr/rubberstamp /+merge/ 130850 plugins/ launchpad/ cmds.py' plugins/ launchpad/ cmds.py 2012-07-23 19:19:05 +0000 plugins/ launchpad/ cmds.py 2012-10-22 16:29:21 +0000 'review' , short_name='R', type=unicode, plugins/ launchpad/ lp_propose. py' plugins/ launchpad/ lp_propose. py 2012-02-26 15:43:02 +0000 plugins/ launchpad/ lp_propose. py 2012-10-22 16:29:21 +0000 revid(self) : branch. bzr branch. lock_read( ) branch. last_revision( ) branch. unlock( ) self): branch. lp.self_ link == branch. lp.self_ link: append( line) ''.join( error_lines) ) proposal( self, mp): source_ revid() webservice( u"Rubberstamp! Proposer approve...
>
> Commit message:
> Set approved revision and vote "Approve" when using lp-propose --approve
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https:/
>
> The common use case for me using lp-propose --approve is when I'm creating
> a merge proposal that will then be taken up by another system, like tarmac,
> for processing and landing.
>
> This branch caters to that use case by voting "Approve" and by setting the
> approved revision. Both of these enable the default tarmac set up to land
> the merge proposal. Altogether, this makes 'lp-propose --approve'
> something of a rubberstamping operation.
>
>
> --
> https:/
> Your team bzr-core is requested to review the proposed merge of
> lp:~jml/bzr/rubberstamp into lp:bzr.
>
> === modified file 'bzrlib/
> --- bzrlib/
> +++ bzrlib/
> @@ -293,7 +293,8 @@
> Option('message', short_name='m', type=unicode,
> help='Commit message.'),
> Option('approve',
> - help='Mark the proposal as approved
> immediately.'),
> + help=('Mark the proposal as approved
> immediately, '
> + 'setting the approved revision to
> tip.')),
> Option('fixes', 'The bug this proposal fixes.', str),
> ListOption(
> help='Requested reviewer and optional type.')]
>
> === modified file 'bzrlib/
> --- bzrlib/
> +++ bzrlib/
> @@ -137,6 +137,15 @@
> })
> return body
>
> + def get_source_
> + """Get the revision ID of the source branch."""
> + source_branch = self.source_
> + source_
> + try:
> + return source_
> + finally:
> + source_
> +
> def check_proposal(
> """Check that the submission is sensible."""
> if self.source_
> self.target_
> @@ -180,6 +189,15 @@
> error_lines.
> raise Exception(
>
> + def approve_
> + revid = self.get_
> + self.call_
> + mp.createComment,
> + vote=u'Approve',
> + subject='', # Use the default subject.
> + content=