/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: Canonical.com Patch Queue Manager
  • Date: 2007-08-28 05:54:22 UTC
  • mfrom: (2754.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070828055422-9h8abp4darakavba
(Lukáš Lalinský) Use UTF-8 encoded StringIO for log tests to avoid failures on non-ASCII committer names

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
19
19
"""
20
20
 
21
21
import os
 
22
import re
22
23
 
23
24
import bzrlib
 
25
from bzrlib import workingtree
24
26
from bzrlib.branch import Branch
 
27
from bzrlib.tests import TestSkipped
25
28
from bzrlib.tests.blackbox import ExternalBase
26
29
 
27
30
 
28
 
class TestDiff(ExternalBase):
29
 
 
30
 
    def make_example_branch(test):
 
31
def subst_dates(string):
 
32
    """Replace date strings with constant values."""
 
33
    return re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]\d{4}',
 
34
                  'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
 
35
 
 
36
 
 
37
class DiffBase(ExternalBase):
 
38
    """Base class with common setup method"""
 
39
 
 
40
    def make_example_branch(self):
31
41
        # FIXME: copied from test_too_much -- share elsewhere?
32
 
        test.runbzr('init')
33
 
        file('hello', 'wt').write('foo')
34
 
        test.runbzr('add hello')
35
 
        test.runbzr('commit -m setup hello')
36
 
        file('goodbye', 'wt').write('baz')
37
 
        test.runbzr('add goodbye')
38
 
        test.runbzr('commit -m setup goodbye')
 
42
        tree = self.make_branch_and_tree('.')
 
43
        open('hello', 'wb').write('foo\n')
 
44
        tree.add(['hello'])
 
45
        tree.commit('setup')
 
46
        open('goodbye', 'wb').write('baz\n')
 
47
        tree.add(['goodbye'])
 
48
        tree.commit('setup')
 
49
 
 
50
 
 
51
class TestDiff(DiffBase):
39
52
 
40
53
    def test_diff(self):
41
54
        self.make_example_branch()
42
55
        file('hello', 'wt').write('hello world!')
43
 
        self.runbzr('commit -m fixing hello')
44
 
        output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
 
56
        self.run_bzr('commit -m fixing hello')
 
57
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
45
58
        self.assert_('\n+hello world!' in output)
46
 
        output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
 
59
        output = self.run_bzr('diff -r last:3..last:1',
 
60
                retcode=1)[0]
47
61
        self.assert_('\n+baz' in output)
48
 
        file('moo', 'wb').write('moo')
49
 
        self.runbzr('add moo')
 
62
        self.build_tree(['moo'])
 
63
        self.run_bzr('add moo')
50
64
        os.unlink('moo')
51
 
        self.runbzr('diff')
 
65
        self.run_bzr('diff')
 
66
 
 
67
    def test_diff_prefix(self):
 
68
        """diff --prefix appends to filenames in output"""
 
69
        self.make_example_branch()
 
70
        file('hello', 'wb').write('hello world!\n')
 
71
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
 
72
        self.assertEquals(err, '')
 
73
        self.assertEqualDiff(subst_dates(out), '''\
 
74
=== modified file 'hello'
 
75
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
76
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
77
@@ -1,1 +1,1 @@
 
78
-foo
 
79
+hello world!
 
80
 
 
81
''')
 
82
 
 
83
    def test_diff_illegal_prefix_value(self):
 
84
        # There was an error in error reporting for this option
 
85
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
 
86
        self.assertContainsRe(err,
 
87
            '--prefix expects two values separated by a colon')
 
88
 
 
89
    def test_diff_p1(self):
 
90
        """diff -p1 produces lkml-style diffs"""
 
91
        self.make_example_branch()
 
92
        file('hello', 'wb').write('hello world!\n')
 
93
        out, err = self.run_bzr('diff -p1', retcode=1)
 
94
        self.assertEquals(err, '')
 
95
        self.assertEqualDiff(subst_dates(out), '''\
 
96
=== modified file 'hello'
 
97
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
98
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
99
@@ -1,1 +1,1 @@
 
100
-foo
 
101
+hello world!
 
102
 
 
103
''')
 
104
 
 
105
    def test_diff_p0(self):
 
106
        """diff -p0 produces diffs with no prefix"""
 
107
        self.make_example_branch()
 
108
        file('hello', 'wb').write('hello world!\n')
 
109
        out, err = self.run_bzr('diff -p0', retcode=1)
 
110
        self.assertEquals(err, '')
 
111
        self.assertEqualDiff(subst_dates(out), '''\
 
112
=== modified file 'hello'
 
113
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
114
+++ hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
115
@@ -1,1 +1,1 @@
 
116
-foo
 
117
+hello world!
 
118
 
 
119
''')
52
120
 
53
121
    def test_diff_nonexistent(self):
54
122
        # Get an error from a file that does not exist at all
55
123
        # (Malone #3619)
56
124
        self.make_example_branch()
57
 
        out, err = self.runbzr('diff does-not-exist', retcode=3)
 
125
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
58
126
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
59
127
 
 
128
    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')
 
131
 
60
132
    def test_diff_unversioned(self):
61
133
        # Get an error when diffing a non-versioned file.
62
134
        # (Malone #3619)
63
135
        self.make_example_branch()
64
136
        self.build_tree(['unversioned-file'])
65
 
        out, err = self.runbzr('diff unversioned-file', retcode=3)
 
137
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
66
138
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
67
139
 
68
140
    # TODO: What should diff say for a file deleted in working tree?
69
141
 
70
142
    def example_branches(self):
71
143
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
72
 
        self.capture('init branch1')
73
 
        self.capture('add branch1/file')
74
 
        self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
75
 
        self.capture('branch branch1 branch2')
76
 
        print >> open('branch2/file', 'wb'), 'new content'
77
 
        self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
 
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]
 
148
        self.build_tree_contents([('branch2/file', 'new content\n')])
 
149
        self.run_bzr(['commit', '-m', 'update file', 'branch2'])
78
150
 
79
151
    def test_diff_branches(self):
80
152
        self.example_branches()
81
153
        # should open branch1 and diff against branch2, 
82
 
        output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 
83
 
                                        'branch1'],
84
 
                                       retcode=1)
85
 
        self.assertEquals(("=== modified file 'a/file'\n"
86
 
                           "--- a/file\t\n"
87
 
                           "+++ b/file\t\n"
88
 
                           "@@ -1,1 +1,1 @@\n"
89
 
                           "-new content\n"
90
 
                           "+contents of branch1/file\n"
91
 
                           "\n", ''), output)
92
 
        output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
93
 
                                       retcode=1)
94
 
        self.assertEqualDiff(("=== modified file 'a/file'\n"
95
 
                              "--- a/file\t\n"
96
 
                              "+++ b/file\t\n"
97
 
                              "@@ -1,1 +1,1 @@\n"
98
 
                              "-new content\n"
99
 
                              "+contents of branch1/file\n"
100
 
                              "\n", ''), output)
 
154
        out, err = self.run_bzr('diff -r branch:branch2 branch1',
 
155
                                retcode=1)
 
156
        self.assertEquals('', err)
 
157
        self.assertEquals("=== modified file 'file'\n"
 
158
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
159
                          "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
160
                          "@@ -1,1 +1,1 @@\n"
 
161
                          "-new content\n"
 
162
                          "+contents of branch1/file\n"
 
163
                          "\n", subst_dates(out))
 
164
        out, err = self.run_bzr('diff branch2 branch1',
 
165
                                         retcode=1)
 
166
        self.assertEquals('', err)
 
167
        self.assertEqualDiff("=== modified file 'file'\n"
 
168
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
169
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
170
                              "@@ -1,1 +1,1 @@\n"
 
171
                              "-new content\n"
 
172
                              "+contents of branch1/file\n"
 
173
                              "\n", subst_dates(out))
 
174
 
 
175
    def test_diff_revno_branches(self):
 
176
        self.example_branches()
 
177
        print >> open('branch2/file', 'wb'), 'even newer content'
 
178
        self.run_bzr(['commit', '-m',
 
179
                      'update file once more', 'branch2'])
 
180
 
 
181
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
 
182
                                )
 
183
        self.assertEquals('', err)
 
184
        self.assertEquals('', out)
 
185
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
 
186
                                retcode=1)
 
187
        self.assertEquals('', err)
 
188
        self.assertEqualDiff("=== modified file 'file'\n"
 
189
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
190
                              "+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
 
191
                              "@@ -1,1 +1,1 @@\n"
 
192
                              "-new content\n"
 
193
                              "+contents of branch1/file\n"
 
194
                              "\n", subst_dates(out))
101
195
 
102
196
    def example_branch2(self):
103
197
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
104
 
        self.capture('init branch1')
105
 
        self.capture('add branch1/file1')
 
198
        self.run_bzr('init branch1')[0]
 
199
        self.run_bzr('add branch1/file1')[0]
106
200
        print >> open('branch1/file1', 'wb'), 'original line'
107
 
        self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
 
201
        self.run_bzr(['commit', '-m', 'first commit', 'branch1'])
108
202
        
109
203
        print >> open('branch1/file1', 'wb'), 'repo line'
110
 
        self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
 
204
        self.run_bzr(['commit', '-m', 'second commit', 'branch1'])
111
205
 
112
206
    def test_diff_to_working_tree(self):
113
207
        self.example_branch2()
114
208
        
115
209
        print >> open('branch1/file1', 'wb'), 'new line'
116
 
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
117
 
        self.assertTrue('\n-original line\n+new line\n' in output[0])
 
210
        output = self.run_bzr('diff -r 1.. branch1',
 
211
                              retcode=1)
 
212
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
213
 
 
214
    def test_diff_across_rename(self):
 
215
        """The working tree path should always be considered for diffing"""
 
216
        self.make_example_branch()
 
217
        self.run_bzr('diff -r 0..1 hello', retcode=1)
 
218
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
219
        wt.rename_one('hello', 'hello1')
 
220
        self.run_bzr('diff hello1', retcode=1)
 
221
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
118
222
 
119
223
 
120
224
class TestCheckoutDiff(TestDiff):
121
225
 
122
226
    def make_example_branch(self):
123
227
        super(TestCheckoutDiff, self).make_example_branch()
124
 
        self.runbzr('checkout . checkout')
 
228
        self.run_bzr('checkout . checkout')
125
229
        os.chdir('checkout')
126
230
 
127
231
    def example_branch2(self):
128
232
        super(TestCheckoutDiff, self).example_branch2()
129
233
        os.mkdir('checkouts')
130
 
        self.runbzr('checkout branch1 checkouts/branch1')
 
234
        self.run_bzr('checkout branch1 checkouts/branch1')
131
235
        os.chdir('checkouts')
132
236
 
133
237
    def example_branches(self):
134
238
        super(TestCheckoutDiff, self).example_branches()
135
239
        os.mkdir('checkouts')
136
 
        self.runbzr('checkout branch1 checkouts/branch1')
137
 
        self.runbzr('checkout branch2 checkouts/branch2')
 
240
        self.run_bzr('checkout branch1 checkouts/branch1')
 
241
        self.run_bzr('checkout branch2 checkouts/branch2')
138
242
        os.chdir('checkouts')
139
243
 
140
244
 
141
 
class TestDiffLabels(TestDiff):
 
245
class TestDiffLabels(DiffBase):
142
246
 
143
247
    def test_diff_label_removed(self):
144
248
        super(TestDiffLabels, self).make_example_branch()
145
 
        self.runbzr('remove hello')
146
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
147
 
        self.assertTrue("=== removed file 'a/hello'" in diff[0])
 
249
        self.run_bzr('remove hello')
 
250
        diff = self.run_bzr('diff', retcode=1)
 
251
        self.assertTrue("=== removed file 'hello'" in diff[0])
148
252
 
149
253
    def test_diff_label_added(self):
150
254
        super(TestDiffLabels, self).make_example_branch()
151
255
        file('barbar', 'wt').write('barbar')
152
 
        self.runbzr('add barbar')
153
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
154
 
        self.assertTrue("=== added file 'b/barbar'" in diff[0])
 
256
        self.run_bzr('add barbar')
 
257
        diff = self.run_bzr('diff', retcode=1)
 
258
        self.assertTrue("=== added file 'barbar'" in diff[0])
155
259
 
156
260
    def test_diff_label_modified(self):
157
261
        super(TestDiffLabels, self).make_example_branch()
158
262
        file('hello', 'wt').write('barbar')
159
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
160
 
        self.assertTrue("=== modified file 'a/hello'" in diff[0])
 
263
        diff = self.run_bzr('diff', retcode=1)
 
264
        self.assertTrue("=== modified file 'hello'" in diff[0])
161
265
 
162
266
    def test_diff_label_renamed(self):
163
267
        super(TestDiffLabels, self).make_example_branch()
164
 
        self.runbzr('rename hello gruezi')
165
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
166
 
        self.assertTrue("=== renamed file 'a/hello' => 'b/gruezi'" in diff[0])
 
268
        self.run_bzr('rename hello gruezi')
 
269
        diff = self.run_bzr('diff', retcode=1)
 
270
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
 
271
 
 
272
 
 
273
class TestExternalDiff(DiffBase):
 
274
 
 
275
    def test_external_diff(self):
 
276
        """Test that we can spawn an external diff process"""
 
277
        # We have to use run_bzr_subprocess, because we need to
 
278
        # test writing directly to stdout, (there was a bug in
 
279
        # subprocess.py that we had to workaround).
 
280
        # However, if 'diff' may not be available
 
281
        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 --diff-options -ub',
 
286
                                               universal_newlines=True,
 
287
                                               retcode=None)
 
288
        finally:
 
289
            if orig_progress is None:
 
290
                del os.environ['BZR_PROGRESS_BAR']
 
291
            else:
 
292
                os.environ['BZR_PROGRESS_BAR'] = orig_progress
 
293
            
 
294
        if 'Diff is not installed on this machine' in err:
 
295
            raise TestSkipped("No external 'diff' is available")
 
296
        self.assertEqual('', err)
 
297
        # We have to skip the stuff in the middle, because it depends
 
298
        # on time.time()
 
299
        self.assertStartsWith(out, "=== added file 'goodbye'\n"
 
300
                                   "--- goodbye\t1970-01-01 00:00:00 +0000\n"
 
301
                                   "+++ goodbye\t")
 
302
        self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
 
303
                                 "+baz\n\n")
 
304
 
 
305
 
 
306
class TestDiffOutput(DiffBase):
 
307
 
 
308
    def test_diff_output(self):
 
309
        # check that output doesn't mangle line-endings
 
310
        self.make_example_branch()
 
311
        file('hello', 'wb').write('hello world!\n')
 
312
        output = self.run_bzr_subprocess('diff', retcode=1)[0]
 
313
        self.assert_('\n+hello world!\n' in output)