← 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: Jelmer Vernooij
  • Date: 2009-01-28 18:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 3968.
  • Revision ID: jelmer@samba.org-20090128184255-bdmklkvm83ltk191
https://launchpad.net/bugs/321183
Update NEWS

Show diffs side-by-side

added added

removed removed

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