← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

  • Committer: Robert Collins
  • Date: 2006-06-26 16:23:10 UTC
  • mfrom: (1780.2.1 misc-fixen)
  • mto: This revision was merged to the branch mainline in revision 1815.
  • Revision ID: robertc@robertcollins.net-20060626162310-98f5b55b8cc19d46
(robertc) Misc minor typos and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
1
 
# Copyright (C) 2004, 2005 by Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006 by 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
16
16
 
17
17
import os
18
18
import time
19
 
from bzrlib.selftest import TestCaseInTempDir
 
19
 
 
20
from bzrlib.builtins import merge
 
21
from bzrlib.branch import Branch
 
22
from bzrlib.tests import TestCaseWithTransport
20
23
from bzrlib.errors import NoCommonAncestor, NoCommits
21
 
from bzrlib.clone import copy_branch
22
 
from bzrlib.merge import merge
23
 
 
24
 
class TestRevisionNamespaces(TestCaseInTempDir):
 
24
from bzrlib.errors import NoSuchRevision
 
25
from bzrlib.revisionspec import RevisionSpec
 
26
 
 
27
 
 
28
class TestRevisionNamespaces(TestCaseWithTransport):
25
29
 
26
30
    def test_revision_namespaces(self):
27
31
        """Test revision specifiers.
28
32
 
29
33
        These identify revisions by date, etc."""
30
 
        from bzrlib.errors import NoSuchRevision
31
 
        from bzrlib.branch import Branch
32
 
        from bzrlib.revisionspec import RevisionSpec
33
 
 
34
 
        b = Branch.initialize('.')
35
 
 
36
 
        b.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
37
 
        b.commit('Commit two', rev_id='a@r-0-2')
38
 
        b.commit('Commit three', rev_id='a@r-0-3')
 
34
        wt = self.make_branch_and_tree('.')
 
35
        b = wt.branch
 
36
 
 
37
        wt.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
 
38
        wt.commit('Commit two', rev_id='a@r-0-2')
 
39
        wt.commit('Commit three', rev_id='a@r-0-3')
39
40
 
40
41
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
41
42
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
49
50
 
50
51
        self.assertEquals(RevisionSpec('date:today').in_history(b),
51
52
                          (2, 'a@r-0-2'))
 
53
        self.assertRaises(NoSuchRevision,
 
54
                          RevisionSpec('date:tomorrow').in_history, b)
52
55
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
53
56
                          (1, 'a@r-0-1'))
54
57
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
64
67
                          'a@r-0-3')
65
68
 
66
69
        os.mkdir('newbranch')
67
 
        b2 = Branch.initialize('newbranch')
 
70
        wt2 = self.make_branch_and_tree('newbranch')
 
71
        b2 = wt2.branch
68
72
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
69
73
 
70
 
        os.mkdir('copy')
71
 
        b3 = copy_branch(b, 'copy')
72
 
        b3.commit('Commit four', rev_id='b@r-0-4')
 
74
        d3 = b.bzrdir.sprout('copy')
 
75
        b3 = d3.open_branch()
 
76
        wt3 = d3.open_workingtree()
 
77
        wt3.commit('Commit four', rev_id='b@r-0-4')
73
78
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
74
79
                          'a@r-0-3')
75
80
        merge(['copy', -1], [None, None])
76
 
        b.commit('Commit five', rev_id='a@r-0-4')
 
81
        wt.commit('Commit five', rev_id='a@r-0-4')
77
82
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
78
83
                          'b@r-0-4')
79
84
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
80
85
                          'b@r-0-4')
 
86
 
 
87
        # This should be in the revision store, but not in revision-history
 
88
        self.assertEquals((None, 'b@r-0-4'),
 
89
                RevisionSpec('revid:b@r-0-4').in_history(b))
 
90
 
 
91
    def test_branch_namespace(self):
 
92
        """Ensure that the branch namespace pulls in the requisite content."""
 
93
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
 
94
        wt = self.make_branch_and_tree('branch1')
 
95
        branch = wt.branch
 
96
        wt.add(['file'])
 
97
        wt.commit('add file')
 
98
        d2 = branch.bzrdir.sprout('branch2')
 
99
        print >> open('branch2/file', 'w'), 'new content'
 
100
        branch2 = d2.open_branch()
 
101
        d2.open_workingtree().commit('update file', rev_id='A')
 
102
        spec = RevisionSpec('branch:./branch2/.bzr/../')
 
103
        rev_info = spec.in_history(branch)
 
104
        self.assertEqual(rev_info, (None, 'A'))
 
105