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