← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Robert Collins
  • Date: 2005-08-25 01:13:32 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825011331-6d549d5de7edcec1
two bugfixes to smart_add - do not add paths from nested trees to the parent tree, and do not mutate the user supplied file list

Show diffs side-by-side

added added

removed removed

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