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
18
from bzrlib.selftest import TestCaseInTempDir
22
19
from bzrlib.errors import NoCommonAncestor, NoCommits
23
from bzrlib.errors import NoSuchRevision
20
from bzrlib.branch import copy_branch
24
21
from bzrlib.merge import merge
25
from bzrlib.revisionspec import RevisionSpec
27
23
class TestRevisionNamespaces(TestCaseInTempDir):
29
24
def test_revision_namespaces(self):
30
"""Test revision specifiers.
32
These identify revisions by date, etc."""
34
b = Branch.initialize(u'.')
36
b.working_tree().commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
37
b.working_tree().commit('Commit two', rev_id='a@r-0-2')
38
b.working_tree().commit('Commit three', rev_id='a@r-0-3')
40
self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
41
self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
42
self.assertEquals(RevisionSpec('revno:1').in_history(b),
44
self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
46
self.assertRaises(NoSuchRevision,
47
RevisionSpec('revid:a@r-0-0').in_history, b)
48
self.assertRaises(TypeError, RevisionSpec, object)
50
self.assertEquals(RevisionSpec('date:today').in_history(b),
52
self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
54
self.assertEquals(RevisionSpec('before:date:today').in_history(b),
57
self.assertEquals(RevisionSpec('last:1').in_history(b),
59
self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
60
# self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
61
# self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
63
self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
25
"""Functional tests for hashcache"""
26
from bzrlib.errors import NoSuchRevision
27
from bzrlib.branch import Branch
29
b = Branch('.', init=True)
31
b.commit('Commit one', rev_id='a@r-0-1')
32
b.commit('Commit two', rev_id='a@r-0-2')
33
b.commit('Commit three', rev_id='a@r-0-3')
35
self.assertEquals(b.get_revision_info(None), (0, None))
36
self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
37
self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
38
self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
39
self.assertRaises(NoSuchRevision, b.get_revision_info, 'revid:a@r-0-0')
40
self.assertRaises(TypeError, b.get_revision_info, object)
42
self.assertEquals(b.get_revision_info('date:-tomorrow'), (3, 'a@r-0-3'))
43
self.assertEquals(b.get_revision_info('date:+today'), (1, 'a@r-0-1'))
45
self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
46
self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
66
48
os.mkdir('newbranch')
67
b2 = Branch.initialize('newbranch')
68
self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
49
b2 = Branch('newbranch', init=True)
50
self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
52
self.assertRaises(NoCommits, b2.lookup_revision, 'ancestor:.')
53
self.assertEquals(b.lookup_revision('ancestor:.'), 'a@r-0-3')
72
b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
73
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
55
b3 = copy_branch(b, 'copy')
56
b3.commit('Commit four', rev_id='b@r-0-4')
57
self.assertEquals(b3.lookup_revision('ancestor:.'), 'a@r-0-3')
75
58
merge(['copy', -1], [None, None])
76
b.working_tree().commit('Commit five', rev_id='a@r-0-4')
77
self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
79
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
82
# This should be in the revision store, but not in revision-history
83
self.assertEquals((None, 'b@r-0-4'),
84
RevisionSpec('revid:b@r-0-4').in_history(b))
86
def test_branch_namespace(self):
87
"""Ensure that the branch namespace pulls in the requisite content."""
88
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
89
branch = Branch.initialize('branch1')
90
branch.working_tree().add(['file'])
91
branch.working_tree().commit('add file')
92
branch.clone('branch2')
93
print >> open('branch2/file', 'w'), 'new content'
94
branch2 = Branch.open('branch2')
95
branch2.working_tree().commit('update file', rev_id='A')
96
spec = RevisionSpec('branch:./branch2/.bzr/../')
97
rev_info = spec.in_history(branch)
98
self.assertEqual(rev_info, (None, 'A'))
59
b.commit('Commit five', rev_id='a@r-0-4')
60
self.assertEquals(b.lookup_revision('ancestor:copy'), 'b@r-0-4')
61
self.assertEquals(b3.lookup_revision('ancestor:.'), 'b@r-0-4')
added
removed
bzrlib/selftest/testrevisionnamespaces.py
