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.branch import Branch
21
from bzrlib.tests import TestCaseInTempDir
22
from bzrlib.errors import NoCommonAncestor, NoCommits
23
from bzrlib.errors import NoSuchRevision
24
from bzrlib.clone import copy_branch
25
from bzrlib.merge import merge
26
from bzrlib.revisionspec import RevisionSpec
28
class TestRevisionNamespaces(TestCaseInTempDir):
30
def test_revision_namespaces(self):
31
"""Test revision specifiers.
33
These identify revisions by date, etc."""
35
b = Branch.initialize(u'.')
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')
41
self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
42
self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
43
self.assertEquals(RevisionSpec('revno:1').in_history(b),
45
self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
47
self.assertRaises(NoSuchRevision,
48
RevisionSpec('revid:a@r-0-0').in_history, b)
49
self.assertRaises(TypeError, RevisionSpec, object)
51
self.assertEquals(RevisionSpec('date:today').in_history(b),
53
self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
55
self.assertEquals(RevisionSpec('before:date:today').in_history(b),
58
self.assertEquals(RevisionSpec('last:1').in_history(b),
60
self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
61
# self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
62
# self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
64
self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
68
b2 = Branch.initialize('newbranch')
69
self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
72
b3 = copy_branch(b, 'copy')
73
b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
74
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
76
merge(['copy', -1], [None, None])
77
b.working_tree().commit('Commit five', rev_id='a@r-0-4')
78
self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
80
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
83
# This should be in the revision store, but not in revision-history
84
self.assertEquals((None, 'b@r-0-4'),
85
RevisionSpec('revid:b@r-0-4').in_history(b))
87
def test_branch_namespace(self):
88
"""Ensure that the branch namespace pulls in the requisite content."""
89
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')
94
print >> open('branch2/file', 'w'), 'new content'
95
branch2 = Branch.open('branch2')
96
branch2.working_tree().commit('update file', rev_id='A')
97
spec = RevisionSpec('branch:./branch2/.bzr/../')
98
rev_info = spec.in_history(branch)
99
self.assertEqual(rev_info, (None, 'A'))
18
from bzrlib.selftest import InTempDir, TestBase
20
class TestRevisionNamespaces(InTempDir):
21
"""Functional tests for hashcache"""
23
from bzrlib.errors import BzrError
24
from bzrlib.branch import Branch
28
b = Branch('.', init=True)
30
b.commit('Commit one', rev_id='a@r-0-1')
31
b.commit('Commit two', rev_id='a@r-0-2')
32
b.commit('Commit three', rev_id='a@r-0-3')
34
self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
35
self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
36
self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
37
self.assertRaises(BzrError, b.get_revision_info, 'revid:a@r-0-0')
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'))
45
TestRevisionNamespaces