~bzr-pqm/bzr/bzr.dev

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
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
18
import time
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
19
from bzrlib.selftest import TestCaseInTempDir
974.1.81 by Aaron Bentley
Added ancestor revision namepsace
20
from bzrlib.errors import NoCommonAncestor, NoCommits
21
from bzrlib.branch import copy_branch
22
from bzrlib.merge import merge
897 by Martin Pool
- merge john's revision-naming code
23
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
24
class TestRevisionNamespaces(TestCaseInTempDir):
1185.1.28 by Robert Collins
revert out the revision spec from revision spec change
25
1102 by Martin Pool
- merge test refactoring from robertc
26
    def test_revision_namespaces(self):
1185.3.16 by Martin Pool
doc
27
        """Test revision specifiers.
28
29
        These identify revisions by date, etc."""
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
30
        from bzrlib.errors import NoSuchRevision
897 by Martin Pool
- merge john's revision-naming code
31
        from bzrlib.branch import Branch
1185.2.6 by Lalo Martins
turned get_revision_info into a RevisionSpec class
32
        from bzrlib.revisionspec import RevisionSpec
897 by Martin Pool
- merge john's revision-naming code
33
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
34
        b = Branch.initialize('.')
897 by Martin Pool
- merge john's revision-naming code
35
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
36
        b.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
897 by Martin Pool
- merge john's revision-naming code
37
        b.commit('Commit two', rev_id='a@r-0-2')
38
        b.commit('Commit three', rev_id='a@r-0-3')
39
1185.2.13 by Lalo Martins
polishing up the RevisionSpec api, as per suggestions from Robert
40
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
41
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
42
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
43
                          (1, 'a@r-0-1'))
44
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
45
                          (1, 'a@r-0-1'))
46
        self.assertRaises(NoSuchRevision,
47
                          RevisionSpec('revid:a@r-0-0').in_history, b)
48
        self.assertRaises(TypeError, RevisionSpec, object)
49
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
50
        self.assertEquals(RevisionSpec('date:today').in_history(b),
51
                          (2, 'a@r-0-2'))
52
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
53
                          (1, 'a@r-0-1'))
54
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
1185.2.13 by Lalo Martins
polishing up the RevisionSpec api, as per suggestions from Robert
55
                          (1, 'a@r-0-1'))
56
57
        self.assertEquals(RevisionSpec('last:1').in_history(b),
58
                          (3, 'a@r-0-3'))
59
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
1185.2.18 by Lalo Martins
merging from integration again.
60
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
61
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
62
63
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
64
                          'a@r-0-3')
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
65
66
        os.mkdir('newbranch')
1185.2.18 by Lalo Martins
merging from integration again.
67
        b2 = Branch.initialize('newbranch')
68
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
974.1.81 by Aaron Bentley
Added ancestor revision namepsace
69
70
        os.mkdir('copy')
71
        b3 = copy_branch(b, 'copy')
72
        b3.commit('Commit four', rev_id='b@r-0-4')
1185.2.18 by Lalo Martins
merging from integration again.
73
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
74
                          'a@r-0-3')
974.1.81 by Aaron Bentley
Added ancestor revision namepsace
75
        merge(['copy', -1], [None, None])
76
        b.commit('Commit five', rev_id='a@r-0-4')
1185.2.18 by Lalo Martins
merging from integration again.
77
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
78
                          'b@r-0-4')
79
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
80
                          'b@r-0-4')