← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_whitebox.py

  • Committer: Robert Collins
  • Date: 2006-02-11 11:58:06 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060211115806-732dabc1e35714ed
Give format3 working trees their own last-revision marker.

Show diffs side-by-side

added added

removed removed

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