← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

revert out the revision spec from revision spec change

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
1
 
# Copyright (C) 2005, 2006 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
1
import os
18
2
import unittest
19
3
 
20
 
from bzrlib.tests import TestCaseWithTransport, TestCase
21
 
from bzrlib.branch import Branch
22
 
from bzrlib.errors import PathNotChild
23
 
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
24
 
 
25
 
 
26
 
class MoreTests(TestCaseWithTransport):
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
 
5
from bzrlib.branch import ScratchBranch, Branch
 
6
from bzrlib.errors import NotBranchError, NotVersionedError
 
7
 
 
8
 
 
9
class TestBranch(TestCaseInTempDir):
 
10
 
 
11
    def test_unknowns(self):
 
12
        b = Branch.initialize('.')
 
13
 
 
14
        self.build_tree(['hello.txt',
 
15
                         'hello.txt~'])
 
16
 
 
17
        self.assertEquals(list(b.unknowns()),
 
18
                          ['hello.txt'])
 
19
 
 
20
    def test_no_changes(self):
 
21
        from bzrlib.errors import PointlessCommit
 
22
        
 
23
        b = Branch.initialize('.')
 
24
 
 
25
        self.build_tree(['hello.txt'])
 
26
 
 
27
        self.assertRaises(PointlessCommit,
 
28
                          b.commit,
 
29
                          'commit without adding',
 
30
                          allow_pointless=False)
 
31
 
 
32
        b.commit('commit pointless tree',
 
33
                 allow_pointless=True)
 
34
 
 
35
        b.add('hello.txt')
 
36
        
 
37
        b.commit('commit first added file',
 
38
                 allow_pointless=False)
 
39
        
 
40
        self.assertRaises(PointlessCommit,
 
41
                          b.commit,
 
42
                          'commit after adding file',
 
43
                          allow_pointless=False)
 
44
        
 
45
        b.commit('commit pointless revision with one file',
 
46
                 allow_pointless=True)
 
47
 
 
48
        b.add_pending_merge('mbp@892739123-2005-123123')
 
49
        b.commit('commit new merge with no text changes',
 
50
                 allow_pointless=False)
 
51
        
 
52
 
 
53
 
 
54
class TestRevisionId(TestCase):
 
55
    
 
56
    def test_validate_revision_id(self):
 
57
        from bzrlib.revision import validate_revision_id
 
58
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
59
        self.assertRaises(ValueError,
 
60
                          validate_revision_id,
 
61
                          ' asdkjas')
 
62
        self.assertRaises(ValueError,
 
63
                          validate_revision_id,
 
64
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
65
        self.assertRaises(ValueError,
 
66
                          validate_revision_id,
 
67
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
68
        self.assertRaises(ValueError,
 
69
                          validate_revision_id,
 
70
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
 
71
 
 
72
 
 
73
class PendingMerges(TestCaseInTempDir):
 
74
 
 
75
    def test_pending_merges(self):
 
76
        """Tracking pending-merged revisions."""
 
77
        b = Branch.initialize('.')
 
78
 
 
79
        self.assertEquals(b.pending_merges(), [])
 
80
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
81
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
82
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
83
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
84
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
85
        self.assertEquals(b.pending_merges(),
 
86
                          ['foo@azkhazan-123123-abcabc',
 
87
                           'wibble@fofof--20050401--1928390812'])
 
88
        b.commit("commit from base with two merges")
 
89
        rev = b.get_revision(b.revision_history()[0])
 
90
        self.assertEquals(len(rev.parents), 2)
 
91
        self.assertEquals(rev.parents[0].revision_id,
 
92
                          'foo@azkhazan-123123-abcabc')
 
93
        self.assertEquals(rev.parents[1].revision_id,
 
94
                           'wibble@fofof--20050401--1928390812')
 
95
        # list should be cleared when we do a commit
 
96
        self.assertEquals(b.pending_merges(), [])
 
97
        
 
98
    def test_revert(self):
 
99
        """Test selected-file revert"""
 
100
        b = Branch.initialize('.')
 
101
 
 
102
        self.build_tree(['hello.txt'])
 
103
        file('hello.txt', 'w').write('initial hello')
 
104
 
 
105
        self.assertRaises(NotVersionedError,
 
106
                          b.revert, ['hello.txt'])
 
107
        
 
108
        b.add(['hello.txt'])
 
109
        b.commit('create initial hello.txt')
 
110
 
 
111
        self.check_file_contents('hello.txt', 'initial hello')
 
112
        file('hello.txt', 'w').write('new hello')
 
113
        self.check_file_contents('hello.txt', 'new hello')
 
114
 
 
115
        # revert file modified since last revision
 
116
        b.revert(['hello.txt'])
 
117
        self.check_file_contents('hello.txt', 'initial hello')
 
118
        self.check_file_contents('hello.txt~', 'new hello')
 
119
 
 
120
        # reverting again clobbers the backup
 
121
        b.revert(['hello.txt'])
 
122
        self.check_file_contents('hello.txt', 'initial hello')
 
123
        self.check_file_contents('hello.txt~', 'initial hello')
 
124
 
 
125
    def test_rename_dirs(self):
 
126
        """Test renaming directories and the files within them."""
 
127
        b = Branch.initialize('.')
 
128
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
 
129
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
 
130
 
 
131
        b.commit('create initial state')
 
132
 
 
133
        # TODO: lift out to a test helper that checks the shape of
 
134
        # an inventory
 
135
        
 
136
        revid = b.revision_history()[0]
 
137
        self.log('first revision_id is {%s}' % revid)
 
138
        
 
139
        inv = b.get_revision_inventory(revid)
 
140
        self.log('contents of inventory: %r' % inv.entries())
 
141
 
 
142
        self.check_inventory_shape(inv,
 
143
                                   ['dir', 'dir/sub', 'dir/sub/file'])
 
144
 
 
145
        b.rename_one('dir', 'newdir')
 
146
 
 
147
        self.check_inventory_shape(b.inventory,
 
148
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
 
149
 
 
150
        b.rename_one('newdir/sub', 'newdir/newsub')
 
151
        self.check_inventory_shape(b.inventory,
 
152
                                   ['newdir', 'newdir/newsub',
 
153
                                    'newdir/newsub/file'])
27
154
 
28
155
    def test_relpath(self):
29
156
        """test for branch path lookups
30
157
    
31
 
        bzrlib.osutils._relpath do a simple but subtle
 
158
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
32
159
        job: given a path (either relative to cwd or absolute), work out
33
160
        if it is inside a branch and return the path relative to the base.
34
161
        """
35
 
        import tempfile
36
 
        from bzrlib.osutils import rmtree
 
162
        from bzrlib.branch import _relpath
 
163
        import tempfile, shutil
37
164
        
38
165
        savedir = os.getcwdu()
39
166
        dtmp = tempfile.mkdtemp()
40
167
        # On Mac OSX, /tmp actually expands to /private/tmp
41
 
        dtmp = realpath(dtmp)
 
168
        dtmp = os.path.realpath(dtmp)
42
169
 
43
170
        def rp(p):
44
 
            return relpath(dtmp, p)
 
171
            return _relpath(dtmp, p)
45
172
        
46
173
        try:
47
174
            # check paths inside dtmp while standing outside it
48
 
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
 
175
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
49
176
 
50
177
            # root = nothing
51
178
            self.assertEqual(rp(dtmp), '')
52
179
 
53
 
            self.assertRaises(PathNotChild,
 
180
            self.assertRaises(NotBranchError,
54
181
                              rp,
55
182
                              '/etc')
56
183
 
57
184
            # now some near-miss operations -- note that
58
185
            # os.path.commonprefix gets these wrong!
59
 
            self.assertRaises(PathNotChild,
 
186
            self.assertRaises(NotBranchError,
60
187
                              rp,
61
188
                              dtmp.rstrip('\\/') + '2')
62
189
 
63
 
            self.assertRaises(PathNotChild,
 
190
            self.assertRaises(NotBranchError,
64
191
                              rp,
65
192
                              dtmp.rstrip('\\/') + '2/foo')
66
193
 
74
201
 
75
202
            self.assertEqual(rp('./foo'), 'foo')
76
203
 
77
 
            self.assertEqual(rp(abspath('foo')), 'foo')
 
204
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
78
205
 
79
 
            self.assertRaises(PathNotChild,
 
206
            self.assertRaises(NotBranchError,
80
207
                              rp, '../foo')
81
208
 
82
209
        finally:
83
210
            os.chdir(savedir)
84
 
            rmtree(dtmp)
 
211
            shutil.rmtree(dtmp)