← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Robert Collins
  • Date: 2005-08-25 01:13:32 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825011331-6d549d5de7edcec1
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
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
16
16
 
17
 
import os
18
 
import time
19
 
 
20
 
from bzrlib.builtins import merge
21
 
from bzrlib.branch import Branch
22
 
from bzrlib.tests import TestCaseWithTransport
23
 
from bzrlib.errors import NoCommonAncestor, NoCommits
24
 
from bzrlib.errors import NoSuchRevision
25
 
from bzrlib.revisionspec import RevisionSpec
26
 
 
27
 
 
28
 
class TestRevisionNamespaces(TestCaseWithTransport):
29
 
 
 
17
 
 
18
from bzrlib.selftest import InTempDir
 
19
 
 
20
class TestRevisionNamespaces(InTempDir):
30
21
    def test_revision_namespaces(self):
31
 
        """Test revision specifiers.
32
 
 
33
 
        These identify revisions by date, etc."""
34
 
        wt = self.make_branch_and_tree('.')
35
 
        b = wt.branch
36
 
 
37
 
        wt.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
38
 
        wt.commit('Commit two', rev_id='a@r-0-2')
39
 
        wt.commit('Commit three', rev_id='a@r-0-3')
40
 
 
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),
44
 
                          (1, 'a@r-0-1'))
45
 
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
46
 
                          (1, 'a@r-0-1'))
47
 
        self.assertRaises(NoSuchRevision,
48
 
                          RevisionSpec('revid:a@r-0-0').in_history, b)
49
 
        self.assertRaises(TypeError, RevisionSpec, object)
50
 
 
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),
56
 
                          (1, 'a@r-0-1'))
57
 
 
58
 
        self.assertEquals(RevisionSpec('last:1').in_history(b),
59
 
                          (3, 'a@r-0-3'))
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'))
63
 
 
64
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
65
 
                          'a@r-0-3')
66
 
 
67
 
        os.mkdir('newbranch')
68
 
        wt2 = self.make_branch_and_tree('newbranch')
69
 
        b2 = wt2.branch
70
 
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
71
 
 
72
 
        d3 = b.bzrdir.sprout('copy')
73
 
        b3 = d3.open_branch()
74
 
        wt3 = d3.open_workingtree()
75
 
        wt3.commit('Commit four', rev_id='b@r-0-4')
76
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
77
 
                          'a@r-0-3')
78
 
        merge(['copy', -1], [None, None])
79
 
        wt.commit('Commit five', rev_id='a@r-0-4')
80
 
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
81
 
                          'b@r-0-4')
82
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
83
 
                          'b@r-0-4')
84
 
 
85
 
        # This should be in the revision store, but not in revision-history
86
 
        self.assertEquals((None, 'b@r-0-4'),
87
 
                RevisionSpec('revid:b@r-0-4').in_history(b))
88
 
 
89
 
    def test_branch_namespace(self):
90
 
        """Ensure that the branch namespace pulls in the requisite content."""
91
 
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
92
 
        wt = self.make_branch_and_tree('branch1')
93
 
        branch = wt.branch
94
 
        wt.add(['file'])
95
 
        wt.commit('add file')
96
 
        d2 = branch.bzrdir.sprout('branch2')
97
 
        print >> open('branch2/file', 'w'), 'new content'
98
 
        branch2 = d2.open_branch()
99
 
        d2.open_workingtree().commit('update file', rev_id='A')
100
 
        spec = RevisionSpec('branch:./branch2/.bzr/../')
101
 
        rev_info = spec.in_history(branch)
102
 
        self.assertEqual(rev_info, (None, 'A'))
103
 
 
 
22
        """Functional tests for hashcache"""
 
23
        from bzrlib.errors import BzrError
 
24
        from bzrlib.branch import Branch
 
25
        import os
 
26
        import time
 
27
 
 
28
        b = Branch('.', init=True)
 
29
 
 
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')
 
33
 
 
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')
 
38
 
 
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'))
 
41
 
 
42
        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))