← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Martin Pool
  • Date: 2005-08-11 18:02:01 UTC
  • Revision ID: mbp@sourcefrog.net-20050811180201-a140c481693ba96c
- fix mdiff handling of files without a trailing newline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
18
 
import time
19
 
 
20
 
from bzrlib.branch import Branch
21
 
from bzrlib.tests import TestCaseInTempDir
22
 
from bzrlib.errors import NoCommonAncestor, NoCommits
23
 
from bzrlib.errors import NoSuchRevision
24
 
from bzrlib.merge import merge
25
 
from bzrlib.revisionspec import RevisionSpec
26
 
 
27
 
class TestRevisionNamespaces(TestCaseInTempDir):
28
 
 
29
 
    def test_revision_namespaces(self):
30
 
        """Test revision specifiers.
31
 
 
32
 
        These identify revisions by date, etc."""
33
 
 
34
 
        b = Branch.initialize(u'.')
35
 
 
36
 
        b.working_tree().commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
37
 
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
38
 
        b.working_tree().commit('Commit three', rev_id='a@r-0-3')
39
 
 
40
 
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
41
 
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
42
 
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
43
 
                          (1, 'a@r-0-1'))
44
 
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
45
 
                          (1, 'a@r-0-1'))
46
 
        self.assertRaises(NoSuchRevision,
47
 
                          RevisionSpec('revid:a@r-0-0').in_history, b)
48
 
        self.assertRaises(TypeError, RevisionSpec, object)
49
 
 
50
 
        self.assertEquals(RevisionSpec('date:today').in_history(b),
51
 
                          (2, 'a@r-0-2'))
52
 
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
53
 
                          (1, 'a@r-0-1'))
54
 
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
55
 
                          (1, 'a@r-0-1'))
56
 
 
57
 
        self.assertEquals(RevisionSpec('last:1').in_history(b),
58
 
                          (3, 'a@r-0-3'))
59
 
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
60
 
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
61
 
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
62
 
 
63
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
64
 
                          'a@r-0-3')
65
 
 
66
 
        os.mkdir('newbranch')
67
 
        b2 = Branch.initialize('newbranch')
68
 
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
69
 
 
70
 
        os.mkdir('copy')
71
 
        b3 = b.clone('copy')
72
 
        b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
73
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
74
 
                          'a@r-0-3')
75
 
        merge(['copy', -1], [None, None])
76
 
        b.working_tree().commit('Commit five', rev_id='a@r-0-4')
77
 
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
78
 
                          'b@r-0-4')
79
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
80
 
                          'b@r-0-4')
81
 
 
82
 
        # This should be in the revision store, but not in revision-history
83
 
        self.assertEquals((None, 'b@r-0-4'),
84
 
                RevisionSpec('revid:b@r-0-4').in_history(b))
85
 
 
86
 
    def test_branch_namespace(self):
87
 
        """Ensure that the branch namespace pulls in the requisite content."""
88
 
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
89
 
        branch = Branch.initialize('branch1')
90
 
        branch.working_tree().add(['file'])
91
 
        branch.working_tree().commit('add file')
92
 
        branch.clone('branch2')
93
 
        print >> open('branch2/file', 'w'), 'new content'
94
 
        branch2 = Branch.open('branch2')
95
 
        branch2.working_tree().commit('update file', rev_id='A')
96
 
        spec = RevisionSpec('branch:./branch2/.bzr/../')
97
 
        rev_info = spec.in_history(branch)
98
 
        self.assertEqual(rev_info, (None, 'A'))
99
 
 
 
17
 
 
18
from bzrlib.selftest import InTempDir, TestBase
 
19
 
 
20
class TestRevisionNamespaces(InTempDir):
 
21
    """Functional tests for hashcache"""
 
22
    def runTest(self):
 
23
        from bzrlib.errors import BzrError
 
24
        from bzrlib.branch import Branch
 
25
        import os
 
26
        import time
 
27
 
 
28
        b = Branch('.', init=True)
 
29
 
 
30
        b.commit('Commit one', rev_id='a@r-0-1')
 
31
        b.commit('Commit two', rev_id='a@r-0-2')
 
32
        b.commit('Commit three', rev_id='a@r-0-3')
 
33
 
 
34
        self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
 
35
        self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
 
36
        self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
 
37
        self.assertRaises(BzrError, b.get_revision_info, 'revid:a@r-0-0')
 
38
 
 
39
        self.assertEquals(b.get_revision_info('date:-tomorrow'), (3, 'a@r-0-3'))
 
40
        self.assertEquals(b.get_revision_info('date:+today'), (1, 'a@r-0-1'))
 
41
 
 
42
        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 
43
 
 
44
TEST_CLASSES = [
 
45
    TestRevisionNamespaces
 
46
    ]