← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

Fix BzrDir.create_workingtree for NULL_REVISION

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
2
 
 
 
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
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
17
17
import os
18
18
import time
19
19
 
 
20
from bzrlib.builtins import merge
20
21
from bzrlib.branch import Branch
21
 
from bzrlib.tests import TestCaseInTempDir
 
22
from bzrlib.tests import TestCaseWithTransport
22
23
from bzrlib.errors import NoCommonAncestor, NoCommits
23
24
from bzrlib.errors import NoSuchRevision
24
 
from bzrlib.clone import copy_branch
25
 
from bzrlib.merge import merge
26
25
from bzrlib.revisionspec import RevisionSpec
27
26
 
28
 
class TestRevisionNamespaces(TestCaseInTempDir):
 
27
 
 
28
class TestRevisionNamespaces(TestCaseWithTransport):
 
29
 
 
30
    def test_revno_n_path(self):
 
31
        """Test revision specifiers.
 
32
 
 
33
        These identify revisions by date, etc."""
 
34
        wta = self.make_branch_and_tree('a')
 
35
        ba = wta.branch
 
36
        
 
37
        wta.commit('Commit one', rev_id='a@r-0-1')
 
38
        wta.commit('Commit two', rev_id='a@r-0-2')
 
39
        wta.commit('Commit three', rev_id='a@r-0-3')
 
40
 
 
41
        wtb = self.make_branch_and_tree('b')
 
42
        bb = wtb.branch
 
43
 
 
44
        wtb.commit('Commit one', rev_id='b@r-0-1')
 
45
        wtb.commit('Commit two', rev_id='b@r-0-2')
 
46
        wtb.commit('Commit three', rev_id='b@r-0-3')
 
47
 
 
48
        self.assertEquals(RevisionSpec('revno:1:a/').in_history(ba),
 
49
                          (1, 'a@r-0-1'))
 
50
        # The argument of in_history should be ignored since it is
 
51
        # redundant with the path in the spec.
 
52
        self.assertEquals(RevisionSpec('revno:1:a/').in_history(None),
 
53
                          (1, 'a@r-0-1'))
 
54
        self.assertEquals(RevisionSpec('revno:1:a/').in_history(bb),
 
55
                          (1, 'a@r-0-1'))
 
56
        self.assertEquals(RevisionSpec('revno:2:b/').in_history(None),
 
57
                          (2, 'b@r-0-2'))
 
58
 
29
59
 
30
60
    def test_revision_namespaces(self):
31
61
        """Test revision specifiers.
32
62
 
33
63
        These identify revisions by date, etc."""
34
 
 
35
 
        b = Branch.initialize(u'.')
36
 
 
37
 
        b.working_tree().commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
38
 
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
39
 
        b.working_tree().commit('Commit three', rev_id='a@r-0-3')
 
64
        wt = self.make_branch_and_tree('.')
 
65
        b = wt.branch
 
66
 
 
67
        wt.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
 
68
        wt.commit('Commit two', rev_id='a@r-0-2')
 
69
        wt.commit('Commit three', rev_id='a@r-0-3')
40
70
 
41
71
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
42
72
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
50
80
 
51
81
        self.assertEquals(RevisionSpec('date:today').in_history(b),
52
82
                          (2, 'a@r-0-2'))
 
83
        self.assertRaises(NoSuchRevision,
 
84
                          RevisionSpec('date:tomorrow').in_history, b)
53
85
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
54
86
                          (1, 'a@r-0-1'))
55
87
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
65
97
                          'a@r-0-3')
66
98
 
67
99
        os.mkdir('newbranch')
68
 
        b2 = Branch.initialize('newbranch')
 
100
        wt2 = self.make_branch_and_tree('newbranch')
 
101
        b2 = wt2.branch
69
102
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
70
103
 
71
 
        os.mkdir('copy')
72
 
        b3 = copy_branch(b, 'copy')
73
 
        b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
 
104
        d3 = b.bzrdir.sprout('copy')
 
105
        b3 = d3.open_branch()
 
106
        wt3 = d3.open_workingtree()
 
107
        wt3.commit('Commit four', rev_id='b@r-0-4')
74
108
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
75
109
                          'a@r-0-3')
76
110
        merge(['copy', -1], [None, None])
77
 
        b.working_tree().commit('Commit five', rev_id='a@r-0-4')
 
111
        wt.commit('Commit five', rev_id='a@r-0-4')
78
112
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
79
113
                          'b@r-0-4')
80
114
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
87
121
    def test_branch_namespace(self):
88
122
        """Ensure that the branch namespace pulls in the requisite content."""
89
123
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
90
 
        branch = Branch.initialize('branch1')
91
 
        branch.working_tree().add(['file'])
92
 
        branch.working_tree().commit('add file')
93
 
        copy_branch(branch, 'branch2')
 
124
        wt = self.make_branch_and_tree('branch1')
 
125
        branch = wt.branch
 
126
        wt.add(['file'])
 
127
        wt.commit('add file')
 
128
        d2 = branch.bzrdir.sprout('branch2')
94
129
        print >> open('branch2/file', 'w'), 'new content'
95
 
        branch2 = Branch.open('branch2')
96
 
        branch2.working_tree().commit('update file', rev_id='A')
 
130
        branch2 = d2.open_branch()
 
131
        d2.open_workingtree().commit('update file', rev_id='A')
97
132
        spec = RevisionSpec('branch:./branch2/.bzr/../')
98
133
        rev_info = spec.in_history(branch)
99
134
        self.assertEqual(rev_info, (None, 'A'))