← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Martin Pool
  • Date: 2005-05-02 04:24:33 UTC
  • Revision ID: mbp@sourcefrog.net-20050502042433-c825a7f7235f6b15
doc: notes on merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
1
 
# Copyright (C) 2004, 2005 by Canonical Ltd
2
 
 
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
 
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
 
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
import os
18
 
import time
19
 
 
20
 
from bzrlib.branch import Branch
21
 
from bzrlib.selftest import TestCaseInTempDir
22
 
from bzrlib.errors import NoCommonAncestor, NoCommits
23
 
from bzrlib.errors import NoSuchRevision
24
 
from bzrlib.clone import copy_branch
25
 
from bzrlib.merge import merge
26
 
from bzrlib.revisionspec import RevisionSpec
27
 
 
28
 
class TestRevisionNamespaces(TestCaseInTempDir):
29
 
 
30
 
    def test_revision_namespaces(self):
31
 
        """Test revision specifiers.
32
 
 
33
 
        These identify revisions by date, etc."""
34
 
 
35
 
        b = Branch.initialize('.')
36
 
 
37
 
        b.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
38
 
        b.commit('Commit two', rev_id='a@r-0-2')
39
 
        b.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
 
        b2 = Branch.initialize('newbranch')
69
 
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
70
 
 
71
 
        os.mkdir('copy')
72
 
        b3 = copy_branch(b, 'copy')
73
 
        b3.commit('Commit four', rev_id='b@r-0-4')
74
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
75
 
                          'a@r-0-3')
76
 
        merge(['copy', -1], [None, None])
77
 
        b.commit('Commit five', rev_id='a@r-0-4')
78
 
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
79
 
                          'b@r-0-4')
80
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
81
 
                          '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.add(['file'])
88
 
        branch.commit('add file')
89
 
        copy_branch(branch, 'branch2')
90
 
        print >> open('branch2/file', 'w'), 'new content'
91
 
        branch2 = Branch.open('branch2')
92
 
        branch2.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