/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/__init__.py
53
53
 
54
54
from bzrlib import (
55
55
    branch as _mod_branch,
56
 
    bzrdir,
57
56
    config as _mod_config,
 
57
    controldir,
58
58
    lazy_regex,
59
59
    # Since we are a built-in plugin we share the bzrlib version
60
60
    version_info,
342
342
                            help='Commit message.'),
343
343
                     Option('approve',
344
344
                            help='Mark the proposal as approved immediately.'),
 
345
                     Option('fixes', 'The bug this proposal fixes.', str),
345
346
                     ListOption('review', short_name='R', type=unicode,
346
347
                            help='Requested reviewer and optional type.')]
347
348
 
350
351
    aliases = ['lp-submit', 'lp-propose']
351
352
 
352
353
    def run(self, submit_branch=None, review=None, staging=False,
353
 
            message=None, approve=False):
 
354
            message=None, approve=False, fixes=None):
354
355
        from bzrlib.plugins.launchpad import lp_propose
355
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
 
356
        tree, branch, relpath = controldir.ControlDir.open_containing_tree_or_branch(
356
357
            '.')
357
358
        if review is None:
358
359
            reviews = None
370
371
        else:
371
372
            target = _mod_branch.Branch.open(submit_branch)
372
373
        proposer = lp_propose.Proposer(tree, branch, target, message,
373
 
                                       reviews, staging, approve=approve)
 
374
                                       reviews, staging, approve=approve,
 
375
                                       fixes=fixes)
374
376
        proposer.check_proposal()
375
377
        proposer.create_proposal()
376
378