← 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

Late bind to PatienceSequenceMatcher to allow plugin to override.

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_branch()
76
 
 
77
 
    def test_add_in_unversioned(self):
78
 
        """Try to add a file in an unversioned directory.
79
 
 
80
 
        "bzr add" should add the parent(s) as necessary.
81
 
        """
82
 
        from bzrlib.branch import Branch
83
 
        from bzrlib.commands import run_bzr
84
 
        eq = self.assertEqual
85
 
 
86
 
        b = Branch.initialize('.')
87
 
 
88
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
89
 
        eq(list(b.unknowns()), ['inertiatic'])
90
 
        run_bzr(['add', 'inertiatic/esp'])
91
 
        eq(list(b.unknowns()), [])
92
 
 
93
 
        # Multiple unversioned parents
94
 
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
95
 
        eq(list(b.unknowns()), ['veil'])
96
 
        run_bzr(['add', 'veil/cerpin/taxt'])
97
 
        eq(list(b.unknowns()), [])
98
 
 
99
 
        # Check whacky paths work
100
 
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
101
 
        eq(list(b.unknowns()), ['cicatriz'])
102
 
        run_bzr(['add', 'inertiatic/../cicatriz/esp'])
103
 
        eq(list(b.unknowns()), [])
104
 
 
105
 
    def test_add_in_versioned(self):
106
 
        """Try to add a file in a versioned directory.
107
 
 
108
 
        "bzr add" should do this happily.
109
 
        """
110
 
        from bzrlib.branch import Branch
111
 
        from bzrlib.commands import run_bzr
112
 
        eq = self.assertEqual
113
 
 
114
 
        b = Branch.initialize('.')
115
 
 
116
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
117
 
        eq(list(b.unknowns()), ['inertiatic'])
118
 
        run_bzr(['add', '--no-recurse', 'inertiatic'])
119
 
        eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
120
 
        run_bzr(['add', 'inertiatic/esp'])
121
 
        eq(list(b.unknowns()), [])
122
 
 
123
 
    def test_subdir_add(self):
124
 
        """Add in subdirectory should add only things from there down"""
125
 
        
126
 
        from bzrlib.branch import Branch
127
 
        from bzrlib.commands import run_bzr
128
 
        
129
 
        eq = self.assertEqual
130
 
        ass = self.assert_
131
 
        chdir = os.chdir
132
 
        
133
 
        b = Branch.initialize('.')
134
 
        self.build_tree(['src/', 'README'])
135
 
        
136
 
        eq(sorted(b.unknowns()),
137
 
           ['README', 'src'])
138
 
        
139
 
        eq(run_bzr(['add', 'src']), 0)
140
 
        
141
 
        self.build_tree(['src/foo.c'])
142
 
        
143
 
        chdir('src')
144
 
        eq(run_bzr(['add']), 0)
145
 
        
146
 
        eq(sorted(b.unknowns()), 
147
 
           ['README'])
148
 
        eq(len(b.inventory), 3)
149
 
                
150
 
        chdir('..')
151
 
        eq(run_bzr(['add']), 0)
152
 
        eq(list(b.unknowns()), [])
153
 
 
154
 
        self.check_branch()
 
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)
155
115
 
156
116
    def check_branch(self):
157
117
        """After all the above changes, run the check and upgrade commands.
158
118
 
159
119
        The upgrade should be a no-op."""
160
 
        b = Branch.open('.')
161
 
        debug('branch has %d revisions', b.revno())
 
120
        b = Branch.open(u'.')
 
121
        mutter('branch has %d revisions', b.revno())
162
122
        
163
 
        debug('check branch...')
 
123
        mutter('check branch...')
164
124
        from bzrlib.check import check
165
125
        check(b, False)
166
 
        
167
 
 
168
 
        
 
126
 
 
127
 
169
128
class SubdirCommit(TestCaseInTempDir):
170
129
 
171
130
    def test_subdir_commit(self):
176
135
        self.build_tree(['a/', 'b/'])
177
136
        
178
137
        run_bzr('init')
179
 
        b = Branch.open('.')
 
138
        b = Branch.open(u'.')
180
139
        
181
140
        for fn in ('a/one', 'b/two', 'top'):
182
141
            file(fn, 'w').write('old contents')
187
146
        for fn in ('a/one', 'b/two', 'top'):
188
147
            file(fn, 'w').write('new contents')
189
148
            
190
 
        debug('start selective subdir commit')
 
149
        mutter('start selective subdir commit')
191
150
        run_bzr('commit', 'a', '-m', 'commit a only')
192
151
        
193
 
        old = b.revision_tree(b.get_rev_id(1))
194
 
        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))
195
154
        
196
155
        eq(new.get_file_by_path('b/two').read(), 'old contents')
197
156
        eq(new.get_file_by_path('top').read(), 'old contents')
200
159
        os.chdir('a')
201
160
        # commit from here should do nothing
202
161
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
203
 
        v3 = b.revision_tree(b.get_rev_id(3))
 
162
        v3 = b.repository.revision_tree(b.get_rev_id(3))
204
163
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
205
164
        eq(v3.get_file_by_path('top').read(), 'old contents')
206
165
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
207
166
                
208
167
        # commit in subdirectory commits whole tree
209
168
        run_bzr('commit', '-m', 'commit whole tree from subdir')
210
 
        v4 = b.revision_tree(b.get_rev_id(4))
 
169
        v4 = b.repository.revision_tree(b.get_rev_id(4))
211
170
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
212
171
        eq(v4.get_file_by_path('top').read(), 'new contents')
213
172