← 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: Martin Packman
  • Date: 2011-12-23 19:38:22 UTC
  • mto: This revision was merged to the branch mainline in revision 6405.
  • Revision ID: martin.packman@canonical.com-20111223193822-hesheea4o8aqwexv
Accept and document passing the medium rather than transport for smart connections

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr diff.
21
21
import os
22
22
import re
23
23
 
24
 
import bzrlib
25
 
from bzrlib import workingtree
26
 
from bzrlib.branch import Branch
27
 
from bzrlib.tests import TestSkipped
28
 
from bzrlib.tests.blackbox import ExternalBase
 
24
from bzrlib import (
 
25
    tests,
 
26
    workingtree,
 
27
    )
 
28
from bzrlib.diff import (
 
29
    DiffTree,
 
30
    format_registry as diff_format_registry,
 
31
    )
 
32
from bzrlib.tests import (
 
33
    features,
 
34
    )
29
35
 
30
36
 
31
37
def subst_dates(string):
34
40
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
35
41
 
36
42
 
37
 
class DiffBase(ExternalBase):
 
43
class DiffBase(tests.TestCaseWithTransport):
38
44
    """Base class with common setup method"""
39
45
 
40
46
    def make_example_branch(self):
41
 
        # FIXME: copied from test_too_much -- share elsewhere?
42
47
        tree = self.make_branch_and_tree('.')
43
 
        open('hello', 'wb').write('foo\n')
 
48
        self.build_tree_contents([
 
49
            ('hello', 'foo\n'),
 
50
            ('goodbye', 'baz\n')])
44
51
        tree.add(['hello'])
45
52
        tree.commit('setup')
46
 
        open('goodbye', 'wb').write('baz\n')
47
53
        tree.add(['goodbye'])
48
54
        tree.commit('setup')
 
55
        return tree
49
56
 
50
57
 
51
58
class TestDiff(DiffBase):
52
59
 
53
60
    def test_diff(self):
54
 
        self.make_example_branch()
55
 
        file('hello', 'wt').write('hello world!')
56
 
        self.run_bzr('commit -m fixing hello')
 
61
        tree = self.make_example_branch()
 
62
        self.build_tree_contents([('hello', 'hello world!')])
 
63
        tree.commit(message='fixing hello')
57
64
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
58
65
        self.assert_('\n+hello world!' in output)
59
 
        output = self.run_bzr('diff -r last:3..last:1',
60
 
                retcode=1)[0]
 
66
        output = self.run_bzr('diff -c 3', retcode=1)[0]
 
67
        self.assert_('\n+hello world!' in output)
 
68
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
 
69
        self.assert_('\n+baz' in output)
 
70
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
61
71
        self.assert_('\n+baz' in output)
62
72
        self.build_tree(['moo'])
63
 
        self.run_bzr('add moo')
 
73
        tree.add('moo')
64
74
        os.unlink('moo')
65
75
        self.run_bzr('diff')
66
76
 
67
77
    def test_diff_prefix(self):
68
78
        """diff --prefix appends to filenames in output"""
69
79
        self.make_example_branch()
70
 
        file('hello', 'wb').write('hello world!\n')
 
80
        self.build_tree_contents([('hello', 'hello world!\n')])
71
81
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
72
82
        self.assertEquals(err, '')
73
83
        self.assertEqualDiff(subst_dates(out), '''\
89
99
    def test_diff_p1(self):
90
100
        """diff -p1 produces lkml-style diffs"""
91
101
        self.make_example_branch()
92
 
        file('hello', 'wb').write('hello world!\n')
 
102
        self.build_tree_contents([('hello', 'hello world!\n')])
93
103
        out, err = self.run_bzr('diff -p1', retcode=1)
94
104
        self.assertEquals(err, '')
95
105
        self.assertEqualDiff(subst_dates(out), '''\
105
115
    def test_diff_p0(self):
106
116
        """diff -p0 produces diffs with no prefix"""
107
117
        self.make_example_branch()
108
 
        file('hello', 'wb').write('hello world!\n')
 
118
        self.build_tree_contents([('hello', 'hello world!\n')])
109
119
        out, err = self.run_bzr('diff -p0', retcode=1)
110
120
        self.assertEquals(err, '')
111
121
        self.assertEqualDiff(subst_dates(out), '''\
122
132
        # Get an error from a file that does not exist at all
123
133
        # (Malone #3619)
124
134
        self.make_example_branch()
125
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
126
 
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
 
135
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
 
136
            error_regexes=('not versioned.*does-not-exist',))
127
137
 
128
138
    def test_diff_illegal_revision_specifiers(self):
129
 
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
130
 
        self.assertContainsRe(err, 'one or two revision specifiers')
 
139
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
 
140
            error_regexes=('one or two revision specifiers',))
 
141
 
 
142
    def test_diff_using_and_format(self):
 
143
        out, err = self.run_bzr('diff --format=default --using=mydi', retcode=3,
 
144
            error_regexes=('are mutually exclusive',))
 
145
 
 
146
    def test_diff_nonexistent_revision(self):
 
147
        out, err = self.run_bzr('diff -r 123', retcode=3,
 
148
            error_regexes=("Requested revision: '123' does not "
 
149
                "exist in branch:",))
 
150
 
 
151
    def test_diff_nonexistent_dotted_revision(self):
 
152
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
 
153
        self.assertContainsRe(err,
 
154
            "Requested revision: '1.1' does not exist in branch:")
 
155
 
 
156
    def test_diff_nonexistent_dotted_revision_change(self):
 
157
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
 
158
        self.assertContainsRe(err,
 
159
            "Requested revision: '1.1' does not exist in branch:")
131
160
 
132
161
    def test_diff_unversioned(self):
133
162
        # Get an error when diffing a non-versioned file.
140
169
    # TODO: What should diff say for a file deleted in working tree?
141
170
 
142
171
    def example_branches(self):
143
 
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
144
 
        self.run_bzr(['init', 'branch1'])[0]
145
 
        self.run_bzr(['add', 'branch1/file'])[0]
146
 
        self.run_bzr(['commit', '-m', 'add file', 'branch1'])
147
 
        self.run_bzr(['branch', 'branch1', 'branch2'])[0]
 
172
        branch1_tree = self.make_branch_and_tree('branch1')
 
173
        self.build_tree(['branch1/file'], line_endings='binary')
 
174
        self.build_tree(['branch1/file2'], line_endings='binary')
 
175
        branch1_tree.add('file')
 
176
        branch1_tree.add('file2')
 
177
        branch1_tree.commit(message='add file and file2')
 
178
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
148
179
        self.build_tree_contents([('branch2/file', 'new content\n')])
149
 
        self.run_bzr(['commit', '-m', 'update file', 'branch2'])
 
180
        branch2_tree.commit(message='update file')
 
181
        return branch1_tree, branch2_tree
150
182
 
151
 
    def test_diff_branches(self):
152
 
        self.example_branches()
153
 
        # should open branch1 and diff against branch2, 
154
 
        out, err = self.run_bzr(['diff', '-r', 'branch:branch2', 
155
 
                                          'branch1'],
156
 
                                         retcode=1)
 
183
    def check_b2_vs_b1(self, cmd):
 
184
        # Compare branch2 vs branch1 using cmd and check the result
 
185
        out, err = self.run_bzr(cmd, retcode=1)
157
186
        self.assertEquals('', err)
158
187
        self.assertEquals("=== modified file 'file'\n"
159
188
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
162
191
                          "-new content\n"
163
192
                          "+contents of branch1/file\n"
164
193
                          "\n", subst_dates(out))
165
 
        out, err = self.run_bzr(['diff', 'branch2', 'branch1'],
166
 
                                         retcode=1)
 
194
 
 
195
    def check_b1_vs_b2(self, cmd):
 
196
        # Compare branch1 vs branch2 using cmd and check the result
 
197
        out, err = self.run_bzr(cmd, retcode=1)
167
198
        self.assertEquals('', err)
168
199
        self.assertEqualDiff("=== modified file 'file'\n"
169
200
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
170
201
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
171
202
                              "@@ -1,1 +1,1 @@\n"
172
 
                              "-new content\n"
173
 
                              "+contents of branch1/file\n"
 
203
                              "-contents of branch1/file\n"
 
204
                              "+new content\n"
174
205
                              "\n", subst_dates(out))
175
206
 
 
207
    def check_no_diffs(self, cmd):
 
208
        # Check that running cmd returns an empty diff
 
209
        out, err = self.run_bzr(cmd, retcode=0)
 
210
        self.assertEquals('', err)
 
211
        self.assertEquals('', out)
 
212
 
 
213
    def test_diff_branches(self):
 
214
        self.example_branches()
 
215
        # should open branch1 and diff against branch2,
 
216
        self.check_b2_vs_b1('diff -r branch:branch2 branch1')
 
217
        # Compare two working trees using various syntax forms
 
218
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
 
219
        self.check_b2_vs_b1('diff --old branch2 branch1')
 
220
        self.check_b2_vs_b1('diff branch2 --new branch1')
 
221
        # Test with a selected file that was changed
 
222
        self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
 
223
        self.check_b2_vs_b1('diff --old branch2 branch1/file')
 
224
        self.check_b2_vs_b1('diff branch2/file --new branch1')
 
225
        # Test with a selected file that was not changed
 
226
        self.check_no_diffs('diff --old branch2 --new branch1 file2')
 
227
        self.check_no_diffs('diff --old branch2 branch1/file2')
 
228
        self.check_no_diffs('diff branch2/file2 --new branch1')
 
229
 
 
230
    def test_diff_branches_no_working_trees(self):
 
231
        branch1_tree, branch2_tree = self.example_branches()
 
232
        # Compare a working tree to a branch without a WT
 
233
        dir1 = branch1_tree.bzrdir
 
234
        dir1.destroy_workingtree()
 
235
        self.assertFalse(dir1.has_workingtree())
 
236
        self.check_b2_vs_b1('diff --old branch2 --new branch1')
 
237
        self.check_b2_vs_b1('diff --old branch2 branch1')
 
238
        self.check_b2_vs_b1('diff branch2 --new branch1')
 
239
        # Compare a branch without a WT to one with a WT
 
240
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
 
241
        self.check_b1_vs_b2('diff --old branch1 branch2')
 
242
        self.check_b1_vs_b2('diff branch1 --new branch2')
 
243
        # Compare a branch with a WT against another without a WT
 
244
        dir2 = branch2_tree.bzrdir
 
245
        dir2.destroy_workingtree()
 
246
        self.assertFalse(dir2.has_workingtree())
 
247
        self.check_b1_vs_b2('diff --old branch1 --new branch2')
 
248
        self.check_b1_vs_b2('diff --old branch1 branch2')
 
249
        self.check_b1_vs_b2('diff branch1 --new branch2')
 
250
 
176
251
    def test_diff_revno_branches(self):
177
252
        self.example_branches()
178
 
        print >> open('branch2/file', 'wb'), 'even newer content'
179
 
        self.run_bzr(['commit', '-m', 
180
 
                               'update file once more', 'branch2'])
 
253
        branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
 
254
        self.build_tree_contents([('branch2/file', 'even newer content')])
 
255
        branch2_tree.commit(message='update file once more')
181
256
 
182
 
        out, err = self.run_bzr(['diff', '-r',
183
 
                                          'revno:1:branch2..revno:1:branch1'],
184
 
                                         retcode=0)
 
257
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
 
258
                                )
185
259
        self.assertEquals('', err)
186
260
        self.assertEquals('', out)
187
 
        out, err = self.run_bzr(['diff', '-r', 
188
 
                                          'revno:2:branch2..revno:1:branch1'],
189
 
                                         retcode=1)
 
261
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
 
262
                                retcode=1)
190
263
        self.assertEquals('', err)
191
264
        self.assertEqualDiff("=== modified file 'file'\n"
192
265
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
197
270
                              "\n", subst_dates(out))
198
271
 
199
272
    def example_branch2(self):
200
 
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
201
 
        self.run_bzr(['init', 'branch1'])[0]
202
 
        self.run_bzr(['add', 'branch1/file1'])[0]
203
 
        print >> open('branch1/file1', 'wb'), 'original line'
204
 
        self.run_bzr(['commit', '-m', 'first commit', 'branch1'])
205
 
        
206
 
        print >> open('branch1/file1', 'wb'), 'repo line'
207
 
        self.run_bzr(['commit', '-m', 'second commit', 'branch1'])
 
273
        branch1_tree = self.make_branch_and_tree('branch1')
 
274
        self.build_tree_contents([('branch1/file1', 'original line\n')])
 
275
        branch1_tree.add('file1')
 
276
        branch1_tree.commit(message='first commit')
 
277
        self.build_tree_contents([('branch1/file1', 'repo line\n')])
 
278
        branch1_tree.commit(message='second commit')
 
279
        return branch1_tree
208
280
 
209
281
    def test_diff_to_working_tree(self):
210
282
        self.example_branch2()
211
 
        
212
 
        print >> open('branch1/file1', 'wb'), 'new line'
213
 
        output = self.run_bzr(['diff', '-r', '1..', 'branch1'],
214
 
                                       retcode=1)
215
 
        self.assertTrue('\n-original line\n+new line\n' in output[0])
 
283
        self.build_tree_contents([('branch1/file1', 'new line')])
 
284
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
 
285
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
286
 
 
287
    def test_diff_to_working_tree_in_subdir(self):
 
288
        self.example_branch2()
 
289
        self.build_tree_contents([('branch1/file1', 'new line')])
 
290
        os.mkdir('branch1/dir1')
 
291
        os.chdir('branch1/dir1')
 
292
        output = self.run_bzr('diff -r 1..', retcode=1)
 
293
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
216
294
 
217
295
    def test_diff_across_rename(self):
218
296
        """The working tree path should always be considered for diffing"""
 
297
        tree = self.make_example_branch()
 
298
        self.run_bzr('diff -r 0..1 hello', retcode=1)
 
299
        tree.rename_one('hello', 'hello1')
 
300
        self.run_bzr('diff hello1', retcode=1)
 
301
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
 
302
 
 
303
    def test_diff_to_branch_no_working_tree(self):
 
304
        branch1_tree = self.example_branch2()
 
305
        dir1 = branch1_tree.bzrdir
 
306
        dir1.destroy_workingtree()
 
307
        self.assertFalse(dir1.has_workingtree())
 
308
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
 
309
        self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
 
310
 
 
311
    def test_custom_format(self):
 
312
        class BooDiffTree(DiffTree):
 
313
 
 
314
            def show_diff(self, specific_files, extra_trees=None):
 
315
                self.to_file.write("BOO!\n")
 
316
                return super(BooDiffTree, self).show_diff(specific_files,
 
317
                    extra_trees)
 
318
 
 
319
        diff_format_registry.register("boo", BooDiffTree, 
 
320
            "Scary diff format")
 
321
        self.addCleanup(diff_format_registry.remove, "boo")
219
322
        self.make_example_branch()
220
 
        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
221
 
        wt = workingtree.WorkingTree.open_containing('.')[0]
222
 
        wt.rename_one('hello', 'hello1')
223
 
        self.run_bzr('diff', 'hello1', retcode=1)
224
 
        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
 
323
        self.build_tree_contents([('hello', 'hello world!\n')])
 
324
        output = self.run_bzr('diff --format=boo', retcode=1)
 
325
        self.assertTrue("BOO!" in output[0])
 
326
        output = self.run_bzr('diff -Fboo', retcode=1)
 
327
        self.assertTrue("BOO!" in output[0])
225
328
 
226
329
 
227
330
class TestCheckoutDiff(TestDiff):
228
331
 
229
332
    def make_example_branch(self):
230
 
        super(TestCheckoutDiff, self).make_example_branch()
231
 
        self.run_bzr('checkout . checkout')
 
333
        tree = super(TestCheckoutDiff, self).make_example_branch()
 
334
        tree = tree.branch.create_checkout('checkout')
232
335
        os.chdir('checkout')
 
336
        return tree
233
337
 
234
338
    def example_branch2(self):
235
 
        super(TestCheckoutDiff, self).example_branch2()
 
339
        tree = super(TestCheckoutDiff, self).example_branch2()
236
340
        os.mkdir('checkouts')
237
 
        self.run_bzr('checkout branch1 checkouts/branch1')
 
341
        tree = tree.branch.create_checkout('checkouts/branch1')
238
342
        os.chdir('checkouts')
 
343
        return tree
239
344
 
240
345
    def example_branches(self):
241
 
        super(TestCheckoutDiff, self).example_branches()
 
346
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
242
347
        os.mkdir('checkouts')
243
 
        self.run_bzr('checkout branch1 checkouts/branch1')
244
 
        self.run_bzr('checkout branch2 checkouts/branch2')
 
348
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
 
349
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
245
350
        os.chdir('checkouts')
 
351
        return branch1_tree, branch2_tree
246
352
 
247
353
 
248
354
class TestDiffLabels(DiffBase):
249
355
 
250
356
    def test_diff_label_removed(self):
251
 
        super(TestDiffLabels, self).make_example_branch()
252
 
        self.run_bzr('remove hello')
253
 
        diff = self.run_bzr(['diff'], retcode=1)
 
357
        tree = super(TestDiffLabels, self).make_example_branch()
 
358
        tree.remove('hello', keep_files=False)
 
359
        diff = self.run_bzr('diff', retcode=1)
254
360
        self.assertTrue("=== removed file 'hello'" in diff[0])
255
361
 
256
362
    def test_diff_label_added(self):
257
 
        super(TestDiffLabels, self).make_example_branch()
258
 
        file('barbar', 'wt').write('barbar')
259
 
        self.run_bzr('add barbar')
260
 
        diff = self.run_bzr(['diff'], retcode=1)
 
363
        tree = super(TestDiffLabels, self).make_example_branch()
 
364
        self.build_tree_contents([('barbar', 'barbar')])
 
365
        tree.add('barbar')
 
366
        diff = self.run_bzr('diff', retcode=1)
261
367
        self.assertTrue("=== added file 'barbar'" in diff[0])
262
368
 
263
369
    def test_diff_label_modified(self):
264
370
        super(TestDiffLabels, self).make_example_branch()
265
 
        file('hello', 'wt').write('barbar')
266
 
        diff = self.run_bzr(['diff'], retcode=1)
 
371
        self.build_tree_contents([('hello', 'barbar')])
 
372
        diff = self.run_bzr('diff', retcode=1)
267
373
        self.assertTrue("=== modified file 'hello'" in diff[0])
268
374
 
269
375
    def test_diff_label_renamed(self):
270
 
        super(TestDiffLabels, self).make_example_branch()
271
 
        self.run_bzr('rename hello gruezi')
272
 
        diff = self.run_bzr(['diff'], retcode=1)
 
376
        tree = super(TestDiffLabels, self).make_example_branch()
 
377
        tree.rename_one('hello', 'gruezi')
 
378
        diff = self.run_bzr('diff', retcode=1)
273
379
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
274
380
 
275
381
 
277
383
 
278
384
    def test_external_diff(self):
279
385
        """Test that we can spawn an external diff process"""
 
386
        self.disable_missing_extensions_warning()
280
387
        # We have to use run_bzr_subprocess, because we need to
281
388
        # test writing directly to stdout, (there was a bug in
282
389
        # subprocess.py that we had to workaround).
283
390
        # However, if 'diff' may not be available
284
391
        self.make_example_branch()
285
 
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
286
 
        try:
287
 
            os.environ['BZR_PROGRESS_BAR'] = 'none'
288
 
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
289
 
                                               '--diff-options', '-ub',
290
 
                                               universal_newlines=True,
291
 
                                               retcode=None)
292
 
        finally:
293
 
            if orig_progress is None:
294
 
                del os.environ['BZR_PROGRESS_BAR']
295
 
            else:
296
 
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
297
 
            
 
392
        self.overrideEnv('BZR_PROGRESS_BAR', 'none')
 
393
        out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
 
394
                                           universal_newlines=True,
 
395
                                           retcode=None)
298
396
        if 'Diff is not installed on this machine' in err:
299
 
            raise TestSkipped("No external 'diff' is available")
 
397
            raise tests.TestSkipped("No external 'diff' is available")
300
398
        self.assertEqual('', err)
301
399
        # We have to skip the stuff in the middle, because it depends
302
400
        # on time.time()
306
404
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
307
405
                                 "+baz\n\n")
308
406
 
 
407
    def test_external_diff_options_and_using(self):
 
408
        """Test that the options are passed correctly to an external diff process"""
 
409
        self.requireFeature(features.diff_feature)
 
410
        self.make_example_branch()
 
411
        self.build_tree_contents([('hello', 'Foo\n')])
 
412
        out, err = self.run_bzr('diff --diff-options -i --using diff',
 
413
                                    retcode=1)
 
414
        self.assertEquals("=== modified file 'hello'\n", out)
 
415
        self.assertEquals('', err)
 
416
 
309
417
 
310
418
class TestDiffOutput(DiffBase):
311
419
 
312
420
    def test_diff_output(self):
313
421
        # check that output doesn't mangle line-endings
314
422
        self.make_example_branch()
315
 
        file('hello', 'wb').write('hello world!\n')
 
423
        self.build_tree_contents([('hello', 'hello world!\n')])
316
424
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
317
425
        self.assert_('\n+hello world!\n' in output)