← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/model/branch.py

  • Committer: Adi Roiban
  • Date: 2009-12-22 10:04:46 UTC
  • mfrom: (10071 launchpad)
  • mto: This revision was merged to the branch mainline in revision 10075.
  • Revision ID: adi@roiban.ro-20091222100446-l0ugi9hczy2ssa8t
Merged devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/branch.py
47
47
from lp.code.enums import (
48
48
    BranchLifecycleStatus, BranchMergeControlStatus,
49
49
    BranchMergeProposalStatus, BranchType)
 
50
from lp.code.errors import (
 
51
    BranchMergeProposalExists, InvalidBranchMergeProposal)
50
52
from lp.code.mail.branch import send_branch_modified_notifications
51
53
from lp.code.model.branchmergeproposal import (
52
54
     BranchMergeProposal, BranchMergeProposalGetter)
63
65
from lp.code.interfaces.branchcollection import IAllBranches
64
66
from lp.code.interfaces.branchlookup import IBranchLookup
65
67
from lp.code.interfaces.branchmergeproposal import (
66
 
     BRANCH_MERGE_PROPOSAL_FINAL_STATES, BranchMergeProposalExists,
67
 
     InvalidBranchMergeProposal)
 
68
     BRANCH_MERGE_PROPOSAL_FINAL_STATES)
68
69
from lp.code.interfaces.branchnamespace import IBranchNamespacePolicy
69
70
from lp.code.interfaces.branchpuller import IBranchPuller
70
71
from lp.code.interfaces.branchtarget import IBranchTarget