/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-09-17 23:11:44 UTC
  • mfrom: (2825.2.1 misc-fixen)
  • Revision ID: pqm@pqm.ubuntu.com-20070917231144-u7uxe56m03v95chg
(robertc) Micro-tweaks to sha routines. (Robert Collins)

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