/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: 2007-03-06 12:28:18 UTC
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr diff.
21
21
import os
22
22
import re
23
23
 
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
 
    )
 
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
35
29
 
36
30
 
37
31
def subst_dates(string):
40
34
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
41
35
 
42
36
 
43
 
class DiffBase(tests.TestCaseWithTransport):
 
37
class DiffBase(ExternalBase):
44
38
    """Base class with common setup method"""
45
39
 
46
40
    def make_example_branch(self):
 
41
        # FIXME: copied from test_too_much -- share elsewhere?
47
42
        tree = self.make_branch_and_tree('.')
48
 
        self.build_tree_contents([
49
 
            ('hello', 'foo\n'),
50
 
            ('goodbye', 'baz\n')])
 
43
        open('hello', 'wb').write('foo\n')
51
44
        tree.add(['hello'])
52
45
        tree.commit('setup')
 
46
        open('goodbye', 'wb').write('baz\n')
53
47
        tree.add(['goodbye'])
54
48
        tree.commit('setup')
55
 
        return tree
56
49
 
57
50
 
58
51
class TestDiff(DiffBase):
59
52
 
60
53
    def test_diff(self):
61
 
        tree = self.make_example_branch()
62
 
        self.build_tree_contents([('hello', 'hello world!')])
63
 
        tree.commit(message='fixing hello')
64
 
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
65
 
        self.assert_('\n+hello world!' in output)
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]
71
 
        self.assert_('\n+baz' in output)
72
 
        self.build_tree(['moo'])
73
 
        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')
74
63
        os.unlink('moo')
75
 
        self.run_bzr('diff')
 
64
        self.runbzr('diff')
76
65
 
77
66
    def test_diff_prefix(self):
78
67
        """diff --prefix appends to filenames in output"""
79
68
        self.make_example_branch()
80
 
        self.build_tree_contents([('hello', 'hello world!\n')])
81
 
        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)
82
71
        self.assertEquals(err, '')
83
72
        self.assertEqualDiff(subst_dates(out), '''\
84
73
=== modified file 'hello'
90
79
 
91
80
''')
92
81
 
93
 
    def test_diff_illegal_prefix_value(self):
94
 
        # There was an error in error reporting for this option
95
 
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
96
 
        self.assertContainsRe(err,
97
 
            '--prefix expects two values separated by a colon')
98
 
 
99
82
    def test_diff_p1(self):
100
83
        """diff -p1 produces lkml-style diffs"""
101
84
        self.make_example_branch()
102
 
        self.build_tree_contents([('hello', 'hello world!\n')])
103
 
        out, err = self.run_bzr('diff -p1', retcode=1)
 
85
        file('hello', 'wb').write('hello world!\n')
 
86
        out, err = self.runbzr('diff -p1', retcode=1)
104
87
        self.assertEquals(err, '')
105
88
        self.assertEqualDiff(subst_dates(out), '''\
106
89
=== modified file 'hello'
115
98
    def test_diff_p0(self):
116
99
        """diff -p0 produces diffs with no prefix"""
117
100
        self.make_example_branch()
118
 
        self.build_tree_contents([('hello', 'hello world!\n')])
119
 
        out, err = self.run_bzr('diff -p0', retcode=1)
 
101
        file('hello', 'wb').write('hello world!\n')
 
102
        out, err = self.runbzr('diff -p0', retcode=1)
120
103
        self.assertEquals(err, '')
121
104
        self.assertEqualDiff(subst_dates(out), '''\
122
105
=== modified file 'hello'
132
115
        # Get an error from a file that does not exist at all
133
116
        # (Malone #3619)
134
117
        self.make_example_branch()
135
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
136
 
            error_regexes=('not versioned.*does-not-exist',))
 
118
        out, err = self.runbzr('diff does-not-exist', retcode=3)
 
119
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
137
120
 
138
121
    def test_diff_illegal_revision_specifiers(self):
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:")
 
122
        out, err = self.runbzr('diff -r 1..23..123', retcode=3)
 
123
        self.assertContainsRe(err, 'one or two revision specifiers')
160
124
 
161
125
    def test_diff_unversioned(self):
162
126
        # Get an error when diffing a non-versioned file.
163
127
        # (Malone #3619)
164
128
        self.make_example_branch()
165
129
        self.build_tree(['unversioned-file'])
166
 
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
 
130
        out, err = self.runbzr('diff unversioned-file', retcode=3)
167
131
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
168
132
 
169
133
    # TODO: What should diff say for a file deleted in working tree?
170
134
 
171
135
    def example_branches(self):
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()
179
 
        self.build_tree_contents([('branch2/file', 'new content\n')])
180
 
        branch2_tree.commit(message='update file')
181
 
        return branch1_tree, branch2_tree
 
136
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
 
137
        self.capture('init branch1')
 
138
        self.capture('add branch1/file')
 
139
        self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
 
140
        self.capture('branch branch1 branch2')
 
141
        print >> open('branch2/file', 'wb'), 'new content'
 
142
        self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
182
143
 
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)
 
144
    def test_diff_branches(self):
 
145
        self.example_branches()
 
146
        # should open branch1 and diff against branch2, 
 
147
        out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 
 
148
                                          'branch1'],
 
149
                                         retcode=1)
186
150
        self.assertEquals('', err)
187
151
        self.assertEquals("=== modified file 'file'\n"
188
152
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
191
155
                          "-new content\n"
192
156
                          "+contents of branch1/file\n"
193
157
                          "\n", subst_dates(out))
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)
 
158
        out, err = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
 
159
                                         retcode=1)
198
160
        self.assertEquals('', err)
199
161
        self.assertEqualDiff("=== modified file 'file'\n"
200
162
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
201
163
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
202
164
                              "@@ -1,1 +1,1 @@\n"
203
 
                              "-contents of branch1/file\n"
204
 
                              "+new content\n"
 
165
                              "-new content\n"
 
166
                              "+contents of branch1/file\n"
205
167
                              "\n", subst_dates(out))
206
168
 
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
 
 
251
169
    def test_diff_revno_branches(self):
252
170
        self.example_branches()
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')
 
171
        print >> open('branch2/file', 'wb'), 'even newer content'
 
172
        self.run_bzr_captured(['commit', '-m', 
 
173
                               'update file once more', 'branch2'])
256
174
 
257
 
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
258
 
                                )
 
175
        out, err = self.run_bzr_captured(['diff', '-r',
 
176
                                          'revno:1:branch2..revno:1:branch1'],
 
177
                                         retcode=0)
259
178
        self.assertEquals('', err)
260
179
        self.assertEquals('', out)
261
 
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
262
 
                                retcode=1)
 
180
        out, err = self.run_bzr_captured(['diff', '-r', 
 
181
                                          'revno:2:branch2..revno:1:branch1'],
 
182
                                         retcode=1)
263
183
        self.assertEquals('', err)
264
184
        self.assertEqualDiff("=== modified file 'file'\n"
265
185
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
270
190
                              "\n", subst_dates(out))
271
191
 
272
192
    def example_branch2(self):
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
 
193
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
 
194
        self.capture('init branch1')
 
195
        self.capture('add branch1/file1')
 
196
        print >> open('branch1/file1', 'wb'), 'original line'
 
197
        self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
 
198
        
 
199
        print >> open('branch1/file1', 'wb'), 'repo line'
 
200
        self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
280
201
 
281
202
    def test_diff_to_working_tree(self):
282
203
        self.example_branch2()
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')
 
204
        
 
205
        print >> open('branch1/file1', 'wb'), 'new line'
 
206
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],
 
207
                                       retcode=1)
 
208
        self.assertTrue('\n-original line\n+new line\n' in output[0])
294
209
 
295
210
    def test_diff_across_rename(self):
296
211
        """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")
322
212
        self.make_example_branch()
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])
 
213
        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
 
214
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
215
        wt.rename_one('hello', 'hello1')
 
216
        self.run_bzr('diff', 'hello1', retcode=1)
 
217
        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
328
218
 
329
219
 
330
220
class TestCheckoutDiff(TestDiff):
331
221
 
332
222
    def make_example_branch(self):
333
 
        tree = super(TestCheckoutDiff, self).make_example_branch()
334
 
        tree = tree.branch.create_checkout('checkout')
 
223
        super(TestCheckoutDiff, self).make_example_branch()
 
224
        self.runbzr('checkout . checkout')
335
225
        os.chdir('checkout')
336
 
        return tree
337
226
 
338
227
    def example_branch2(self):
339
 
        tree = super(TestCheckoutDiff, self).example_branch2()
 
228
        super(TestCheckoutDiff, self).example_branch2()
340
229
        os.mkdir('checkouts')
341
 
        tree = tree.branch.create_checkout('checkouts/branch1')
 
230
        self.runbzr('checkout branch1 checkouts/branch1')
342
231
        os.chdir('checkouts')
343
 
        return tree
344
232
 
345
233
    def example_branches(self):
346
 
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
 
234
        super(TestCheckoutDiff, self).example_branches()
347
235
        os.mkdir('checkouts')
348
 
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
349
 
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
 
236
        self.runbzr('checkout branch1 checkouts/branch1')
 
237
        self.runbzr('checkout branch2 checkouts/branch2')
350
238
        os.chdir('checkouts')
351
 
        return branch1_tree, branch2_tree
352
239
 
353
240
 
354
241
class TestDiffLabels(DiffBase):
355
242
 
356
243
    def test_diff_label_removed(self):
357
 
        tree = super(TestDiffLabels, self).make_example_branch()
358
 
        tree.remove('hello', keep_files=False)
359
 
        diff = self.run_bzr('diff', retcode=1)
 
244
        super(TestDiffLabels, self).make_example_branch()
 
245
        self.runbzr('remove hello')
 
246
        diff = self.run_bzr_captured(['diff'], retcode=1)
360
247
        self.assertTrue("=== removed file 'hello'" in diff[0])
361
248
 
362
249
    def test_diff_label_added(self):
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)
 
250
        super(TestDiffLabels, self).make_example_branch()
 
251
        file('barbar', 'wt').write('barbar')
 
252
        self.runbzr('add barbar')
 
253
        diff = self.run_bzr_captured(['diff'], retcode=1)
367
254
        self.assertTrue("=== added file 'barbar'" in diff[0])
368
255
 
369
256
    def test_diff_label_modified(self):
370
257
        super(TestDiffLabels, self).make_example_branch()
371
 
        self.build_tree_contents([('hello', 'barbar')])
372
 
        diff = self.run_bzr('diff', retcode=1)
 
258
        file('hello', 'wt').write('barbar')
 
259
        diff = self.run_bzr_captured(['diff'], retcode=1)
373
260
        self.assertTrue("=== modified file 'hello'" in diff[0])
374
261
 
375
262
    def test_diff_label_renamed(self):
376
 
        tree = super(TestDiffLabels, self).make_example_branch()
377
 
        tree.rename_one('hello', 'gruezi')
378
 
        diff = self.run_bzr('diff', retcode=1)
 
263
        super(TestDiffLabels, self).make_example_branch()
 
264
        self.runbzr('rename hello gruezi')
 
265
        diff = self.run_bzr_captured(['diff'], retcode=1)
379
266
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
380
267
 
381
268
 
383
270
 
384
271
    def test_external_diff(self):
385
272
        """Test that we can spawn an external diff process"""
386
 
        self.disable_missing_extensions_warning()
387
273
        # We have to use run_bzr_subprocess, because we need to
388
274
        # test writing directly to stdout, (there was a bug in
389
275
        # subprocess.py that we had to workaround).
390
276
        # However, if 'diff' may not be available
391
277
        self.make_example_branch()
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)
 
278
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
279
        try:
 
280
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
281
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
 
282
                                               '--diff-options', '-ub',
 
283
                                               universal_newlines=True,
 
284
                                               retcode=None)
 
285
        finally:
 
286
            if orig_progress is None:
 
287
                del os.environ['BZR_PROGRESS_BAR']
 
288
            else:
 
289
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
290
            
396
291
        if 'Diff is not installed on this machine' in err:
397
 
            raise tests.TestSkipped("No external 'diff' is available")
 
292
            raise TestSkipped("No external 'diff' is available")
398
293
        self.assertEqual('', err)
399
294
        # We have to skip the stuff in the middle, because it depends
400
295
        # on time.time()
404
299
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
405
300
                                 "+baz\n\n")
406
301
 
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
 
 
417
302
 
418
303
class TestDiffOutput(DiffBase):
419
304
 
420
305
    def test_diff_output(self):
421
306
        # check that output doesn't mangle line-endings
422
307
        self.make_example_branch()
423
 
        self.build_tree_contents([('hello', 'hello world!\n')])
 
308
        file('hello', 'wb').write('hello world!\n')
424
309
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
425
310
        self.assert_('\n+hello world!\n' in output)