← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-08 07:05:00 UTC
  • mfrom: (3376.2.15 no-asserts)
  • Revision ID: pqm@pqm.ubuntu.com-20080508070500-9zyyvsk0eev20t4w
(mbp) remove and disallow assert statements

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1284
1284
            last_revision = wt.last_revision()
1285
1285
 
1286
1286
        revision_ids = b.repository.get_ancestry(last_revision)
1287
 
        assert revision_ids[0] is None
1288
1287
        revision_ids.pop(0)
1289
1288
        for revision_id in revision_ids:
1290
1289
            self.outf.write(revision_id + '\n')
1709
1708
            message=None,
1710
1709
            limit=None):
1711
1710
        from bzrlib.log import show_log
1712
 
        assert message is None or isinstance(message, basestring), \
1713
 
            "invalid message argument %r" % message
1714
1711
        direction = (forward and 'forward') or 'reverse'
1715
1712
        
1716
1713
        # log everything
2906
2903
            merger.show_base = show_base
2907
2904
            self.sanity_check_merger(merger)
2908
2905
            if (merger.base_rev_id == merger.other_rev_id and
2909
 
                merger.other_rev_id != None):
 
2906
                merger.other_rev_id is not None):
2910
2907
                note('Nothing to do.')
2911
2908
                return 0
2912
2909
            if pull:
2967
2964
                                possible_transports, pb):
2968
2965
        """Produce a merger from a location, assuming it refers to a branch."""
2969
2966
        from bzrlib.tag import _merge_tags_if_possible
2970
 
        assert revision is None or len(revision) < 3
2971
2967
        # find the branch locations
2972
2968
        other_loc, user_location = self._select_branch_location(tree, location,
2973
2969
            revision, -1)