33
33
'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
36
class DiffBase(tests.TestCaseWithTransport):
37
"""Base class with common setup method"""
39
def make_example_branch(self):
40
tree = self.make_branch_and_tree('.')
41
self.build_tree_contents([
43
('goodbye', 'baz\n')])
51
class TestDiff(DiffBase):
36
class TestDiff(ExternalBase):
38
def make_example_branch(test):
39
# FIXME: copied from test_too_much -- share elsewhere?
41
file('hello', 'wb').write('foo\n')
42
test.runbzr('add hello')
43
test.runbzr('commit -m setup hello')
44
file('goodbye', 'wb').write('baz\n')
45
test.runbzr('add goodbye')
46
test.runbzr('commit -m setup goodbye')
53
48
def test_diff(self):
54
tree = self.make_example_branch()
55
self.build_tree_contents([('hello', 'hello world!')])
56
tree.commit(message='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 -c 3', retcode=1)[0]
60
self.assert_('\n+hello world!' in output)
61
output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
62
self.assert_('\n+baz' in output)
63
output = self.run_bzr('diff -c last:2', retcode=1)[0]
64
self.assert_('\n+baz' in output)
65
self.build_tree(['moo'])
49
self.make_example_branch()
50
file('hello', 'wt').write('hello world!')
51
self.runbzr('commit -m fixing hello')
52
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
53
self.assert_('\n+hello world!' in output)
54
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
55
self.assert_('\n+baz' in output)
56
file('moo', 'wb').write('moo')
57
self.runbzr('add moo')
70
61
def test_diff_prefix(self):
71
62
"""diff --prefix appends to filenames in output"""
72
63
self.make_example_branch()
73
self.build_tree_contents([('hello', 'hello world!\n')])
74
out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
64
file('hello', 'wb').write('hello world!\n')
65
out, err = self.runbzr('diff --prefix old/:new/', retcode=1)
75
66
self.assertEquals(err, '')
76
67
self.assertEqualDiff(subst_dates(out), '''\
77
68
=== modified file 'hello'
125
110
# Get an error from a file that does not exist at all
127
112
self.make_example_branch()
128
out, err = self.run_bzr('diff does-not-exist', retcode=3,
129
error_regexes=('not versioned.*does-not-exist',))
131
def test_diff_illegal_revision_specifiers(self):
132
out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
133
error_regexes=('one or two revision specifiers',))
135
def test_diff_nonexistent_revision(self):
136
out, err = self.run_bzr('diff -r 123', retcode=3,
137
error_regexes=("Requested revision: '123' does not "
138
"exist in branch:",))
140
def test_diff_nonexistent_dotted_revision(self):
141
out, err = self.run_bzr('diff -r 1.1', retcode=3)
142
self.assertContainsRe(err,
143
"Requested revision: '1.1' does not exist in branch:")
145
def test_diff_nonexistent_dotted_revision_change(self):
146
out, err = self.run_bzr('diff -c 1.1', retcode=3)
147
self.assertContainsRe(err,
148
"Requested revision: '1.1' does not exist in branch:")
113
out, err = self.runbzr('diff does-not-exist', retcode=3)
114
self.assertContainsRe(err, 'not versioned.*does-not-exist')
150
116
def test_diff_unversioned(self):
151
117
# Get an error when diffing a non-versioned file.
153
119
self.make_example_branch()
154
120
self.build_tree(['unversioned-file'])
155
out, err = self.run_bzr('diff unversioned-file', retcode=3)
121
out, err = self.runbzr('diff unversioned-file', retcode=3)
156
122
self.assertContainsRe(err, 'not versioned.*unversioned-file')
158
124
# TODO: What should diff say for a file deleted in working tree?
160
126
def example_branches(self):
161
branch1_tree = self.make_branch_and_tree('branch1')
162
self.build_tree(['branch1/file'], line_endings='binary')
163
self.build_tree(['branch1/file2'], line_endings='binary')
164
branch1_tree.add('file')
165
branch1_tree.add('file2')
166
branch1_tree.commit(message='add file and file2')
167
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
168
self.build_tree_contents([('branch2/file', 'new content\n')])
169
branch2_tree.commit(message='update file')
170
return branch1_tree, branch2_tree
127
self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
128
self.capture('init branch1')
129
self.capture('add branch1/file')
130
self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
131
self.capture('branch branch1 branch2')
132
print >> open('branch2/file', 'wb'), 'new content'
133
self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
172
def check_b2_vs_b1(self, cmd):
173
# Compare branch2 vs branch1 using cmd and check the result
174
out, err = self.run_bzr(cmd, retcode=1)
135
def test_diff_branches(self):
136
self.example_branches()
137
# should open branch1 and diff against branch2,
138
out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
175
141
self.assertEquals('', err)
176
142
self.assertEquals("=== modified file 'file'\n"
177
143
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
181
147
"+contents of branch1/file\n"
182
148
"\n", subst_dates(out))
184
def check_b1_vs_b2(self, cmd):
185
# Compare branch1 vs branch2 using cmd and check the result
186
out, err = self.run_bzr(cmd, retcode=1)
149
out, ett = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
187
151
self.assertEquals('', err)
188
152
self.assertEqualDiff("=== modified file 'file'\n"
189
153
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
190
154
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
191
155
"@@ -1,1 +1,1 @@\n"
192
"-contents of branch1/file\n"
157
"+contents of branch1/file\n"
194
158
"\n", subst_dates(out))
196
def check_no_diffs(self, cmd):
197
# Check that running cmd returns an empty diff
198
out, err = self.run_bzr(cmd, retcode=0)
199
self.assertEquals('', err)
200
self.assertEquals('', out)
202
def test_diff_branches(self):
203
self.example_branches()
204
# should open branch1 and diff against branch2,
205
self.check_b2_vs_b1('diff -r branch:branch2 branch1')
206
# Compare two working trees using various syntax forms
207
self.check_b2_vs_b1('diff --old branch2 --new branch1')
208
self.check_b2_vs_b1('diff --old branch2 branch1')
209
self.check_b2_vs_b1('diff branch2 --new branch1')
210
# Test with a selected file that was changed
211
self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
212
self.check_b2_vs_b1('diff --old branch2 branch1/file')
213
self.check_b2_vs_b1('diff branch2/file --new branch1')
214
# Test with a selected file that was not changed
215
self.check_no_diffs('diff --old branch2 --new branch1 file2')
216
self.check_no_diffs('diff --old branch2 branch1/file2')
217
self.check_no_diffs('diff branch2/file2 --new branch1')
219
def test_diff_branches_no_working_trees(self):
220
branch1_tree, branch2_tree = self.example_branches()
221
# Compare a working tree to a branch without a WT
222
dir1 = branch1_tree.bzrdir
223
dir1.destroy_workingtree()
224
self.assertFalse(dir1.has_workingtree())
225
self.check_b2_vs_b1('diff --old branch2 --new branch1')
226
self.check_b2_vs_b1('diff --old branch2 branch1')
227
self.check_b2_vs_b1('diff branch2 --new branch1')
228
# Compare a branch without a WT to one with a WT
229
self.check_b1_vs_b2('diff --old branch1 --new branch2')
230
self.check_b1_vs_b2('diff --old branch1 branch2')
231
self.check_b1_vs_b2('diff branch1 --new branch2')
232
# Compare a branch with a WT against another without a WT
233
dir2 = branch2_tree.bzrdir
234
dir2.destroy_workingtree()
235
self.assertFalse(dir2.has_workingtree())
236
self.check_b1_vs_b2('diff --old branch1 --new branch2')
237
self.check_b1_vs_b2('diff --old branch1 branch2')
238
self.check_b1_vs_b2('diff branch1 --new branch2')
240
160
def test_diff_revno_branches(self):
241
161
self.example_branches()
242
branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
243
self.build_tree_contents([('branch2/file', 'even newer content')])
244
branch2_tree.commit(message='update file once more')
162
print >> open('branch2/file', 'wb'), 'even newer content'
163
self.run_bzr_captured(['commit', '-m', 'update file once more', 'branch2'])
246
out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
165
out, err = self.run_bzr_captured(['diff', '-r', 'revno:1:branch2..revno:1:branch1'],
248
167
self.assertEquals('', err)
249
168
self.assertEquals('', out)
250
out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
169
out, ett = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2..revno:1:branch1'],
252
171
self.assertEquals('', err)
253
172
self.assertEqualDiff("=== modified file 'file'\n"
254
173
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
259
178
"\n", subst_dates(out))
261
180
def example_branch2(self):
262
branch1_tree = self.make_branch_and_tree('branch1')
263
self.build_tree_contents([('branch1/file1', 'original line\n')])
264
branch1_tree.add('file1')
265
branch1_tree.commit(message='first commit')
266
self.build_tree_contents([('branch1/file1', 'repo line\n')])
267
branch1_tree.commit(message='second commit')
181
self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
182
self.capture('init branch1')
183
self.capture('add branch1/file1')
184
print >> open('branch1/file1', 'wb'), 'original line'
185
self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
187
print >> open('branch1/file1', 'wb'), 'repo line'
188
self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
270
190
def test_diff_to_working_tree(self):
271
191
self.example_branch2()
272
self.build_tree_contents([('branch1/file1', 'new line')])
273
output = self.run_bzr('diff -r 1.. branch1', retcode=1)
274
self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
276
def test_diff_to_working_tree_in_subdir(self):
277
self.example_branch2()
278
self.build_tree_contents([('branch1/file1', 'new line')])
279
os.mkdir('branch1/dir1')
280
os.chdir('branch1/dir1')
281
output = self.run_bzr('diff -r 1..', retcode=1)
282
self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
193
print >> open('branch1/file1', 'wb'), 'new line'
194
output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
195
self.assertTrue('\n-original line\n+new line\n' in output[0])
284
197
def test_diff_across_rename(self):
285
198
"""The working tree path should always be considered for diffing"""
286
tree = self.make_example_branch()
287
self.run_bzr('diff -r 0..1 hello', retcode=1)
288
tree.rename_one('hello', 'hello1')
289
self.run_bzr('diff hello1', retcode=1)
290
self.run_bzr('diff -r 0..1 hello1', retcode=1)
292
def test_diff_to_branch_no_working_tree(self):
293
branch1_tree = self.example_branch2()
294
dir1 = branch1_tree.bzrdir
295
dir1.destroy_workingtree()
296
self.assertFalse(dir1.has_workingtree())
297
output = self.run_bzr('diff -r 1.. branch1', retcode=1)
298
self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
199
self.make_example_branch()
200
self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
201
wt = workingtree.WorkingTree.open_containing('.')[0]
202
wt.rename_one('hello', 'hello1')
203
self.run_bzr('diff', 'hello1', retcode=1)
204
self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
301
207
class TestCheckoutDiff(TestDiff):
303
209
def make_example_branch(self):
304
tree = super(TestCheckoutDiff, self).make_example_branch()
305
tree = tree.branch.create_checkout('checkout')
210
super(TestCheckoutDiff, self).make_example_branch()
211
self.runbzr('checkout . checkout')
306
212
os.chdir('checkout')
309
214
def example_branch2(self):
310
tree = super(TestCheckoutDiff, self).example_branch2()
215
super(TestCheckoutDiff, self).example_branch2()
311
216
os.mkdir('checkouts')
312
tree = tree.branch.create_checkout('checkouts/branch1')
217
self.runbzr('checkout branch1 checkouts/branch1')
313
218
os.chdir('checkouts')
316
220
def example_branches(self):
317
branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
221
super(TestCheckoutDiff, self).example_branches()
318
222
os.mkdir('checkouts')
319
branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
320
branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
223
self.runbzr('checkout branch1 checkouts/branch1')
224
self.runbzr('checkout branch2 checkouts/branch2')
321
225
os.chdir('checkouts')
322
return branch1_tree, branch2_tree
325
class TestDiffLabels(DiffBase):
228
class TestDiffLabels(TestDiff):
327
230
def test_diff_label_removed(self):
328
tree = super(TestDiffLabels, self).make_example_branch()
329
tree.remove('hello', keep_files=False)
330
diff = self.run_bzr('diff', retcode=1)
231
super(TestDiffLabels, self).make_example_branch()
232
self.runbzr('remove hello')
233
diff = self.run_bzr_captured(['diff'], retcode=1)
331
234
self.assertTrue("=== removed file 'hello'" in diff[0])
333
236
def test_diff_label_added(self):
334
tree = super(TestDiffLabels, self).make_example_branch()
335
self.build_tree_contents([('barbar', 'barbar')])
337
diff = self.run_bzr('diff', retcode=1)
237
super(TestDiffLabels, self).make_example_branch()
238
file('barbar', 'wt').write('barbar')
239
self.runbzr('add barbar')
240
diff = self.run_bzr_captured(['diff'], retcode=1)
338
241
self.assertTrue("=== added file 'barbar'" in diff[0])
340
243
def test_diff_label_modified(self):
341
244
super(TestDiffLabels, self).make_example_branch()
342
self.build_tree_contents([('hello', 'barbar')])
343
diff = self.run_bzr('diff', retcode=1)
245
file('hello', 'wt').write('barbar')
246
diff = self.run_bzr_captured(['diff'], retcode=1)
344
247
self.assertTrue("=== modified file 'hello'" in diff[0])
346
249
def test_diff_label_renamed(self):
347
tree = super(TestDiffLabels, self).make_example_branch()
348
tree.rename_one('hello', 'gruezi')
349
diff = self.run_bzr('diff', retcode=1)
250
super(TestDiffLabels, self).make_example_branch()
251
self.runbzr('rename hello gruezi')
252
diff = self.run_bzr_captured(['diff'], retcode=1)
350
253
self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
353
class TestExternalDiff(DiffBase):
355
def test_external_diff(self):
356
"""Test that we can spawn an external diff process"""
357
self.disable_missing_extensions_warning()
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
# this will be automatically restored by the base bzr test class
364
os.environ['BZR_PROGRESS_BAR'] = 'none'
365
out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
366
universal_newlines=True,
368
if 'Diff is not installed on this machine' in err:
369
raise tests.TestSkipped("No external 'diff' is available")
370
self.assertEqual('', err)
371
# We have to skip the stuff in the middle, because it depends
373
self.assertStartsWith(out, "=== added file 'goodbye'\n"
374
"--- goodbye\t1970-01-01 00:00:00 +0000\n"
376
self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
380
class TestDiffOutput(DiffBase):
382
def test_diff_output(self):
383
# check that output doesn't mangle line-endings
384
self.make_example_branch()
385
self.build_tree_contents([('hello', 'hello world!\n')])
386
output = self.run_bzr_subprocess('diff', retcode=1)[0]
387
self.assert_('\n+hello world!\n' in output)