~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
    )
24
24
from bzrlib.branch import Branch
25
25
from bzrlib.errors import NoSuchRevision
26
 
from bzrlib.graph import Graph
 
26
from bzrlib.deprecated_graph import Graph
27
27
from bzrlib.revision import (find_present_ancestors, combined_graph,
28
28
                             common_ancestor,
29
29
                             is_ancestor, MultipleRevisionSources,
296
296
        self.assertEqual({'B':['A'],
297
297
                          'A':[]},
298
298
                         source.get_revision_graph('B'))
 
299
 
 
300
 
 
301
class TestReservedId(TestCase):
 
302
 
 
303
    def test_is_reserved_id(self):
 
304
        self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
 
305
        self.assertEqual(True, revision.is_reserved_id(
 
306
            revision.CURRENT_REVISION))
 
307
        self.assertEqual(True, revision.is_reserved_id('arch:'))
 
308
        self.assertEqual(False, revision.is_reserved_id('null'))
 
309
        self.assertEqual(False, revision.is_reserved_id(
 
310
            'arch:a@example.com/c--b--v--r'))
 
311
        self.assertEqual(False, revision.is_reserved_id(None))