← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2007-05-04 18:59:36 UTC
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070504185936-1mjdoqmtz74xe5mg
A C implementation of _fields_to_entry_0_parents drops the time from 400ms to 330ms for a 21k-entry tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
38
38
    """Base class with common setup method"""
39
39
 
40
40
    def make_example_branch(self):
 
41
        # FIXME: copied from test_too_much -- share elsewhere?
41
42
        tree = self.make_branch_and_tree('.')
42
 
        self.build_tree_contents([
43
 
            ('hello', 'foo\n'),
44
 
            ('goodbye', 'baz\n')])
 
43
        open('hello', 'wb').write('foo\n')
45
44
        tree.add(['hello'])
46
45
        tree.commit('setup')
 
46
        open('goodbye', 'wb').write('baz\n')
47
47
        tree.add(['goodbye'])
48
48
        tree.commit('setup')
49
 
        return tree
50
49
 
51
50
 
52
51
class TestDiff(DiffBase):
53
52
 
54
53
    def test_diff(self):
55
 
        tree = self.make_example_branch()
56
 
        self.build_tree_contents([('hello', 'hello world!')])
57
 
        tree.commit(message='fixing hello')
58
 
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
59
 
        self.assert_('\n+hello world!' in output)
60
 
        output = self.run_bzr('diff -c 3', retcode=1)[0]
61
 
        self.assert_('\n+hello world!' in output)
62
 
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
63
 
        self.assert_('\n+baz' in output)
64
 
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
65
 
        self.assert_('\n+baz' in output)
66
 
        self.build_tree(['moo'])
67
 
        tree.add('moo')
 
54
        self.make_example_branch()
 
55
        file('hello', 'wt').write('hello world!')
 
56
        self.runbzr('commit -m fixing hello')
 
57
        output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
 
58
        self.assert_('\n+hello world!' in output)
 
59
        output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
 
60
        self.assert_('\n+baz' in output)
 
61
        file('moo', 'wb').write('moo')
 
62
        self.runbzr('add moo')
68
63
        os.unlink('moo')
69
 
        self.run_bzr('diff')
 
64
        self.runbzr('diff')
70
65
 
71
66
    def test_diff_prefix(self):
72
67
        """diff --prefix appends to filenames in output"""
73
68
        self.make_example_branch()
74
 
        self.build_tree_contents([('hello', 'hello world!\n')])
75
 
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
 
69
        file('hello', 'wb').write('hello world!\n')
 
70
        out, err = self.runbzr('diff --prefix old/:new/', retcode=1)
76
71
        self.assertEquals(err, '')
77
72
        self.assertEqualDiff(subst_dates(out), '''\
78
73
=== modified file 'hello'
86
81
 
87
82
    def test_diff_illegal_prefix_value(self):
88
83
        # There was an error in error reporting for this option
89
 
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
 
84
        out, err = self.runbzr('diff --prefix old/', retcode=3)
90
85
        self.assertContainsRe(err,
91
86
            '--prefix expects two values separated by a colon')
92
87
 
93
88
    def test_diff_p1(self):
94
89
        """diff -p1 produces lkml-style diffs"""
95
90
        self.make_example_branch()
96
 
        self.build_tree_contents([('hello', 'hello world!\n')])
97
 
        out, err = self.run_bzr('diff -p1', retcode=1)
 
91
        file('hello', 'wb').write('hello world!\n')
 
92
        out, err = self.runbzr('diff -p1', retcode=1)
98
93
        self.assertEquals(err, '')
99
94
        self.assertEqualDiff(subst_dates(out), '''\
100
95
=== modified file 'hello'
109
104
    def test_diff_p0(self):
110
105
        """diff -p0 produces diffs with no prefix"""
111
106
        self.make_example_branch()
112
 
        self.build_tree_contents([('hello', 'hello world!\n')])
113
 
        out, err = self.run_bzr('diff -p0', retcode=1)
 
107
        file('hello', 'wb').write('hello world!\n')
 
108
        out, err = self.runbzr('diff -p0', retcode=1)
114
109
        self.assertEquals(err, '')
115
110
        self.assertEqualDiff(subst_dates(out), '''\
116
111
=== modified file 'hello'
126
121
        # Get an error from a file that does not exist at all
127
122
        # (Malone #3619)
128
123
        self.make_example_branch()
129
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
 
124
        out, err = self.runbzr('diff does-not-exist', retcode=3)
130
125
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
131
126
 
132
127
    def test_diff_illegal_revision_specifiers(self):
133
 
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
 
128
        out, err = self.runbzr('diff -r 1..23..123', retcode=3)
134
129
        self.assertContainsRe(err, 'one or two revision specifiers')
135
130
 
136
131
    def test_diff_unversioned(self):
138
133
        # (Malone #3619)
139
134
        self.make_example_branch()
140
135
        self.build_tree(['unversioned-file'])
141
 
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
 
136
        out, err = self.runbzr('diff unversioned-file', retcode=3)
142
137
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
143
138
 
144
139
    # TODO: What should diff say for a file deleted in working tree?
145
140
 
146
141
    def example_branches(self):
147
 
        branch1_tree = self.make_branch_and_tree('branch1')
148
 
        self.build_tree(['branch1/file'], line_endings='binary')
149
 
        self.build_tree(['branch1/file2'], line_endings='binary')
150
 
        branch1_tree.add('file')
151
 
        branch1_tree.add('file2')
152
 
        branch1_tree.commit(message='add file and file2')
153
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
154
 
        self.build_tree_contents([('branch2/file', 'new content\n')])
155
 
        branch2_tree.commit(message='update file')
156
 
        return branch1_tree, branch2_tree
 
142
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
 
143
        self.capture('init branch1')
 
144
        self.capture('add branch1/file')
 
145
        self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
 
146
        self.capture('branch branch1 branch2')
 
147
        print >> open('branch2/file', 'wb'), 'new content'
 
148
        self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
157
149
 
158
 
    def check_b2_vs_b1(self, cmd):
159
 
        # Compare branch2 vs branch1 using cmd and check the result
160
 
        out, err = self.run_bzr(cmd, retcode=1)
 
150
    def test_diff_branches(self):
 
151
        self.example_branches()
 
152
        # should open branch1 and diff against branch2, 
 
153
        out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 
 
154
                                          'branch1'],
 
155
                                         retcode=1)
161
156
        self.assertEquals('', err)
162
157
        self.assertEquals("=== modified file 'file'\n"
163
158
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
166
161
                          "-new content\n"
167
162
                          "+contents of branch1/file\n"
168
163
                          "\n", subst_dates(out))
169
 
 
170
 
    def check_b1_vs_b2(self, cmd):
171
 
        # Compare branch1 vs branch2 using cmd and check the result
172
 
        out, err = self.run_bzr(cmd, retcode=1)
 
164
        out, err = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
 
165
                                         retcode=1)
173
166
        self.assertEquals('', err)
174
167
        self.assertEqualDiff("=== modified file 'file'\n"
175
168
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
176
169
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
177
170
                              "@@ -1,1 +1,1 @@\n"
178
 
                              "-contents of branch1/file\n"
179
 
                              "+new content\n"
 
171
                              "-new content\n"
 
172
                              "+contents of branch1/file\n"
180
173
                              "\n", subst_dates(out))
181
174
 
182
 
    def check_no_diffs(self, cmd):
183
 
        # Check that running cmd returns an empty diff
184
 
        out, err = self.run_bzr(cmd, retcode=0)
185
 
        self.assertEquals('', err)
186
 
        self.assertEquals('', out)
187
 
 
188
 
    def test_diff_branches(self):
189
 
        self.example_branches()
190
 
        # should open branch1 and diff against branch2, 
191
 
        self.check_b2_vs_b1('diff -r branch:branch2 branch1')
192
 
        # Compare two working trees using various syntax forms
193
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
194
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
195
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
196
 
        # Test with a selected file that was changed
197
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
198
 
        self.check_b2_vs_b1('diff --old branch2 branch1/file')
199
 
        self.check_b2_vs_b1('diff branch2/file --new branch1')
200
 
        # Test with a selected file that was not changed
201
 
        self.check_no_diffs('diff --old branch2 --new branch1 file2')
202
 
        self.check_no_diffs('diff --old branch2 branch1/file2')
203
 
        self.check_no_diffs('diff branch2/file2 --new branch1')
204
 
 
205
 
    def test_diff_branches_no_working_trees(self):
206
 
        branch1_tree, branch2_tree = self.example_branches()
207
 
        # Compare a working tree to a branch without a WT
208
 
        dir1 = branch1_tree.bzrdir
209
 
        dir1.destroy_workingtree()
210
 
        self.assertFalse(dir1.has_workingtree())
211
 
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
212
 
        self.check_b2_vs_b1('diff --old branch2 branch1')
213
 
        self.check_b2_vs_b1('diff branch2 --new branch1')
214
 
        # Compare a branch without a WT to one with a WT
215
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
216
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
217
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
218
 
        # Compare a branch with a WT against another without a WT
219
 
        dir2 = branch2_tree.bzrdir
220
 
        dir2.destroy_workingtree()
221
 
        self.assertFalse(dir2.has_workingtree())
222
 
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
223
 
        self.check_b1_vs_b2('diff --old branch1 branch2')
224
 
        self.check_b1_vs_b2('diff branch1 --new branch2')
225
 
 
226
175
    def test_diff_revno_branches(self):
227
176
        self.example_branches()
228
 
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
229
 
        self.build_tree_contents([('branch2/file', 'even newer content')])
230
 
        branch2_tree.commit(message='update file once more')
 
177
        print >> open('branch2/file', 'wb'), 'even newer content'
 
178
        self.run_bzr_captured(['commit', '-m', 
 
179
                               'update file once more', 'branch2'])
231
180
 
232
 
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
233
 
                                )
 
181
        out, err = self.run_bzr_captured(['diff', '-r',
 
182
                                          'revno:1:branch2..revno:1:branch1'],
 
183
                                         retcode=0)
234
184
        self.assertEquals('', err)
235
185
        self.assertEquals('', out)
236
 
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
237
 
                                retcode=1)
 
186
        out, err = self.run_bzr_captured(['diff', '-r', 
 
187
                                          'revno:2:branch2..revno:1:branch1'],
 
188
                                         retcode=1)
238
189
        self.assertEquals('', err)
239
190
        self.assertEqualDiff("=== modified file 'file'\n"
240
191
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
245
196
                              "\n", subst_dates(out))
246
197
 
247
198
    def example_branch2(self):
248
 
        branch1_tree = self.make_branch_and_tree('branch1')
249
 
        self.build_tree_contents([('branch1/file1', 'original line\n')])
250
 
        branch1_tree.add('file1')
251
 
        branch1_tree.commit(message='first commit')
252
 
        self.build_tree_contents([('branch1/file1', 'repo line\n')])
253
 
        branch1_tree.commit(message='second commit')
254
 
        return branch1_tree
 
199
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
 
200
        self.capture('init branch1')
 
201
        self.capture('add branch1/file1')
 
202
        print >> open('branch1/file1', 'wb'), 'original line'
 
203
        self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
 
204
        
 
205
        print >> open('branch1/file1', 'wb'), 'repo line'
 
206
        self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
255
207
 
256
208
    def test_diff_to_working_tree(self):
257
209
        self.example_branch2()
258
 
        self.build_tree_contents([('branch1/file1', 'new line')])
259
 
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
260
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
261
 
 
262
 
    def test_diff_to_working_tree_in_subdir(self):
263
 
        self.example_branch2()
264
 
        self.build_tree_contents([('branch1/file1', 'new line')])
265
 
        os.mkdir('branch1/dir1')
266
 
        os.chdir('branch1/dir1')
267
 
        output = self.run_bzr('diff -r 1..', retcode=1)
268
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
210
        
 
211
        print >> open('branch1/file1', 'wb'), 'new line'
 
212
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],
 
213
                                       retcode=1)
 
214
        self.assertTrue('\n-original line\n+new line\n' in output[0])
269
215
 
270
216
    def test_diff_across_rename(self):
271
217
        """The working tree path should always be considered for diffing"""
272
 
        tree = self.make_example_branch()
273
 
        self.run_bzr('diff -r 0..1 hello', retcode=1)
274
 
        tree.rename_one('hello', 'hello1')
275
 
        self.run_bzr('diff hello1', retcode=1)
276
 
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
277
 
 
278
 
    def test_diff_to_branch_no_working_tree(self):
279
 
        branch1_tree = self.example_branch2()
280
 
        dir1 = branch1_tree.bzrdir
281
 
        dir1.destroy_workingtree()
282
 
        self.assertFalse(dir1.has_workingtree())
283
 
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
284
 
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
 
218
        self.make_example_branch()
 
219
        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
 
220
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
221
        wt.rename_one('hello', 'hello1')
 
222
        self.run_bzr('diff', 'hello1', retcode=1)
 
223
        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
285
224
 
286
225
 
287
226
class TestCheckoutDiff(TestDiff):
288
227
 
289
228
    def make_example_branch(self):
290
 
        tree = super(TestCheckoutDiff, self).make_example_branch()
291
 
        tree = tree.branch.create_checkout('checkout')
 
229
        super(TestCheckoutDiff, self).make_example_branch()
 
230
        self.runbzr('checkout . checkout')
292
231
        os.chdir('checkout')
293
 
        return tree
294
232
 
295
233
    def example_branch2(self):
296
 
        tree = super(TestCheckoutDiff, self).example_branch2()
 
234
        super(TestCheckoutDiff, self).example_branch2()
297
235
        os.mkdir('checkouts')
298
 
        tree = tree.branch.create_checkout('checkouts/branch1')
 
236
        self.runbzr('checkout branch1 checkouts/branch1')
299
237
        os.chdir('checkouts')
300
 
        return tree
301
238
 
302
239
    def example_branches(self):
303
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
 
240
        super(TestCheckoutDiff, self).example_branches()
304
241
        os.mkdir('checkouts')
305
 
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
306
 
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
 
242
        self.runbzr('checkout branch1 checkouts/branch1')
 
243
        self.runbzr('checkout branch2 checkouts/branch2')
307
244
        os.chdir('checkouts')
308
 
        return branch1_tree, branch2_tree
309
245
 
310
246
 
311
247
class TestDiffLabels(DiffBase):
312
248
 
313
249
    def test_diff_label_removed(self):
314
 
        tree = super(TestDiffLabels, self).make_example_branch()
315
 
        tree.remove('hello', keep_files=False)
316
 
        diff = self.run_bzr('diff', retcode=1)
 
250
        super(TestDiffLabels, self).make_example_branch()
 
251
        self.runbzr('remove hello')
 
252
        diff = self.run_bzr_captured(['diff'], retcode=1)
317
253
        self.assertTrue("=== removed file 'hello'" in diff[0])
318
254
 
319
255
    def test_diff_label_added(self):
320
 
        tree = super(TestDiffLabels, self).make_example_branch()
321
 
        self.build_tree_contents([('barbar', 'barbar')])
322
 
        tree.add('barbar')
323
 
        diff = self.run_bzr('diff', retcode=1)
 
256
        super(TestDiffLabels, self).make_example_branch()
 
257
        file('barbar', 'wt').write('barbar')
 
258
        self.runbzr('add barbar')
 
259
        diff = self.run_bzr_captured(['diff'], retcode=1)
324
260
        self.assertTrue("=== added file 'barbar'" in diff[0])
325
261
 
326
262
    def test_diff_label_modified(self):
327
263
        super(TestDiffLabels, self).make_example_branch()
328
 
        self.build_tree_contents([('hello', 'barbar')])
329
 
        diff = self.run_bzr('diff', retcode=1)
 
264
        file('hello', 'wt').write('barbar')
 
265
        diff = self.run_bzr_captured(['diff'], retcode=1)
330
266
        self.assertTrue("=== modified file 'hello'" in diff[0])
331
267
 
332
268
    def test_diff_label_renamed(self):
333
 
        tree = super(TestDiffLabels, self).make_example_branch()
334
 
        tree.rename_one('hello', 'gruezi')
335
 
        diff = self.run_bzr('diff', retcode=1)
 
269
        super(TestDiffLabels, self).make_example_branch()
 
270
        self.runbzr('rename hello gruezi')
 
271
        diff = self.run_bzr_captured(['diff'], retcode=1)
336
272
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
337
273
 
338
274
 
348
284
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
349
285
        try:
350
286
            os.environ['BZR_PROGRESS_BAR'] = 'none'
351
 
            out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
 
287
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
 
288
                                               '--diff-options', '-ub',
352
289
                                               universal_newlines=True,
353
290
                                               retcode=None)
354
291
        finally:
374
311
    def test_diff_output(self):
375
312
        # check that output doesn't mangle line-endings
376
313
        self.make_example_branch()
377
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
314
        file('hello', 'wb').write('hello world!\n')
378
315
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
379
316
        self.assert_('\n+hello world!\n' in output)