← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

Exclude more files from dumb-rsync upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
3
3
 
4
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
5
from bzrlib.branch import ScratchBranch, Branch
6
 
from bzrlib.errors import NotBranchError, NotVersionedError
 
6
from bzrlib.errors import NotBranchError
7
7
 
8
8
 
9
9
class TestBranch(TestCaseInTempDir):
25
25
        self.build_tree(['hello.txt'])
26
26
 
27
27
        self.assertRaises(PointlessCommit,
28
 
                          b.commit,
 
28
                          b.working_tree().commit,
29
29
                          'commit without adding',
30
30
                          allow_pointless=False)
31
31
 
32
 
        b.commit('commit pointless tree',
 
32
        b.working_tree().commit('commit pointless tree',
33
33
                 allow_pointless=True)
34
34
 
35
35
        b.add('hello.txt')
36
36
        
37
 
        b.commit('commit first added file',
 
37
        b.working_tree().commit('commit first added file',
38
38
                 allow_pointless=False)
39
39
        
40
40
        self.assertRaises(PointlessCommit,
41
 
                          b.commit,
 
41
                          b.working_tree().commit,
42
42
                          'commit after adding file',
43
43
                          allow_pointless=False)
44
44
        
45
 
        b.commit('commit pointless revision with one file',
 
45
        b.working_tree().commit('commit pointless revision with one file',
46
46
                 allow_pointless=True)
47
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
48
 
70
49
class MoreTests(TestCaseInTempDir):
71
50
 
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
51
    def test_rename_dirs(self):
100
52
        """Test renaming directories and the files within them."""
101
53
        b = Branch.initialize('.')
102
54
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
103
55
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
104
56
 
105
 
        b.commit('create initial state')
 
57
        b.working_tree().commit('create initial state')
106
58
 
107
59
        # TODO: lift out to a test helper that checks the shape of
108
60
        # an inventory
118
70
 
119
71
        b.rename_one('dir', 'newdir')
120
72
 
121
 
        self.check_inventory_shape(b.inventory,
 
73
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
122
74
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
123
75
 
124
76
        b.rename_one('newdir/sub', 'newdir/newsub')
125
 
        self.check_inventory_shape(b.inventory,
 
77
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
126
78
                                   ['newdir', 'newdir/newsub',
127
79
                                    'newdir/newsub/file'])
128
80
 
129
81
    def test_relpath(self):
130
82
        """test for branch path lookups
131
83
    
132
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
84
        bzrlib.osutils._relpath do a simple but subtle
133
85
        job: given a path (either relative to cwd or absolute), work out
134
86
        if it is inside a branch and return the path relative to the base.
135
87
        """
136
 
        from bzrlib.branch import _relpath
 
88
        from bzrlib.osutils import relpath
137
89
        import tempfile, shutil
138
90
        
139
91
        savedir = os.getcwdu()
142
94
        dtmp = os.path.realpath(dtmp)
143
95
 
144
96
        def rp(p):
145
 
            return _relpath(dtmp, p)
 
97
            return relpath(dtmp, p)
146
98
        
147
99
        try:
148
100
            # check paths inside dtmp while standing outside it