1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
1
# Copyright (C) 2004, 2005 by Canonical Ltd
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.
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.
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
20
from bzrlib.builtins import merge
21
from bzrlib.branch import Branch
22
from bzrlib.tests import TestCaseWithTransport
23
from bzrlib.errors import NoCommonAncestor, NoCommits
24
from bzrlib.errors import NoSuchRevision
25
from bzrlib.revisionspec import RevisionSpec
28
class TestRevisionNamespaces(TestCaseWithTransport):
30
def test_revno_n_path(self):
31
"""Test revision specifiers.
33
These identify revisions by date, etc."""
34
wta = self.make_branch_and_tree('a')
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')
41
wtb = self.make_branch_and_tree('b')
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')
48
self.assertEquals(RevisionSpec('revno:1:a/').in_history(ba),
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),
54
self.assertEquals(RevisionSpec('revno:1:a/').in_history(bb),
56
self.assertEquals(RevisionSpec('revno:2:b/').in_history(None),
18
from bzrlib.selftest import TestCaseInTempDir
20
class TestRevisionNamespaces(TestCaseInTempDir):
60
21
def test_revision_namespaces(self):
61
"""Test revision specifiers.
63
These identify revisions by date, etc."""
64
wt = self.make_branch_and_tree('.')
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')
71
self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
72
self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
73
self.assertEquals(RevisionSpec('revno:1').in_history(b),
75
self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
77
self.assertRaises(NoSuchRevision,
78
RevisionSpec('revid:a@r-0-0').in_history, b)
79
self.assertRaises(TypeError, RevisionSpec, object)
81
self.assertEquals(RevisionSpec('date:today').in_history(b),
83
self.assertRaises(NoSuchRevision,
84
RevisionSpec('date:tomorrow').in_history, b)
85
self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
87
self.assertEquals(RevisionSpec('before:date:today').in_history(b),
90
self.assertEquals(RevisionSpec('last:1').in_history(b),
92
self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
93
# self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
94
# self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
96
self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
22
"""Functional tests for hashcache"""
23
from bzrlib.errors import NoSuchRevision
24
from bzrlib.branch import Branch
26
b = Branch('.', init=True)
28
b.commit('Commit one', rev_id='a@r-0-1')
29
b.commit('Commit two', rev_id='a@r-0-2')
30
b.commit('Commit three', rev_id='a@r-0-3')
32
self.assertEquals(b.get_revision_info(None), (0, None))
33
self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
34
self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
35
self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
36
self.assertRaises(NoSuchRevision, b.get_revision_info, 'revid:a@r-0-0')
37
self.assertRaises(TypeError, b.get_revision_info, object)
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'))
42
self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
43
self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
99
45
os.mkdir('newbranch')
100
wt2 = self.make_branch_and_tree('newbranch')
102
self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
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')
108
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
110
merge(['copy', -1], [None, None])
111
wt.commit('Commit five', rev_id='a@r-0-4')
112
self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
114
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
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))
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')
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'))
46
b2 = Branch('newbranch', init=True)
47
self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
added
removed
bzrlib/selftest/testrevisionnamespaces.py
