20
from bzrlib.branch import Branch
21
from bzrlib.tests import TestCaseInTempDir
19
from bzrlib.selftest import TestCaseInTempDir
22
20
from bzrlib.errors import NoCommonAncestor, NoCommits
23
from bzrlib.errors import NoSuchRevision
24
21
from bzrlib.clone import copy_branch
25
22
from bzrlib.merge import merge
26
from bzrlib.revisionspec import RevisionSpec
28
24
class TestRevisionNamespaces(TestCaseInTempDir):
31
27
"""Test revision specifiers.
33
29
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')
30
from bzrlib.errors import NoSuchRevision
31
from bzrlib.branch import Branch
32
from bzrlib.revisionspec import RevisionSpec
34
b = Branch.initialize('.')
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')
41
40
self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
42
41
self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
72
71
b3 = copy_branch(b, 'copy')
73
b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
72
b3.commit('Commit four', rev_id='b@r-0-4')
74
73
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
76
75
merge(['copy', -1], [None, None])
77
b.working_tree().commit('Commit five', rev_id='a@r-0-4')
76
b.commit('Commit five', rev_id='a@r-0-4')
78
77
self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
80
79
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'))