/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-09-16 06:51:44 UTC
  • Revision ID: mbp@sourcefrog.net-20050916065144-dbf04063a4b635b6
- pointless commit of r1 no longer allowed
  (same behaviour as with old commit code)

Show diffs side-by-side

added added

removed removed

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