← 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-10-04 11:13:33 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1403.
  • Revision ID: mbp@sourcefrog.net-20051004111332-f7b8a6bd41b9fe22
- tweak capture_tree formatting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
1
 
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
2
 
#
 
1
# Copyright (C) 2004, 2005 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
16
16
 
17
17
import os
18
18
import time
19
 
 
20
 
from bzrlib.builtins import merge
21
 
from bzrlib.branch import Branch
22
 
from bzrlib.tests import TestCaseWithTransport
 
19
from bzrlib.selftest import TestCaseInTempDir
23
20
from bzrlib.errors import NoCommonAncestor, NoCommits
24
 
from bzrlib.errors import NoSuchRevision
25
 
from bzrlib.revisionspec import RevisionSpec
26
 
 
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
 
 
 
21
from bzrlib.clone import copy_branch
 
22
from bzrlib.merge import merge
 
23
 
 
24
class TestRevisionNamespaces(TestCaseInTempDir):
59
25
 
60
26
    def test_revision_namespaces(self):
61
27
        """Test revision specifiers.
62
28
 
63
29
        These identify revisions by date, etc."""
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')
 
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')
70
39
 
71
40
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
72
41
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
80
49
 
81
50
        self.assertEquals(RevisionSpec('date:today').in_history(b),
82
51
                          (2, 'a@r-0-2'))
83
 
        self.assertRaises(NoSuchRevision,
84
 
                          RevisionSpec('date:tomorrow').in_history, b)
85
52
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
86
53
                          (1, 'a@r-0-1'))
87
54
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
97
64
                          'a@r-0-3')
98
65
 
99
66
        os.mkdir('newbranch')
100
 
        wt2 = self.make_branch_and_tree('newbranch')
101
 
        b2 = wt2.branch
 
67
        b2 = Branch.initialize('newbranch')
102
68
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
103
69
 
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')
 
70
        os.mkdir('copy')
 
71
        b3 = copy_branch(b, 'copy')
 
72
        b3.commit('Commit four', rev_id='b@r-0-4')
108
73
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
109
74
                          'a@r-0-3')
110
75
        merge(['copy', -1], [None, None])
111
 
        wt.commit('Commit five', rev_id='a@r-0-4')
 
76
        b.commit('Commit five', rev_id='a@r-0-4')
112
77
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
113
78
                          'b@r-0-4')
114
79
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
115
80
                          'b@r-0-4')
116
 
 
117
 
        # This should be in the revision store, but not in revision-history
118
 
        self.assertEquals((None, 'b@r-0-4'),
119
 
                RevisionSpec('revid:b@r-0-4').in_history(b))
120
 
 
121
 
    def test_branch_namespace(self):
122
 
        """Ensure that the branch namespace pulls in the requisite content."""
123
 
        self.build_tree(['branch1/', 'branch1/file', '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')
129
 
        print >> open('branch2/file', 'w'), 'new content'
130
 
        branch2 = d2.open_branch()
131
 
        d2.open_workingtree().commit('update file', rev_id='A')
132
 
        spec = RevisionSpec('branch:./branch2/.bzr/../')
133
 
        rev_info = spec.in_history(branch)
134
 
        self.assertEqual(rev_info, (None, 'A'))
135