← 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

Make test_bench_history and _get_bzr_source_tree tolerant of UnknownFormatError for the bzr workingtree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
1
# Copyright (C) 2005, 2006 by 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
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
26
 
from bzrlib import workingtree
 
27
from bzrlib.tests import TestSkipped
27
28
from bzrlib.tests.blackbox import ExternalBase
28
29
 
29
30
 
35
36
 
36
37
class TestDiff(ExternalBase):
37
38
 
38
 
    def make_example_branch(test):
 
39
    def make_example_branch(self):
39
40
        # FIXME: copied from test_too_much -- share elsewhere?
40
 
        test.runbzr('init')
41
 
        file('hello', 'wb').write('foo\n')
42
 
        test.runbzr('add hello')
43
 
        test.runbzr('commit -m setup hello')
44
 
        file('goodbye', 'wb').write('baz\n')
45
 
        test.runbzr('add goodbye')
46
 
        test.runbzr('commit -m setup goodbye')
 
41
        tree = self.make_branch_and_tree('.')
 
42
        open('hello', 'wb').write('foo\n')
 
43
        tree.add(['hello'])
 
44
        tree.commit('setup')
 
45
        open('goodbye', 'wb').write('baz\n')
 
46
        tree.add(['goodbye'])
 
47
        tree.commit('setup')
47
48
 
48
49
    def test_diff(self):
49
50
        self.make_example_branch()
146
147
                          "-new content\n"
147
148
                          "+contents of branch1/file\n"
148
149
                          "\n", subst_dates(out))
149
 
        out, ett = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
 
150
        out, err = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
150
151
                                         retcode=1)
151
152
        self.assertEquals('', err)
152
153
        self.assertEqualDiff("=== modified file 'file'\n"
160
161
    def test_diff_revno_branches(self):
161
162
        self.example_branches()
162
163
        print >> open('branch2/file', 'wb'), 'even newer content'
163
 
        self.run_bzr_captured(['commit', '-m', 'update file once more', 'branch2'])
 
164
        self.run_bzr_captured(['commit', '-m', 
 
165
                               'update file once more', 'branch2'])
164
166
 
165
 
        out, err = self.run_bzr_captured(['diff', '-r', 'revno:1:branch2..revno:1:branch1'],
 
167
        out, err = self.run_bzr_captured(['diff', '-r',
 
168
                                          'revno:1:branch2..revno:1:branch1'],
166
169
                                         retcode=0)
167
170
        self.assertEquals('', err)
168
171
        self.assertEquals('', out)
169
 
        out, ett = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2..revno:1:branch1'],
 
172
        out, err = self.run_bzr_captured(['diff', '-r', 
 
173
                                          'revno:2:branch2..revno:1:branch1'],
170
174
                                         retcode=1)
171
175
        self.assertEquals('', err)
172
176
        self.assertEqualDiff("=== modified file 'file'\n"
191
195
        self.example_branch2()
192
196
        
193
197
        print >> open('branch1/file1', 'wb'), 'new line'
194
 
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
 
198
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],
 
199
                                       retcode=1)
195
200
        self.assertTrue('\n-original line\n+new line\n' in output[0])
196
201
 
197
202
    def test_diff_across_rename(self):
251
256
        self.runbzr('rename hello gruezi')
252
257
        diff = self.run_bzr_captured(['diff'], retcode=1)
253
258
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
 
259
 
 
260
 
 
261
class TestExternalDiff(TestDiff):
 
262
 
 
263
    def test_external_diff(self):
 
264
        """Test that we can spawn an external diff process"""
 
265
        # We have to use run_bzr_subprocess, because we need to
 
266
        # test writing directly to stdout, (there was a bug in
 
267
        # subprocess.py that we had to workaround).
 
268
        # However, if 'diff' may not be available
 
269
        self.make_example_branch()
 
270
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
 
271
        try:
 
272
            os.environ['BZR_PROGRESS_BAR'] = 'none'
 
273
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
 
274
                                               '--diff-options', '-ub',
 
275
                                               retcode=None)
 
276
        finally:
 
277
            if orig_progress is None:
 
278
                del os.environ['BZR_PROGRESS_BAR']
 
279
            else:
 
280
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
281
            
 
282
        if 'Diff is not installed on this machine' in err:
 
283
            raise TestSkipped("No external 'diff' is available")
 
284
        self.assertEqual('', err)
 
285
        # We have to skip the stuff in the middle, because it depends
 
286
        # on time.time()
 
287
        self.assertStartsWith(out, "=== added file 'goodbye'\n"
 
288
                                   "--- goodbye\t1970-01-01 00:00:00 +0000\n"
 
289
                                   "+++ goodbye\t")
 
290
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
 
291
                                 "+baz\n\n")