← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2008-09-01 14:03:34 UTC
  • mto: (3680.1.1 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 3689.
  • Revision ID: jelmer@samba.org-20080901140334-iph5u142g49dv3zu
Use NULL_REVISION rather than None for Repository.revision_tree().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
25
25
    errors,
26
26
    inventory,
27
27
    osutils,
 
28
    revision as _mod_revision,
28
29
    )
29
30
from bzrlib.memorytree import MemoryTree
30
31
from bzrlib.tests import (
966
967
            state.set_parent_trees(
967
968
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
968
969
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
969
 
                 ('ghost-rev', tree2.branch.repository.revision_tree(None))),
 
970
                 ('ghost-rev', tree2.branch.repository.revision_tree(
 
971
                                   _mod_revision.NULL_REVISION))),
970
972
                ['ghost-rev'])
971
973
            self.assertEqual([revid1, revid2, 'ghost-rev'],
972
974
                             state.get_parent_ids())
1603
1605
 
1604
1606
        # *really* cheesy way to just get an empty tree
1605
1607
        repo = self.make_repository('repo')
1606
 
        empty_tree = repo.revision_tree(None)
 
1608
        empty_tree = repo.revision_tree(_mod_revision.NULL_REVISION)
1607
1609
        state.set_parent_trees([('null:', empty_tree)], [])
1608
1610
 
1609
1611
        dirblock_names = [d[0] for d in state._dirblocks]