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.runbzr('commit -m fixing hello')
57
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
58
self.assert_('\n+hello world!' in output)
59
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
60
self.assert_('\n+baz' in output)
61
file('moo', 'wb').write('moo')
62
self.runbzr('add moo')
66
def test_diff_prefix(self):
67
"""diff --prefix appends to filenames in output"""
68
self.make_example_branch()
69
file('hello', 'wb').write('hello world!\n')
70
out, err = self.runbzr('diff --prefix old/:new/', retcode=1)
71
self.assertEquals(err, '')
72
self.assertEqualDiff(subst_dates(out), '''\
73
=== modified file 'hello'
74
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
75
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
82
def test_diff_illegal_prefix_value(self):
83
# There was an error in error reporting for this option
84
out, err = self.runbzr('diff --prefix old/', retcode=3)
85
self.assertContainsRe(err,
86
'--prefix expects two values separated by a colon')
88
def test_diff_p1(self):
89
"""diff -p1 produces lkml-style diffs"""
90
self.make_example_branch()
91
file('hello', 'wb').write('hello world!\n')
92
out, err = self.runbzr('diff -p1', retcode=1)
93
self.assertEquals(err, '')
94
self.assertEqualDiff(subst_dates(out), '''\
95
=== modified file 'hello'
96
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
97
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
104
def test_diff_p0(self):
105
"""diff -p0 produces diffs with no prefix"""
106
self.make_example_branch()
107
file('hello', 'wb').write('hello world!\n')
108
out, err = self.runbzr('diff -p0', retcode=1)
109
self.assertEquals(err, '')
110
self.assertEqualDiff(subst_dates(out), '''\
111
=== modified file 'hello'
112
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
113
+++ hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
120
def test_diff_nonexistent(self):
121
# Get an error from a file that does not exist at all
123
self.make_example_branch()
124
out, err = self.runbzr('diff does-not-exist', retcode=3)
125
self.assertContainsRe(err, 'not versioned.*does-not-exist')
127
def test_diff_illegal_revision_specifiers(self):
128
out, err = self.runbzr('diff -r 1..23..123', retcode=3)
129
self.assertContainsRe(err, 'one or two revision specifiers')
131
def test_diff_unversioned(self):
132
# Get an error when diffing a non-versioned file.
134
self.make_example_branch()
135
self.build_tree(['unversioned-file'])
136
out, err = self.runbzr('diff unversioned-file', retcode=3)
137
self.assertContainsRe(err, 'not versioned.*unversioned-file')
139
# TODO: What should diff say for a file deleted in working tree?
141
def example_branches(self):
142
self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
143
self.capture('init branch1')
144
self.capture('add branch1/file')
145
self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
146
self.capture('branch branch1 branch2')
147
print >> open('branch2/file', 'wb'), 'new content'
148
self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
150
def test_diff_branches(self):
151
self.example_branches()
152
# should open branch1 and diff against branch2,
153
out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
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_captured(['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_captured(['commit', '-m',
179
'update file once more', 'branch2'])
181
out, err = self.run_bzr_captured(['diff', '-r',
182
'revno:1:branch2..revno:1:branch1'],
184
self.assertEquals('', err)
185
self.assertEquals('', out)
186
out, err = self.run_bzr_captured(['diff', '-r',
187
'revno:2:branch2..revno:1:branch1'],
189
self.assertEquals('', err)
190
self.assertEqualDiff("=== modified file 'file'\n"
191
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
192
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
195
"+contents of branch1/file\n"
196
"\n", subst_dates(out))
198
def example_branch2(self):
199
self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
200
self.capture('init branch1')
201
self.capture('add branch1/file1')
202
print >> open('branch1/file1', 'wb'), 'original line'
203
self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
205
print >> open('branch1/file1', 'wb'), 'repo line'
206
self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
208
def test_diff_to_working_tree(self):
209
self.example_branch2()
211
print >> open('branch1/file1', 'wb'), 'new line'
212
output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],
214
self.assertTrue('\n-original line\n+new line\n' in output[0])
216
def test_diff_across_rename(self):
217
"""The working tree path should always be considered for diffing"""
218
self.make_example_branch()
219
self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
220
wt = workingtree.WorkingTree.open_containing('.')[0]
221
wt.rename_one('hello', 'hello1')
222
self.run_bzr('diff', 'hello1', retcode=1)
223
self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
226
class TestCheckoutDiff(TestDiff):
228
def make_example_branch(self):
229
super(TestCheckoutDiff, self).make_example_branch()
230
self.runbzr('checkout . checkout')
233
def example_branch2(self):
234
super(TestCheckoutDiff, self).example_branch2()
235
os.mkdir('checkouts')
236
self.runbzr('checkout branch1 checkouts/branch1')
237
os.chdir('checkouts')
239
def example_branches(self):
240
super(TestCheckoutDiff, self).example_branches()
241
os.mkdir('checkouts')
242
self.runbzr('checkout branch1 checkouts/branch1')
243
self.runbzr('checkout branch2 checkouts/branch2')
244
os.chdir('checkouts')
247
class TestDiffLabels(DiffBase):
249
def test_diff_label_removed(self):
250
super(TestDiffLabels, self).make_example_branch()
251
self.runbzr('remove hello')
252
diff = self.run_bzr_captured(['diff'], retcode=1)
253
self.assertTrue("=== removed file 'hello'" in diff[0])
255
def test_diff_label_added(self):
256
super(TestDiffLabels, self).make_example_branch()
257
file('barbar', 'wt').write('barbar')
258
self.runbzr('add barbar')
259
diff = self.run_bzr_captured(['diff'], retcode=1)
260
self.assertTrue("=== added file 'barbar'" in diff[0])
262
def test_diff_label_modified(self):
263
super(TestDiffLabels, self).make_example_branch()
264
file('hello', 'wt').write('barbar')
265
diff = self.run_bzr_captured(['diff'], retcode=1)
266
self.assertTrue("=== modified file 'hello'" in diff[0])
268
def test_diff_label_renamed(self):
269
super(TestDiffLabels, self).make_example_branch()
270
self.runbzr('rename hello gruezi')
271
diff = self.run_bzr_captured(['diff'], retcode=1)
272
self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
275
class TestExternalDiff(DiffBase):
277
def test_external_diff(self):
278
"""Test that we can spawn an external diff process"""
279
# We have to use run_bzr_subprocess, because we need to
280
# test writing directly to stdout, (there was a bug in
281
# subprocess.py that we had to workaround).
282
# However, if 'diff' may not be available
283
self.make_example_branch()
284
orig_progress = os.environ.get('BZR_PROGRESS_BAR')
286
os.environ['BZR_PROGRESS_BAR'] = 'none'
287
out, err = self.run_bzr_subprocess('diff', '-r', '1',
288
'--diff-options', '-ub',
289
universal_newlines=True,
292
if orig_progress is None:
293
del os.environ['BZR_PROGRESS_BAR']
295
os.environ['BZR_PROGRESS_BAR'] = orig_progress
297
if 'Diff is not installed on this machine' in err:
298
raise TestSkipped("No external 'diff' is available")
299
self.assertEqual('', err)
300
# We have to skip the stuff in the middle, because it depends
302
self.assertStartsWith(out, "=== added file 'goodbye'\n"
303
"--- goodbye\t1970-01-01 00:00:00 +0000\n"
305
self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
309
class TestDiffOutput(DiffBase):
311
def test_diff_output(self):
312
# check that output doesn't mangle line-endings
313
self.make_example_branch()
314
file('hello', 'wb').write('hello world!\n')
315
output = self.run_bzr_subprocess('diff', retcode=1)[0]
316
self.assert_('\n+hello world!\n' in output)
added
removed
bzrlib/tests/blackbox/test_diff.py
