← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/__init__.py
47
47
lazy_import(globals(), """
48
48
from bzrlib import (
49
49
    branch as _mod_branch,
50
 
    errors,
51
50
    ui,
52
51
    trace,
53
52
    )
55
54
 
56
55
from bzrlib import bzrdir
57
56
from bzrlib.commands import (
58
 
        Command,
59
 
        register_command,
60
 
)
 
57
    Command,
 
58
    register_command,
 
59
    )
61
60
from bzrlib.directory_service import directories
62
61
from bzrlib.errors import (
63
62
    BzrCommandError,
64
 
    DependencyNotPresent,
 
63
    InvalidRevisionSpec,
65
64
    InvalidURL,
66
65
    NoPublicBranch,
67
66
    NotBranchError,
421
420
            merging_revision = graph.find_lefthand_merger(
422
421
                revision_id, b.last_revision())
423
422
            if merging_revision is None:
424
 
                raise errors.InvalidRevisionSpec(revision[0].user_spec, b)
 
423
                raise InvalidRevisionSpec(revision[0].user_spec, b)
425
424
        pb.update('Finding revno')
426
425
        return b.revision_id_to_revno(merging_revision)
427
426