/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: 2008-08-20 02:07:36 UTC
  • mfrom: (3640 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3682.
  • Revision ID: robertc@robertcollins.net-20080820020736-g2xe4921zzxtymle
Merge bzr.dev

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