/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

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