/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: Aaron Bentley
  • Date: 2010-11-23 14:54:33 UTC
  • mto: This revision was merged to the branch mainline in revision 5549.
  • Revision ID: aaron@aaronbentley.com-20101123145433-i231qdd7v9t6yf5t
Cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
396
396
        b.lock_read()
397
397
        try:
398
398
            revno = self._find_merged_revno(revision, b, pb)
399
 
            service = lp_registration.LaunchpadService()
400
 
            launchpad = lp_api.login(service)
401
 
            pb.update('Finding Launchpad branch')
402
 
            lpb = lp_api.LaunchpadBranch.from_bzr(launchpad, b,
403
 
                                                  create_missing=False)
404
 
            pb.update('Finding proposals')
405
 
            merged = list(lpb.lp.getMergeProposals(status=['Merged'],
406
 
                                                   merged_revnos=[revno]))
 
399
            merged = self._find_proposals(revno, b, pb)
407
400
            if len(merged) == 0:
408
401
                raise BzrCommandError('No review found.')
409
402
            trace.note('%d proposals(s) found.' % len(merged))
431
424
        pb.update('Finding revno')
432
425
        return b.revision_id_to_revno(merging_revision)
433
426
 
 
427
    def _find_proposals(self, revno, b, pb):
 
428
        launchpad = lp_api.login(lp_registration.LaunchpadService())
 
429
        pb.update('Finding Launchpad branch')
 
430
        lpb = lp_api.LaunchpadBranch.from_bzr(launchpad, b,
 
431
                                              create_missing=False)
 
432
        pb.update('Finding proposals')
 
433
        return list(lpb.lp.getMergeProposals(status=['Merged'],
 
434
                                             merged_revnos=[revno]))
 
435
 
 
436
 
434
437
    @staticmethod
435
438
    def _is_revno_spec(spec):
436
439
        try: