← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_versioning.py

  • Committer: John Arbash Meinel
  • Date: 2006-01-05 22:59:14 UTC
  • mto: (1685.1.1 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060105225914-174b175b9feca89b
Adding a test case which uses non-ascii characters for email, filename, and commit message

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
17
17
 
18
18
"""Tests of simple versioning operations"""
19
19
 
20
 
 
21
 
from bzrlib.selftest import InTempDir
22
 
 
23
 
class Mkdir(InTempDir):
24
 
    def runTest(self): 
 
20
# TODO: test trying to commit within a directory that is not yet added
 
21
 
 
22
 
 
23
import os
 
24
 
 
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
 
26
from bzrlib.branch import Branch
 
27
from bzrlib.trace import mutter
 
28
from bzrlib.osutils import pathjoin
 
29
 
 
30
 
 
31
class TestVersioning(TestCaseInTempDir):
 
32
    
 
33
    def test_mkdir(self): 
25
34
        """Basic 'bzr mkdir' operation"""
26
 
        from bzrlib.commands import run_bzr
27
 
        import os
28
35
 
29
 
        run_bzr(['bzr', 'init'])
30
 
        run_bzr(['bzr', 'mkdir', 'foo'])
 
36
        self.run_bzr('init')
 
37
        self.run_bzr('mkdir', 'foo')
31
38
        self.assert_(os.path.isdir('foo'))
32
39
 
33
 
        self.assertRaises(OSError, run_bzr, ['bzr', 'mkdir', 'foo'])
 
40
        self.run_bzr('mkdir', 'foo', retcode=3)
34
41
 
35
 
        from bzrlib.diff import compare_trees, TreeDelta
 
42
        from bzrlib.diff import compare_trees
36
43
        from bzrlib.branch import Branch
37
 
        b = Branch('.')
 
44
        b = Branch.open(u'.')
38
45
        
39
46
        delta = compare_trees(b.basis_tree(), b.working_tree())
40
47
 
 
48
        self.log('delta.added = %r' % delta.added)
 
49
 
41
50
        self.assertEquals(len(delta.added), 1)
42
51
        self.assertEquals(delta.added[0][0], 'foo')
43
52
        self.failIf(delta.modified)
44
53
 
45
 
 
46
 
 
47
 
class AddInUnversioned(InTempDir):
48
 
    def runTest(self):
 
54
    def test_mkdir_in_subdir(self):
 
55
        """'bzr mkdir' operation in subdirectory"""
 
56
 
 
57
        self.run_bzr('init')
 
58
        self.run_bzr('mkdir', 'dir')
 
59
        self.assert_(os.path.isdir('dir'))
 
60
 
 
61
        os.chdir('dir')
 
62
        self.log('Run mkdir in subdir')
 
63
        self.run_bzr('mkdir', 'subdir')
 
64
        self.assert_(os.path.isdir('subdir'))
 
65
        os.chdir('..')
 
66
 
 
67
        from bzrlib.diff import compare_trees
 
68
        from bzrlib.branch import Branch
 
69
        b = Branch.open(u'.')
 
70
        
 
71
        delta = compare_trees(b.basis_tree(), b.working_tree())
 
72
 
 
73
        self.log('delta.added = %r' % delta.added)
 
74
 
 
75
        self.assertEquals(len(delta.added), 2)
 
76
        self.assertEquals(delta.added[0][0], 'dir')
 
77
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
 
78
        self.failIf(delta.modified)
 
79
 
 
80
    def test_mkdir_w_nested_trees(self):
 
81
        """'bzr mkdir' with nested trees"""
 
82
 
 
83
        self.run_bzr('init')
 
84
        os.mkdir('a')
 
85
        os.chdir('a')
 
86
        self.run_bzr('init')
 
87
        os.mkdir('b')
 
88
        os.chdir('b')
 
89
        self.run_bzr('init')
 
90
        os.chdir('../..')
 
91
 
 
92
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
 
93
        self.failUnless(os.path.isdir('dir'))
 
94
        self.failUnless(os.path.isdir('a/dir'))
 
95
        self.failUnless(os.path.isdir('a/b/dir'))
 
96
 
 
97
        from bzrlib.diff import compare_trees
 
98
        b = Branch.open(u'.')
 
99
        b_a = Branch.open('a')
 
100
        b_b = Branch.open('a/b')
 
101
        
 
102
        delta = compare_trees(b.basis_tree(), b.working_tree())
 
103
        self.assertEquals(len(delta.added), 1)
 
104
        self.assertEquals(delta.added[0][0], 'dir')
 
105
        self.failIf(delta.modified)
 
106
 
 
107
        delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
 
108
        self.assertEquals(len(delta.added), 1)
 
109
        self.assertEquals(delta.added[0][0], 'dir')
 
110
        self.failIf(delta.modified)
 
111
 
 
112
        delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
 
113
        self.assertEquals(len(delta.added), 1)
 
114
        self.assertEquals(delta.added[0][0], 'dir')
 
115
        self.failIf(delta.modified)
 
116
 
 
117
    def test_working_tree_add_in_unversioned(self):
49
118
        """Try to add a file in an unversioned directory.
50
119
 
51
 
        smart_add may eventually add the parent as necessary, but simple
52
 
        branch add doesn't do that.
 
120
        "bzr add" adds the parent as necessary, but simple working tree add
 
121
        doesn't do that.
53
122
        """
54
123
        from bzrlib.branch import Branch
55
 
        import os
56
124
        from bzrlib.errors import NotVersionedError
 
125
        from bzrlib.workingtree import WorkingTree
57
126
 
58
 
        b = Branch('.', init=True)
 
127
        b = Branch.initialize(u'.')
59
128
 
60
129
        self.build_tree(['foo/',
61
130
                         'foo/hello'])
62
131
 
63
132
        self.assertRaises(NotVersionedError,
64
 
                          b.add,
 
133
                          WorkingTree(b.base, b).add,
65
134
                          'foo/hello')
66
135
        
67
 
 
68
 
 
69
 
TEST_CLASSES = [
70
 
    Mkdir,
71
 
    AddInUnversioned,
72
 
    ]
 
136
        self.check_branch()
 
137
 
 
138
    def check_branch(self):
 
139
        """After all the above changes, run the check and upgrade commands.
 
140
 
 
141
        The upgrade should be a no-op."""
 
142
        b = Branch.open(u'.')
 
143
        mutter('branch has %d revisions', b.revno())
 
144
        
 
145
        mutter('check branch...')
 
146
        from bzrlib.check import check
 
147
        check(b, False)
 
148
 
 
149
 
 
150
class SubdirCommit(TestCaseInTempDir):
 
151
 
 
152
    def test_subdir_commit(self):
 
153
        """Test committing a subdirectory, and committing within a directory."""
 
154
        run_bzr = self.run_bzr
 
155
        eq = self.assertEqual
 
156
 
 
157
        self.build_tree(['a/', 'b/'])
 
158
        
 
159
        run_bzr('init')
 
160
        b = Branch.open(u'.')
 
161
        
 
162
        for fn in ('a/one', 'b/two', 'top'):
 
163
            file(fn, 'w').write('old contents')
 
164
            
 
165
        run_bzr('add')
 
166
        run_bzr('commit', '-m', 'first revision')
 
167
        
 
168
        for fn in ('a/one', 'b/two', 'top'):
 
169
            file(fn, 'w').write('new contents')
 
170
            
 
171
        mutter('start selective subdir commit')
 
172
        run_bzr('commit', 'a', '-m', 'commit a only')
 
173
        
 
174
        old = b.revision_tree(b.get_rev_id(1))
 
175
        new = b.revision_tree(b.get_rev_id(2))
 
176
        
 
177
        eq(new.get_file_by_path('b/two').read(), 'old contents')
 
178
        eq(new.get_file_by_path('top').read(), 'old contents')
 
179
        eq(new.get_file_by_path('a/one').read(), 'new contents')
 
180
        
 
181
        os.chdir('a')
 
182
        # commit from here should do nothing
 
183
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
 
184
        v3 = b.revision_tree(b.get_rev_id(3))
 
185
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
 
186
        eq(v3.get_file_by_path('top').read(), 'old contents')
 
187
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
 
188
                
 
189
        # commit in subdirectory commits whole tree
 
190
        run_bzr('commit', '-m', 'commit whole tree from subdir')
 
191
        v4 = b.revision_tree(b.get_rev_id(4))
 
192
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
 
193
        eq(v4.get_file_by_path('top').read(), 'new contents')
 
194
        
 
195
        # TODO: factor out some kind of assert_tree_state() method
 
196
        
 
197
 
 
198
if __name__ == '__main__':
 
199
    import unittest
 
200
    unittest.main()
 
201