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
28
class TestDiff(ExternalBase):
30
def make_example_branch(test):
31
# FIXME: copied from test_too_much -- share elsewhere?
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)
37
class DiffBase(ExternalBase):
38
"""Base class with common setup method"""
40
def make_example_branch(self):
41
tree = self.make_branch_and_tree('.')
42
self.build_tree_contents([
44
('goodbye', 'baz\n')])
52
class TestDiff(DiffBase):
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'])
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
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')
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
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
53
125
def test_diff_nonexistent(self):
54
126
# Get an error from a file that does not exist at all
56
128
self.make_example_branch()
57
out, err = self.runbzr('diff does-not-exist', retcode=3)
58
self.assertContainsRe(err, 'not versioned.*does-not-exist')
129
out, err = self.run_bzr('diff does-not-exist', retcode=3,
130
error_regexes=('not versioned.*does-not-exist',))
132
def test_diff_illegal_revision_specifiers(self):
133
out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
134
error_regexes=('one or two revision specifiers',))
136
def test_diff_nonexistent_revision(self):
137
out, err = self.run_bzr('diff -r 123', retcode=3,
138
error_regexes=("Requested revision: '123' does not "
139
"exist in branch:",))
141
def test_diff_nonexistent_dotted_revision(self):
142
out, err = self.run_bzr('diff -r 1.1', retcode=3)
143
self.assertContainsRe(err,
144
"Requested revision: '1.1' does not exist in branch:")
146
def test_diff_nonexistent_dotted_revision_change(self):
147
out, err = self.run_bzr('diff -c 1.1', retcode=3)
148
self.assertContainsRe(err,
149
"Requested revision: '1.1' does not exist in branch:")
60
151
def test_diff_unversioned(self):
61
152
# Get an error when diffing a non-versioned file.
63
154
self.make_example_branch()
64
155
self.build_tree(['unversioned-file'])
65
out, err = self.runbzr('diff unversioned-file', retcode=3)
156
out, err = self.run_bzr('diff unversioned-file', retcode=3)
66
157
self.assertContainsRe(err, 'not versioned.*unversioned-file')
68
159
# TODO: What should diff say for a file deleted in working tree?
70
161
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'])
162
branch1_tree = self.make_branch_and_tree('branch1')
163
self.build_tree(['branch1/file'], line_endings='binary')
164
self.build_tree(['branch1/file2'], line_endings='binary')
165
branch1_tree.add('file')
166
branch1_tree.add('file2')
167
branch1_tree.commit(message='add file and file2')
168
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
169
self.build_tree_contents([('branch2/file', 'new content\n')])
170
branch2_tree.commit(message='update file')
171
return branch1_tree, branch2_tree
173
def check_b2_vs_b1(self, cmd):
174
# Compare branch2 vs branch1 using cmd and check the result
175
out, err = self.run_bzr(cmd, retcode=1)
176
self.assertEquals('', err)
177
self.assertEquals("=== modified file 'file'\n"
178
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
179
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
182
"+contents of branch1/file\n"
183
"\n", subst_dates(out))
185
def check_b1_vs_b2(self, cmd):
186
# Compare branch1 vs branch2 using cmd and check the result
187
out, err = self.run_bzr(cmd, retcode=1)
188
self.assertEquals('', err)
189
self.assertEqualDiff("=== modified file 'file'\n"
190
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
191
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
193
"-contents of branch1/file\n"
195
"\n", subst_dates(out))
197
def check_no_diffs(self, cmd):
198
# Check that running cmd returns an empty diff
199
out, err = self.run_bzr(cmd, retcode=0)
200
self.assertEquals('', err)
201
self.assertEquals('', out)
79
203
def test_diff_branches(self):
80
204
self.example_branches()
81
# should open branch1 and diff against branch2,
82
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
85
self.assertEquals(("=== modified file 'a/file'\n"
90
"+contents of branch1/file\n"
92
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
94
self.assertEqualDiff(("=== modified file 'a/file'\n"
205
# should open branch1 and diff against branch2,
206
self.check_b2_vs_b1('diff -r branch:branch2 branch1')
207
# Compare two working trees using various syntax forms
208
self.check_b2_vs_b1('diff --old branch2 --new branch1')
209
self.check_b2_vs_b1('diff --old branch2 branch1')
210
self.check_b2_vs_b1('diff branch2 --new branch1')
211
# Test with a selected file that was changed
212
self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
213
self.check_b2_vs_b1('diff --old branch2 branch1/file')
214
self.check_b2_vs_b1('diff branch2/file --new branch1')
215
# Test with a selected file that was not changed
216
self.check_no_diffs('diff --old branch2 --new branch1 file2')
217
self.check_no_diffs('diff --old branch2 branch1/file2')
218
self.check_no_diffs('diff branch2/file2 --new branch1')
220
def test_diff_branches_no_working_trees(self):
221
branch1_tree, branch2_tree = self.example_branches()
222
# Compare a working tree to a branch without a WT
223
dir1 = branch1_tree.bzrdir
224
dir1.destroy_workingtree()
225
self.assertFalse(dir1.has_workingtree())
226
self.check_b2_vs_b1('diff --old branch2 --new branch1')
227
self.check_b2_vs_b1('diff --old branch2 branch1')
228
self.check_b2_vs_b1('diff branch2 --new branch1')
229
# Compare a branch without a WT to one with a WT
230
self.check_b1_vs_b2('diff --old branch1 --new branch2')
231
self.check_b1_vs_b2('diff --old branch1 branch2')
232
self.check_b1_vs_b2('diff branch1 --new branch2')
233
# Compare a branch with a WT against another without a WT
234
dir2 = branch2_tree.bzrdir
235
dir2.destroy_workingtree()
236
self.assertFalse(dir2.has_workingtree())
237
self.check_b1_vs_b2('diff --old branch1 --new branch2')
238
self.check_b1_vs_b2('diff --old branch1 branch2')
239
self.check_b1_vs_b2('diff branch1 --new branch2')
241
def test_diff_revno_branches(self):
242
self.example_branches()
243
branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
244
self.build_tree_contents([('branch2/file', 'even newer content')])
245
branch2_tree.commit(message='update file once more')
247
out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
249
self.assertEquals('', err)
250
self.assertEquals('', out)
251
out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
253
self.assertEquals('', err)
254
self.assertEqualDiff("=== modified file 'file'\n"
255
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
256
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
97
257
"@@ -1,1 +1,1 @@\n"
99
259
"+contents of branch1/file\n"
260
"\n", subst_dates(out))
102
262
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'])
109
print >> open('branch1/file1', 'wb'), 'repo line'
110
self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
263
branch1_tree = self.make_branch_and_tree('branch1')
264
self.build_tree_contents([('branch1/file1', 'original line\n')])
265
branch1_tree.add('file1')
266
branch1_tree.commit(message='first commit')
267
self.build_tree_contents([('branch1/file1', 'repo line\n')])
268
branch1_tree.commit(message='second commit')
112
271
def test_diff_to_working_tree(self):
113
272
self.example_branch2()
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])
273
self.build_tree_contents([('branch1/file1', 'new line')])
274
output = self.run_bzr('diff -r 1.. branch1', retcode=1)
275
self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
277
def test_diff_to_working_tree_in_subdir(self):
278
self.example_branch2()
279
self.build_tree_contents([('branch1/file1', 'new line')])
280
os.mkdir('branch1/dir1')
281
os.chdir('branch1/dir1')
282
output = self.run_bzr('diff -r 1..', retcode=1)
283
self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
285
def test_diff_across_rename(self):
286
"""The working tree path should always be considered for diffing"""
287
tree = self.make_example_branch()
288
self.run_bzr('diff -r 0..1 hello', retcode=1)
289
tree.rename_one('hello', 'hello1')
290
self.run_bzr('diff hello1', retcode=1)
291
self.run_bzr('diff -r 0..1 hello1', retcode=1)
293
def test_diff_to_branch_no_working_tree(self):
294
branch1_tree = self.example_branch2()
295
dir1 = branch1_tree.bzrdir
296
dir1.destroy_workingtree()
297
self.assertFalse(dir1.has_workingtree())
298
output = self.run_bzr('diff -r 1.. branch1', retcode=1)
299
self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
120
302
class TestCheckoutDiff(TestDiff):
122
304
def make_example_branch(self):
123
super(TestCheckoutDiff, self).make_example_branch()
124
self.runbzr('checkout . checkout')
305
tree = super(TestCheckoutDiff, self).make_example_branch()
306
tree = tree.branch.create_checkout('checkout')
125
307
os.chdir('checkout')
127
310
def example_branch2(self):
128
super(TestCheckoutDiff, self).example_branch2()
311
tree = super(TestCheckoutDiff, self).example_branch2()
129
312
os.mkdir('checkouts')
130
self.runbzr('checkout branch1 checkouts/branch1')
313
tree = tree.branch.create_checkout('checkouts/branch1')
131
314
os.chdir('checkouts')
133
317
def example_branches(self):
134
super(TestCheckoutDiff, self).example_branches()
318
branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
135
319
os.mkdir('checkouts')
136
self.runbzr('checkout branch1 checkouts/branch1')
137
self.runbzr('checkout branch2 checkouts/branch2')
320
branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
321
branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
138
322
os.chdir('checkouts')
141
class TestDiffLabels(TestDiff):
323
return branch1_tree, branch2_tree
326
class TestDiffLabels(DiffBase):
143
328
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])
329
tree = super(TestDiffLabels, self).make_example_branch()
330
tree.remove('hello', keep_files=False)
331
diff = self.run_bzr('diff', retcode=1)
332
self.assertTrue("=== removed file 'hello'" in diff[0])
149
334
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])
335
tree = super(TestDiffLabels, self).make_example_branch()
336
self.build_tree_contents([('barbar', 'barbar')])
338
diff = self.run_bzr('diff', retcode=1)
339
self.assertTrue("=== added file 'barbar'" in diff[0])
156
341
def test_diff_label_modified(self):
157
342
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])
343
self.build_tree_contents([('hello', 'barbar')])
344
diff = self.run_bzr('diff', retcode=1)
345
self.assertTrue("=== modified file 'hello'" in diff[0])
162
347
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])
348
tree = super(TestDiffLabels, self).make_example_branch()
349
tree.rename_one('hello', 'gruezi')
350
diff = self.run_bzr('diff', retcode=1)
351
self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
354
class TestExternalDiff(DiffBase):
356
def test_external_diff(self):
357
"""Test that we can spawn an external diff process"""
358
# We have to use run_bzr_subprocess, because we need to
359
# test writing directly to stdout, (there was a bug in
360
# subprocess.py that we had to workaround).
361
# However, if 'diff' may not be available
362
self.make_example_branch()
363
orig_progress = os.environ.get('BZR_PROGRESS_BAR')
365
os.environ['BZR_PROGRESS_BAR'] = 'none'
366
out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
367
universal_newlines=True,
370
if orig_progress is None:
371
del os.environ['BZR_PROGRESS_BAR']
373
os.environ['BZR_PROGRESS_BAR'] = orig_progress
375
if 'Diff is not installed on this machine' in err:
376
raise TestSkipped("No external 'diff' is available")
377
self.assertEqual('', err)
378
# We have to skip the stuff in the middle, because it depends
380
self.assertStartsWith(out, "=== added file 'goodbye'\n"
381
"--- goodbye\t1970-01-01 00:00:00 +0000\n"
383
self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
387
class TestDiffOutput(DiffBase):
389
def test_diff_output(self):
390
# check that output doesn't mangle line-endings
391
self.make_example_branch()
392
self.build_tree_contents([('hello', 'hello world!\n')])
393
output = self.run_bzr_subprocess('diff', retcode=1)[0]
394
self.assert_('\n+hello world!\n' in output)
added
removed
bzrlib/tests/blackbox/test_diff.py
