1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
18
"""Black-box tests for bzr diff.
25
from bzrlib import workingtree
26
from bzrlib.branch import Branch
27
from bzrlib.tests import TestSkipped
28
from bzrlib.tests.blackbox import ExternalBase
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)
37
class DiffBase(ExternalBase):
38
"""Base class with common setup method"""
40
def make_example_branch(self):
41
# FIXME: copied from test_too_much -- share elsewhere?
42
tree = self.make_branch_and_tree('.')
43
open('hello', 'wb').write('foo\n')
46
open('goodbye', 'wb').write('baz\n')
51
class TestDiff(DiffBase):
54
self.make_example_branch()
55
file('hello', 'wt').write('hello world!')
56
self.run_bzr('commit -m fixing hello')
57
output = self.run_bzr('diff -r 2..3', retcode=1)[0]
58
self.assert_('\n+hello world!' in output)
59
output = self.run_bzr('diff -r last:3..last:1',
61
self.assert_('\n+baz' in output)
62
self.build_tree(['moo'])
63
self.run_bzr('add moo')
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
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')
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
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
121
def test_diff_nonexistent(self):
122
# Get an error from a file that does not exist at all
124
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')
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')
132
def test_diff_unversioned(self):
133
# Get an error when diffing a non-versioned file.
135
self.make_example_branch()
136
self.build_tree(['unversioned-file'])
137
out, err = self.run_bzr('diff unversioned-file', retcode=3)
138
self.assertContainsRe(err, 'not versioned.*unversioned-file')
140
# TODO: What should diff say for a file deleted in working tree?
142
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]
148
self.build_tree_contents([('branch2/file', 'new content\n')])
149
self.run_bzr(['commit', '-m', 'update file', 'branch2'])
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',
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"
162
"+contents of branch1/file\n"
163
"\n", subst_dates(out))
164
out, err = self.run_bzr('diff branch2 branch1',
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"
172
"+contents of branch1/file\n"
173
"\n", subst_dates(out))
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'])
181
out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
183
self.assertEquals('', err)
184
self.assertEquals('', out)
185
out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
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"
193
"+contents of branch1/file\n"
194
"\n", subst_dates(out))
196
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'])
203
print >> open('branch1/file1', 'wb'), 'repo line'
204
self.run_bzr(['commit', '-m', 'second commit', 'branch1'])
206
def test_diff_to_working_tree(self):
207
self.example_branch2()
209
print >> open('branch1/file1', 'wb'), 'new line'
210
output = self.run_bzr('diff -r 1.. branch1',
212
self.assertTrue('\n-original line\n+new line\n' in output[0])
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)
224
class TestCheckoutDiff(TestDiff):
226
def make_example_branch(self):
227
super(TestCheckoutDiff, self).make_example_branch()
228
self.run_bzr('checkout . checkout')
231
def example_branch2(self):
232
super(TestCheckoutDiff, self).example_branch2()
233
os.mkdir('checkouts')
234
self.run_bzr('checkout branch1 checkouts/branch1')
235
os.chdir('checkouts')
237
def example_branches(self):
238
super(TestCheckoutDiff, self).example_branches()
239
os.mkdir('checkouts')
240
self.run_bzr('checkout branch1 checkouts/branch1')
241
self.run_bzr('checkout branch2 checkouts/branch2')
242
os.chdir('checkouts')
245
class TestDiffLabels(DiffBase):
247
def test_diff_label_removed(self):
248
super(TestDiffLabels, self).make_example_branch()
249
self.run_bzr('remove hello')
250
diff = self.run_bzr('diff', retcode=1)
251
self.assertTrue("=== removed file 'hello'" in diff[0])
253
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')
257
diff = self.run_bzr('diff', retcode=1)
258
self.assertTrue("=== added file 'barbar'" in diff[0])
260
def test_diff_label_modified(self):
261
super(TestDiffLabels, self).make_example_branch()
262
file('hello', 'wt').write('barbar')
263
diff = self.run_bzr('diff', retcode=1)
264
self.assertTrue("=== modified file 'hello'" in diff[0])
266
def test_diff_label_renamed(self):
267
super(TestDiffLabels, self).make_example_branch()
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])
273
class TestExternalDiff(DiffBase):
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')
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,
290
if orig_progress is None:
291
del os.environ['BZR_PROGRESS_BAR']
293
os.environ['BZR_PROGRESS_BAR'] = orig_progress
295
if 'Diff is not installed on this machine' in err:
296
raise TestSkipped("No external 'diff' is available")
297
self.assertEqual('', err)
298
# We have to skip the stuff in the middle, because it depends
300
self.assertStartsWith(out, "=== added file 'goodbye'\n"
301
"--- goodbye\t1970-01-01 00:00:00 +0000\n"
303
self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
307
class TestDiffOutput(DiffBase):
309
def test_diff_output(self):
310
# check that output doesn't mangle line-endings
311
self.make_example_branch()
312
file('hello', 'wb').write('hello world!\n')
313
output = self.run_bzr_subprocess('diff', retcode=1)[0]
314
self.assert_('\n+hello world!\n' in output)
added
removed
bzrlib/tests/blackbox/test_diff.py
