← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

merge David Clymer's patch for TestCaseInTestDir.runcmd

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
from bzrlib.selftest import TestCaseInTempDir
 
19
from bzrlib.errors import NoCommonAncestor, NoCommits
 
20
from bzrlib.branch import copy_branch
 
21
from bzrlib.merge import merge
 
22
 
 
23
class TestRevisionNamespaces(TestCaseInTempDir):
 
24
    def test_revision_namespaces(self):
 
25
        """Test revision specifiers.
 
26
 
 
27
        These identify revisions by date, etc."""
 
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')
 
37
 
 
38
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
 
39
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
 
40
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
 
41
                          (1, 'a@r-0-1'))
 
42
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
 
43
                          (1, 'a@r-0-1'))
 
44
        self.assertRaises(NoSuchRevision,
 
45
                          RevisionSpec('revid:a@r-0-0').in_history, b)
 
46
        self.assertRaises(TypeError, RevisionSpec, object)
 
47
 
 
48
        self.assertEquals(RevisionSpec('date:-tomorrow').in_history(b),
 
49
                          (3, 'a@r-0-3'))
 
50
        self.assertEquals(RevisionSpec('date:+today').in_history(b),
 
51
                          (1, 'a@r-0-1'))
 
52
 
 
53
        self.assertEquals(RevisionSpec('last:1').in_history(b),
 
54
                          (3, 'a@r-0-3'))
 
55
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
 
56
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 
57
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
58
 
 
59
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
 
60
                          'a@r-0-3')
 
61
 
 
62
        os.mkdir('newbranch')
 
63
        b2 = Branch.initialize('newbranch')
 
64
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
 
65
 
 
66
        os.mkdir('copy')
 
67
        b3 = copy_branch(b, 'copy')
 
68
        b3.commit('Commit four', rev_id='b@r-0-4')
 
69
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
70
                          'a@r-0-3')
 
71
        merge(['copy', -1], [None, None])
 
72
        b.commit('Commit five', rev_id='a@r-0-4')
 
73
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
 
74
                          'b@r-0-4')
 
75
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
76
                          'b@r-0-4')