← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Aaron Bentley
  • Date: 2005-09-21 15:33:23 UTC
  • mto: (1185.1.37)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: abentley@panoramicfeedback.com-20050921153323-5db674d572d7649d
Fixed bug in distance-from-root graph operation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
1
 
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2004, 2005 by Canonical Ltd
2
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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.builtins import merge
21
 
from bzrlib.branch import Branch
22
 
from bzrlib.tests import TestCaseWithTransport
 
18
from bzrlib.selftest import TestCaseInTempDir
23
19
from bzrlib.errors import NoCommonAncestor, NoCommits
24
 
from bzrlib.errors import NoSuchRevision
25
 
from bzrlib.revisionspec import RevisionSpec
26
 
 
27
 
 
28
 
class TestRevisionNamespaces(TestCaseWithTransport):
 
20
from bzrlib.branch import copy_branch
 
21
from bzrlib.merge import merge
 
22
 
 
23
class TestRevisionNamespaces(TestCaseInTempDir):
29
24
 
30
25
    def test_revision_namespaces(self):
31
26
        """Test revision specifiers.
32
27
 
33
28
        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')
 
29
        from bzrlib.errors import NoSuchRevision
 
30
        from bzrlib.branch import Branch
 
31
        from bzrlib.revisionspec import RevisionSpec
 
32
 
 
33
        b = Branch.initialize('.')
 
34
 
 
35
        b.commit('Commit one', rev_id='a@r-0-1')
 
36
        b.commit('Commit two', rev_id='a@r-0-2')
 
37
        b.commit('Commit three', rev_id='a@r-0-3')
40
38
 
41
39
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
42
40
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
48
46
                          RevisionSpec('revid:a@r-0-0').in_history, b)
49
47
        self.assertRaises(TypeError, RevisionSpec, object)
50
48
 
51
 
        self.assertEquals(RevisionSpec('date:today').in_history(b),
52
 
                          (2, 'a@r-0-2'))
53
 
        self.assertRaises(NoSuchRevision,
54
 
                          RevisionSpec('date:tomorrow').in_history, b)
55
 
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
56
 
                          (1, 'a@r-0-1'))
57
 
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
 
49
        self.assertEquals(RevisionSpec('date:-tomorrow').in_history(b),
 
50
                          (3, 'a@r-0-3'))
 
51
        self.assertEquals(RevisionSpec('date:+today').in_history(b),
58
52
                          (1, 'a@r-0-1'))
59
53
 
60
54
        self.assertEquals(RevisionSpec('last:1').in_history(b),
67
61
                          'a@r-0-3')
68
62
 
69
63
        os.mkdir('newbranch')
70
 
        wt2 = self.make_branch_and_tree('newbranch')
71
 
        b2 = wt2.branch
 
64
        b2 = Branch.initialize('newbranch')
72
65
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
73
66
 
74
 
        d3 = b.bzrdir.sprout('copy')
75
 
        b3 = d3.open_branch()
76
 
        wt3 = d3.open_workingtree()
77
 
        wt3.commit('Commit four', rev_id='b@r-0-4')
 
67
        os.mkdir('copy')
 
68
        b3 = copy_branch(b, 'copy')
 
69
        b3.commit('Commit four', rev_id='b@r-0-4')
78
70
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
79
71
                          'a@r-0-3')
80
72
        merge(['copy', -1], [None, None])
81
 
        wt.commit('Commit five', rev_id='a@r-0-4')
 
73
        b.commit('Commit five', rev_id='a@r-0-4')
82
74
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
83
75
                          'b@r-0-4')
84
76
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
85
77
                          'b@r-0-4')
86
 
 
87
 
        # This should be in the revision store, but not in revision-history
88
 
        self.assertEquals((None, 'b@r-0-4'),
89
 
                RevisionSpec('revid:b@r-0-4').in_history(b))
90
 
 
91
 
    def test_branch_namespace(self):
92
 
        """Ensure that the branch namespace pulls in the requisite content."""
93
 
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
94
 
        wt = self.make_branch_and_tree('branch1')
95
 
        branch = wt.branch
96
 
        wt.add(['file'])
97
 
        wt.commit('add file')
98
 
        d2 = branch.bzrdir.sprout('branch2')
99
 
        print >> open('branch2/file', 'w'), 'new content'
100
 
        branch2 = d2.open_branch()
101
 
        d2.open_workingtree().commit('update file', rev_id='A')
102
 
        spec = RevisionSpec('branch:./branch2/.bzr/../')
103
 
        rev_info = spec.in_history(branch)
104
 
        self.assertEqual(rev_info, (None, 'A'))
105