/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/merge_directive.py

  • Committer: Martin Pool
  • Date: 2008-04-24 07:22:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080424072253-opmjij7xfy38w27f
Remove every assert statement from bzrlib!

Depending on the context they are:

 * turned into an explicit if/raise of either AssertionError 
   or something more specific -- particularly where they protect
   programming interfaces, complex invariants, or data file integrity
 * removed, if they're redundant with a later check, not protecting
   a meaningful invariant
 * turned into a selftest method on tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
273
273
        """
274
274
        _BaseMergeDirective.__init__(self, revision_id, testament_sha1, time,
275
275
            timezone, target_branch, patch, source_branch, message)
276
 
        assert patch_type in (None, 'diff', 'bundle'), patch_type
 
276
        if patch_type not in (None, 'diff', 'bundle'):
 
277
            raise ValueError(patch_type)
277
278
        if patch_type != 'bundle' and source_branch is None:
278
279
            raise errors.NoMergeSource()
279
280
        if patch_type is not None and patch is None: