/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
897 by Martin Pool
- merge john's revision-naming code
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
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
17
import os
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
18
from bzrlib.selftest import TestCaseInTempDir
974.1.81 by Aaron Bentley
Added ancestor revision namepsace
19
from bzrlib.errors import NoCommonAncestor, NoCommits
20
from bzrlib.branch import copy_branch
21
from bzrlib.merge import merge
897 by Martin Pool
- merge john's revision-naming code
22
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
23
class TestRevisionNamespaces(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
24
    def test_revision_namespaces(self):
25
        """Functional tests for hashcache"""
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
26
        from bzrlib.errors import NoSuchRevision
897 by Martin Pool
- merge john's revision-naming code
27
        from bzrlib.branch import Branch
1185.2.6 by Lalo Martins
turned get_revision_info into a RevisionSpec class
28
        from bzrlib.revisionspec import RevisionSpec
897 by Martin Pool
- merge john's revision-naming code
29
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
30
        b = Branch.initialize('.')
897 by Martin Pool
- merge john's revision-naming code
31
32
        b.commit('Commit one', rev_id='a@r-0-1')
33
        b.commit('Commit two', rev_id='a@r-0-2')
34
        b.commit('Commit three', rev_id='a@r-0-3')
35
1185.2.13 by Lalo Martins
polishing up the RevisionSpec api, as per suggestions from Robert
36
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
37
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
38
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
39
                          (1, 'a@r-0-1'))
40
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
41
                          (1, 'a@r-0-1'))
42
        self.assertRaises(NoSuchRevision,
43
                          RevisionSpec('revid:a@r-0-0').in_history, b)
44
        self.assertRaises(TypeError, RevisionSpec, object)
45
46
        self.assertEquals(RevisionSpec('date:-tomorrow').in_history(b),
47
                          (3, 'a@r-0-3'))
48
        self.assertEquals(RevisionSpec('date:+today').in_history(b),
49
                          (1, 'a@r-0-1'))
50
51
        self.assertEquals(RevisionSpec('last:1').in_history(b),
52
                          (3, 'a@r-0-3'))
53
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
1185.2.18 by Lalo Martins
merging from integration again.
54
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
55
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
56
57
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
58
                          'a@r-0-3')
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
59
60
        os.mkdir('newbranch')
1185.2.18 by Lalo Martins
merging from integration again.
61
        b2 = Branch.initialize('newbranch')
62
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
974.1.81 by Aaron Bentley
Added ancestor revision namepsace
63
64
        os.mkdir('copy')
65
        b3 = copy_branch(b, 'copy')
66
        b3.commit('Commit four', rev_id='b@r-0-4')
1185.2.18 by Lalo Martins
merging from integration again.
67
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
68
                          'a@r-0-3')
974.1.81 by Aaron Bentley
Added ancestor revision namepsace
69
        merge(['copy', -1], [None, None])
70
        b.commit('Commit five', rev_id='a@r-0-4')
1185.2.18 by Lalo Martins
merging from integration again.
71
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
72
                          'b@r-0-4')
73
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
74
                          'b@r-0-4')