← 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: Canonical.com Patch Queue Manager
  • Date: 2006-06-29 18:21:57 UTC
  • mfrom: (1711.2.72 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
(jam) add run_bzr_error, clean up remerge tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
22
22
 
23
23
import os
24
24
 
25
 
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
 
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
26
26
from bzrlib.branch import Branch
27
 
 
28
 
import logging
29
 
logger = logging.getLogger('bzr.test.versioning')
30
 
debug = logger.debug
 
27
from bzrlib.trace import mutter
 
28
from bzrlib.osutils import pathjoin
 
29
from bzrlib.workingtree import WorkingTree
31
30
 
32
31
 
33
32
class TestVersioning(TestCaseInTempDir):
34
33
    
35
34
    def test_mkdir(self): 
36
35
        """Basic 'bzr mkdir' operation"""
37
 
        from bzrlib.commands import run_bzr
38
36
 
39
 
        run_bzr(['init'])
40
 
        run_bzr(['mkdir', 'foo'])
 
37
        self.run_bzr('init')
 
38
        self.run_bzr('mkdir', 'foo')
41
39
        self.assert_(os.path.isdir('foo'))
42
40
 
43
 
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
 
41
        self.run_bzr('mkdir', 'foo', retcode=3)
44
42
 
45
43
        from bzrlib.diff import compare_trees
46
 
        from bzrlib.branch import Branch
47
 
        b = Branch.open('.')
 
44
        wt = WorkingTree.open('.')
48
45
        
49
 
        delta = compare_trees(b.basis_tree(), b.working_tree())
 
46
        delta = compare_trees(wt.basis_tree(), wt)
50
47
 
51
48
        self.log('delta.added = %r' % delta.added)
52
49
 
54
51
        self.assertEquals(delta.added[0][0], 'foo')
55
52
        self.failIf(delta.modified)
56
53
 
57
 
    def test_branch_add_in_unversioned(self):
58
 
        """Try to add a file in an unversioned directory.
59
 
 
60
 
        "bzr add" adds the parent as necessary, but simple branch add
61
 
        doesn't do that.
62
 
        """
63
 
        from bzrlib.branch import Branch
64
 
        from bzrlib.errors import NotVersionedError
65
 
 
66
 
        b = Branch.initialize('.')
67
 
 
68
 
        self.build_tree(['foo/',
69
 
                         'foo/hello'])
70
 
 
71
 
        self.assertRaises(NotVersionedError,
72
 
                          b.add,
73
 
                          'foo/hello')
74
 
        
75
 
        self.check_and_upgrade()
76
 
 
77
 
 
78
 
    def test_add_in_unversioned(self):
79
 
        """Try to add a file in an unversioned directory.
80
 
 
81
 
        "bzr add" should add the parent(s) as necessary.
82
 
        """
83
 
        from bzrlib.branch import Branch
84
 
        from bzrlib.commands import run_bzr
85
 
        eq = self.assertEqual
86
 
 
87
 
        b = Branch.initialize('.')
88
 
 
89
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
90
 
        eq(list(b.unknowns()), ['inertiatic'])
91
 
        run_bzr(['add', 'inertiatic/esp'])
92
 
        eq(list(b.unknowns()), [])
93
 
 
94
 
        # Multiple unversioned parents
95
 
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
96
 
        eq(list(b.unknowns()), ['veil'])
97
 
        run_bzr(['add', 'veil/cerpin/taxt'])
98
 
        eq(list(b.unknowns()), [])
99
 
 
100
 
        # Check whacky paths work
101
 
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
102
 
        eq(list(b.unknowns()), ['cicatriz'])
103
 
        run_bzr(['add', 'inertiatic/../cicatriz/esp'])
104
 
        eq(list(b.unknowns()), [])
105
 
 
106
 
    def test_add_in_versioned(self):
107
 
        """Try to add a file in a versioned directory.
108
 
 
109
 
        "bzr add" should do this happily.
110
 
        """
111
 
        from bzrlib.branch import Branch
112
 
        from bzrlib.commands import run_bzr
113
 
        eq = self.assertEqual
114
 
 
115
 
        b = Branch.initialize('.')
116
 
 
117
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
118
 
        eq(list(b.unknowns()), ['inertiatic'])
119
 
        run_bzr(['add', '--no-recurse', 'inertiatic'])
120
 
        eq(list(b.unknowns()), ['inertiatic/esp'])
121
 
        run_bzr(['add', 'inertiatic/esp'])
122
 
        eq(list(b.unknowns()), [])
123
 
 
124
 
    def test_subdir_add(self):
125
 
        """Add in subdirectory should add only things from there down"""
126
 
        
127
 
        from bzrlib.branch import Branch
128
 
        from bzrlib.commands import run_bzr
129
 
        
130
 
        eq = self.assertEqual
131
 
        ass = self.assert_
132
 
        chdir = os.chdir
133
 
        
134
 
        b = Branch.initialize('.')
135
 
        self.build_tree(['src/', 'README'])
136
 
        
137
 
        eq(sorted(b.unknowns()),
138
 
           ['README', 'src'])
139
 
        
140
 
        eq(run_bzr(['add', 'src']), 0)
141
 
        
142
 
        self.build_tree(['src/foo.c'])
143
 
        
144
 
        chdir('src')
145
 
        eq(run_bzr(['add']), 0)
146
 
        
147
 
        eq(sorted(b.unknowns()), 
148
 
           ['README'])
149
 
        eq(len(b.inventory), 3)
150
 
                
151
 
        chdir('..')
152
 
        eq(run_bzr(['add']), 0)
153
 
        eq(list(b.unknowns()), [])
154
 
 
155
 
        self.check_and_upgrade()
156
 
 
157
 
 
158
 
    def check_and_upgrade(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
        wt = WorkingTree.open('.')
 
69
        
 
70
        delta = compare_trees(wt.basis_tree(), wt)
 
71
 
 
72
        self.log('delta.added = %r' % delta.added)
 
73
 
 
74
        self.assertEquals(len(delta.added), 2)
 
75
        self.assertEquals(delta.added[0][0], 'dir')
 
76
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
 
77
        self.failIf(delta.modified)
 
78
 
 
79
    def test_mkdir_w_nested_trees(self):
 
80
        """'bzr mkdir' with nested trees"""
 
81
 
 
82
        self.run_bzr('init')
 
83
        os.mkdir('a')
 
84
        os.chdir('a')
 
85
        self.run_bzr('init')
 
86
        os.mkdir('b')
 
87
        os.chdir('b')
 
88
        self.run_bzr('init')
 
89
        os.chdir('../..')
 
90
 
 
91
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
 
92
        self.failUnless(os.path.isdir('dir'))
 
93
        self.failUnless(os.path.isdir('a/dir'))
 
94
        self.failUnless(os.path.isdir('a/b/dir'))
 
95
 
 
96
        from bzrlib.diff import compare_trees
 
97
        wt = WorkingTree.open('.')
 
98
        wt_a = WorkingTree.open('a')
 
99
        wt_b = WorkingTree.open('a/b')
 
100
        
 
101
        delta = compare_trees(wt.basis_tree(), wt)
 
102
        self.assertEquals(len(delta.added), 1)
 
103
        self.assertEquals(delta.added[0][0], 'dir')
 
104
        self.failIf(delta.modified)
 
105
 
 
106
        delta = compare_trees(wt_a.basis_tree(), wt_a)
 
107
        self.assertEquals(len(delta.added), 1)
 
108
        self.assertEquals(delta.added[0][0], 'dir')
 
109
        self.failIf(delta.modified)
 
110
 
 
111
        delta = compare_trees(wt_b.basis_tree(), wt_b)
 
112
        self.assertEquals(len(delta.added), 1)
 
113
        self.assertEquals(delta.added[0][0], 'dir')
 
114
        self.failIf(delta.modified)
 
115
 
 
116
    def check_branch(self):
159
117
        """After all the above changes, run the check and upgrade commands.
160
118
 
161
119
        The upgrade should be a no-op."""
162
 
        b = Branch.open('.')
163
 
        debug('branch has %d revisions', b.revno())
164
 
        
165
 
        debug('check branch...')
166
 
        from bzrlib.check import check
167
 
        check(b)
168
 
        
169
 
        debug('upgrade branch...')
170
 
        from bzrlib.upgrade import upgrade
171
 
        upgrade(b)
172
 
        
173
 
        debug('check branch...')
174
 
        from bzrlib.check import check
175
 
        check(b)
176
 
        
177
 
 
178
 
        
 
120
        b = Branch.open(u'.')
 
121
        mutter('branch has %d revisions', b.revno())
 
122
        
 
123
        mutter('check branch...')
 
124
        from bzrlib.check import check
 
125
        check(b, False)
 
126
 
 
127
 
179
128
class SubdirCommit(TestCaseInTempDir):
180
129
 
181
130
    def test_subdir_commit(self):
186
135
        self.build_tree(['a/', 'b/'])
187
136
        
188
137
        run_bzr('init')
189
 
        b = Branch.open('.')
 
138
        b = Branch.open(u'.')
190
139
        
191
140
        for fn in ('a/one', 'b/two', 'top'):
192
141
            file(fn, 'w').write('old contents')
197
146
        for fn in ('a/one', 'b/two', 'top'):
198
147
            file(fn, 'w').write('new contents')
199
148
            
 
149
        mutter('start selective subdir commit')
200
150
        run_bzr('commit', 'a', '-m', 'commit a only')
201
151
        
202
 
        old = b.revision_tree(b.get_rev_id(1))
203
 
        new = b.revision_tree(b.get_rev_id(2))
 
152
        old = b.repository.revision_tree(b.get_rev_id(1))
 
153
        new = b.repository.revision_tree(b.get_rev_id(2))
204
154
        
205
155
        eq(new.get_file_by_path('b/two').read(), 'old contents')
206
156
        eq(new.get_file_by_path('top').read(), 'old contents')
209
159
        os.chdir('a')
210
160
        # commit from here should do nothing
211
161
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
212
 
        v3 = b.revision_tree(b.get_rev_id(3))
 
162
        v3 = b.repository.revision_tree(b.get_rev_id(3))
213
163
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
214
164
        eq(v3.get_file_by_path('top').read(), 'old contents')
215
165
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
216
166
                
217
167
        # commit in subdirectory commits whole tree
218
168
        run_bzr('commit', '-m', 'commit whole tree from subdir')
219
 
        v4 = b.revision_tree(b.get_rev_id(4))
 
169
        v4 = b.repository.revision_tree(b.get_rev_id(4))
220
170
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
221
171
        eq(v4.get_file_by_path('top').read(), 'new contents')
222
172
        
223
173
        # TODO: factor out some kind of assert_tree_state() method
224
174
        
 
175
 
 
176
if __name__ == '__main__':
 
177
    import unittest
 
178
    unittest.main()
 
179