← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2011-10-25 04:43:18 UTC
  • mto: This revision was merged to the branch mainline in revision 14238.
  • Revision ID: mbp@canonical.com-20111025044318-4ylr3sky7jff41li
Move branchmergeproposaljob errors to errors.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/branchmergeproposaljob.py
13
13
 
14
14
 
15
15
__all__ = [
16
 
    'BranchHasPendingWrites',
17
16
    'BranchMergeProposalJob',
18
17
    'BranchMergeProposalJobFactory',
19
18
    'BranchMergeProposalJobSource',
73
72
    )
74
73
from lp.code.adapters.branch import BranchMergeProposalDelta
75
74
from lp.code.enums import BranchType
 
75
from lp.code.errors import (
 
76
    BranchHasPendingWrites,
 
77
    UpdatePreviewDiffNotReady,
 
78
    )
76
79
from lp.code.interfaces.branchmergeproposal import (
77
80
    IBranchMergeProposalJob,
78
81
    IBranchMergeProposalJobSource,
329
332
             self.branch_merge_proposal.target_branch.bzr_identity))
330
333
 
331
334
 
332
 
class UpdatePreviewDiffNotReady(Exception):
333
 
    """Raised if the the preview diff is not ready to run."""
334
 
 
335
 
 
336
 
class BranchHasPendingWrites(Exception):
337
 
    """Raised if the branch can't be processed because a write is pending.
338
 
 
339
 
    In this case the operation can usually be retried in a while.
340
 
 
341
 
    See bug 612171.
342
 
    """
343
 
 
344
 
 
345
335
class UpdatePreviewDiffJob(BranchMergeProposalJobDerived):
346
336
    """A job to update the preview diff for a branch merge proposal.
347
337