← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-17 20:29:29 UTC
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050917202929-a9e4a3be80bf4ba4
Working on getting tests to run. TestFetch only works if named runTest

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
import time
19
 
 
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
24
 
from bzrlib.clone import copy_branch
 
20
from bzrlib.branch import copy_branch
25
21
from bzrlib.merge import merge
26
 
from bzrlib.revisionspec import RevisionSpec
27
22
 
28
23
class TestRevisionNamespaces(TestCaseInTempDir):
29
 
 
30
24
    def test_revision_namespaces(self):
31
25
        """Test revision specifiers.
32
26
 
33
27
        These identify revisions by date, etc."""
34
 
 
35
 
        b = Branch.initialize(u'.')
36
 
 
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')
 
28
        from bzrlib.errors import NoSuchRevision
 
29
        from bzrlib.branch import Branch
 
30
        from bzrlib.revisionspec import RevisionSpec
 
31
 
 
32
        b = Branch.initialize('.')
 
33
 
 
34
        b.commit('Commit one', rev_id='a@r-0-1')
 
35
        b.commit('Commit two', rev_id='a@r-0-2')
 
36
        b.commit('Commit three', rev_id='a@r-0-3')
40
37
 
41
38
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
42
39
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
48
45
                          RevisionSpec('revid:a@r-0-0').in_history, b)
49
46
        self.assertRaises(TypeError, RevisionSpec, object)
50
47
 
51
 
        self.assertEquals(RevisionSpec('date:today').in_history(b),
52
 
                          (2, 'a@r-0-2'))
53
 
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
54
 
                          (1, 'a@r-0-1'))
55
 
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
 
48
        self.assertEquals(RevisionSpec('date:-tomorrow').in_history(b),
 
49
                          (3, 'a@r-0-3'))
 
50
        self.assertEquals(RevisionSpec('date:+today').in_history(b),
56
51
                          (1, 'a@r-0-1'))
57
52
 
58
53
        self.assertEquals(RevisionSpec('last:1').in_history(b),
70
65
 
71
66
        os.mkdir('copy')
72
67
        b3 = copy_branch(b, 'copy')
73
 
        b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
 
68
        b3.commit('Commit four', rev_id='b@r-0-4')
74
69
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
75
70
                          'a@r-0-3')
76
71
        merge(['copy', -1], [None, None])
77
 
        b.working_tree().commit('Commit five', rev_id='a@r-0-4')
 
72
        b.commit('Commit five', rev_id='a@r-0-4')
78
73
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
79
74
                          'b@r-0-4')
80
75
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
81
76
                          'b@r-0-4')
82
 
 
83
 
    def test_branch_namespace(self):
84
 
        """Ensure that the branch namespace pulls in the requisite content."""
85
 
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
86
 
        branch = Branch.initialize('branch1')
87
 
        branch.working_tree().add(['file'])
88
 
        branch.working_tree().commit('add file')
89
 
        copy_branch(branch, 'branch2')
90
 
        print >> open('branch2/file', 'w'), 'new content'
91
 
        branch2 = Branch.open('branch2')
92
 
        branch2.working_tree().commit('update file', rev_id='A')
93
 
        spec = RevisionSpec('branch:./branch2/.bzr/../')
94
 
        rev_info = spec.in_history(branch)
95
 
        self.assertEqual(rev_info, (None, 'A'))
96