← 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: Robert Collins
  • Date: 2009-07-07 04:32:13 UTC
  • mto: This revision was merged to the branch mainline in revision 4524.
  • Revision ID: robertc@robertcollins.net-20090707043213-4hjjhgr40iq7gk2d
More informative assertions in xml serialisation.

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., 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.
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.run_bzr('commit -m fixing hello')
 
55
        tree = self.make_example_branch()
 
56
        self.build_tree_contents([('hello', 'hello world!')])
 
57
        tree.commit(message='fixing hello')
57
58
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
58
59
        self.assert_('\n+hello world!' in output)
59
 
        output = self.run_bzr('diff -r last:3..last:1',
60
 
                retcode=1)[0]
 
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]
61
65
        self.assert_('\n+baz' in output)
62
66
        self.build_tree(['moo'])
63
 
        self.run_bzr('add moo')
 
67
        tree.add('moo')
64
68
        os.unlink('moo')
65
69
        self.run_bzr('diff')
66
70
 
67
71
    def test_diff_prefix(self):
68
72
        """diff --prefix appends to filenames in output"""
69
73
        self.make_example_branch()
70
 
        file('hello', 'wb').write('hello world!\n')
 
74
        self.build_tree_contents([('hello', 'hello world!\n')])
71
75
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
72
76
        self.assertEquals(err, '')
73
77
        self.assertEqualDiff(subst_dates(out), '''\
89
93
    def test_diff_p1(self):
90
94
        """diff -p1 produces lkml-style diffs"""
91
95
        self.make_example_branch()
92
 
        file('hello', 'wb').write('hello world!\n')
 
96
        self.build_tree_contents([('hello', 'hello world!\n')])
93
97
        out, err = self.run_bzr('diff -p1', retcode=1)
94
98
        self.assertEquals(err, '')
95
99
        self.assertEqualDiff(subst_dates(out), '''\
105
109
    def test_diff_p0(self):
106
110
        """diff -p0 produces diffs with no prefix"""
107
111
        self.make_example_branch()
108
 
        file('hello', 'wb').write('hello world!\n')
 
112
        self.build_tree_contents([('hello', 'hello world!\n')])
109
113
        out, err = self.run_bzr('diff -p0', retcode=1)
110
114
        self.assertEquals(err, '')
111
115
        self.assertEqualDiff(subst_dates(out), '''\
122
126
        # Get an error from a file that does not exist at all
123
127
        # (Malone #3619)
124
128
        self.make_example_branch()
125
 
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
126
 
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
 
129
        out, err = self.run_bzr('diff does-not-exist', retcode=3,
 
130
            error_regexes=('not versioned.*does-not-exist',))
127
131
 
128
132
    def test_diff_illegal_revision_specifiers(self):
129
 
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
130
 
        self.assertContainsRe(err, 'one or two revision specifiers')
 
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:")
131
150
 
132
151
    def test_diff_unversioned(self):
133
152
        # Get an error when diffing a non-versioned file.
140
159
    # TODO: What should diff say for a file deleted in working tree?
141
160
 
142
161
    def example_branches(self):
143
 
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
144
 
        self.run_bzr('init branch1')[0]
145
 
        self.run_bzr('add branch1/file')[0]
146
 
        self.run_bzr(['commit', '-m', 'add file', 'branch1'])
147
 
        self.run_bzr('branch branch1 branch2')[0]
 
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()
148
169
        self.build_tree_contents([('branch2/file', 'new content\n')])
149
 
        self.run_bzr(['commit', '-m', 'update file', 'branch2'])
 
170
        branch2_tree.commit(message='update file')
 
171
        return branch1_tree, branch2_tree
150
172
 
151
 
    def test_diff_branches(self):
152
 
        self.example_branches()
153
 
        # should open branch1 and diff against branch2, 
154
 
        out, err = self.run_bzr('diff -r branch:branch2 branch1',
155
 
                                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)
156
176
        self.assertEquals('', err)
157
177
        self.assertEquals("=== modified file 'file'\n"
158
178
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
161
181
                          "-new content\n"
162
182
                          "+contents of branch1/file\n"
163
183
                          "\n", subst_dates(out))
164
 
        out, err = self.run_bzr('diff branch2 branch1',
165
 
                                         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)
166
188
        self.assertEquals('', err)
167
189
        self.assertEqualDiff("=== modified file 'file'\n"
168
190
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
169
191
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
170
192
                              "@@ -1,1 +1,1 @@\n"
171
 
                              "-new content\n"
172
 
                              "+contents of branch1/file\n"
 
193
                              "-contents of branch1/file\n"
 
194
                              "+new content\n"
173
195
                              "\n", subst_dates(out))
174
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
 
175
241
    def test_diff_revno_branches(self):
176
242
        self.example_branches()
177
 
        print >> open('branch2/file', 'wb'), 'even newer content'
178
 
        self.run_bzr(['commit', '-m',
179
 
                      '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')
180
246
 
181
247
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
182
248
                                )
194
260
                              "\n", subst_dates(out))
195
261
 
196
262
    def example_branch2(self):
197
 
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
198
 
        self.run_bzr('init branch1')[0]
199
 
        self.run_bzr('add branch1/file1')[0]
200
 
        print >> open('branch1/file1', 'wb'), 'original line'
201
 
        self.run_bzr(['commit', '-m', 'first commit', 'branch1'])
202
 
        
203
 
        print >> open('branch1/file1', 'wb'), 'repo line'
204
 
        self.run_bzr(['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
205
270
 
206
271
    def test_diff_to_working_tree(self):
207
272
        self.example_branch2()
208
 
        
209
 
        print >> open('branch1/file1', 'wb'), 'new line'
210
 
        output = self.run_bzr('diff -r 1.. branch1',
211
 
                              retcode=1)
212
 
        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')
213
284
 
214
285
    def test_diff_across_rename(self):
215
286
        """The working tree path should always be considered for diffing"""
216
 
        self.make_example_branch()
 
287
        tree = self.make_example_branch()
217
288
        self.run_bzr('diff -r 0..1 hello', retcode=1)
218
 
        wt = workingtree.WorkingTree.open_containing('.')[0]
219
 
        wt.rename_one('hello', 'hello1')
 
289
        tree.rename_one('hello', 'hello1')
220
290
        self.run_bzr('diff hello1', retcode=1)
221
291
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
222
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')
 
300
 
223
301
 
224
302
class TestCheckoutDiff(TestDiff):
225
303
 
226
304
    def make_example_branch(self):
227
 
        super(TestCheckoutDiff, self).make_example_branch()
228
 
        self.run_bzr('checkout . checkout')
 
305
        tree = super(TestCheckoutDiff, self).make_example_branch()
 
306
        tree = tree.branch.create_checkout('checkout')
229
307
        os.chdir('checkout')
 
308
        return tree
230
309
 
231
310
    def example_branch2(self):
232
 
        super(TestCheckoutDiff, self).example_branch2()
 
311
        tree = super(TestCheckoutDiff, self).example_branch2()
233
312
        os.mkdir('checkouts')
234
 
        self.run_bzr('checkout branch1 checkouts/branch1')
 
313
        tree = tree.branch.create_checkout('checkouts/branch1')
235
314
        os.chdir('checkouts')
 
315
        return tree
236
316
 
237
317
    def example_branches(self):
238
 
        super(TestCheckoutDiff, self).example_branches()
 
318
        branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
239
319
        os.mkdir('checkouts')
240
 
        self.run_bzr('checkout branch1 checkouts/branch1')
241
 
        self.run_bzr('checkout branch2 checkouts/branch2')
 
320
        branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
 
321
        branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
242
322
        os.chdir('checkouts')
 
323
        return branch1_tree, branch2_tree
243
324
 
244
325
 
245
326
class TestDiffLabels(DiffBase):
246
327
 
247
328
    def test_diff_label_removed(self):
248
 
        super(TestDiffLabels, self).make_example_branch()
249
 
        self.run_bzr('remove hello')
 
329
        tree = super(TestDiffLabels, self).make_example_branch()
 
330
        tree.remove('hello', keep_files=False)
250
331
        diff = self.run_bzr('diff', retcode=1)
251
332
        self.assertTrue("=== removed file 'hello'" in diff[0])
252
333
 
253
334
    def test_diff_label_added(self):
254
 
        super(TestDiffLabels, self).make_example_branch()
255
 
        file('barbar', 'wt').write('barbar')
256
 
        self.run_bzr('add barbar')
 
335
        tree = super(TestDiffLabels, self).make_example_branch()
 
336
        self.build_tree_contents([('barbar', 'barbar')])
 
337
        tree.add('barbar')
257
338
        diff = self.run_bzr('diff', retcode=1)
258
339
        self.assertTrue("=== added file 'barbar'" in diff[0])
259
340
 
260
341
    def test_diff_label_modified(self):
261
342
        super(TestDiffLabels, self).make_example_branch()
262
 
        file('hello', 'wt').write('barbar')
 
343
        self.build_tree_contents([('hello', 'barbar')])
263
344
        diff = self.run_bzr('diff', retcode=1)
264
345
        self.assertTrue("=== modified file 'hello'" in diff[0])
265
346
 
266
347
    def test_diff_label_renamed(self):
267
 
        super(TestDiffLabels, self).make_example_branch()
268
 
        self.run_bzr('rename hello gruezi')
 
348
        tree = super(TestDiffLabels, self).make_example_branch()
 
349
        tree.rename_one('hello', 'gruezi')
269
350
        diff = self.run_bzr('diff', retcode=1)
270
351
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
271
352
 
279
360
        # subprocess.py that we had to workaround).
280
361
        # However, if 'diff' may not be available
281
362
        self.make_example_branch()
282
 
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
283
 
        try:
284
 
            os.environ['BZR_PROGRESS_BAR'] = 'none'
285
 
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
286
 
                                               '--diff-options', '-ub',
287
 
                                               universal_newlines=True,
288
 
                                               retcode=None)
289
 
        finally:
290
 
            if orig_progress is None:
291
 
                del os.environ['BZR_PROGRESS_BAR']
292
 
            else:
293
 
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
294
 
            
 
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)
295
368
        if 'Diff is not installed on this machine' in err:
296
369
            raise TestSkipped("No external 'diff' is available")
297
370
        self.assertEqual('', err)
309
382
    def test_diff_output(self):
310
383
        # check that output doesn't mangle line-endings
311
384
        self.make_example_branch()
312
 
        file('hello', 'wb').write('hello world!\n')
 
385
        self.build_tree_contents([('hello', 'hello world!\n')])
313
386
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
314
387
        self.assert_('\n+hello world!\n' in output)