← 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

Merge the 0.17 fixes back into bzr.dev

Show diffs side-by-side

added added

removed removed

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