1
# Copyright (C) 2005, 2006 by 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.
24
from bzrlib.branch import Branch
25
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')
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')
53
def test_diff_nonexistent(self):
54
# Get an error from a file that does not exist at all
56
self.make_example_branch()
57
out, err = self.runbzr('diff does-not-exist', retcode=3)
58
self.assertContainsRe(err, 'not versioned.*does-not-exist')
60
def test_diff_unversioned(self):
61
# Get an error when diffing a non-versioned file.
63
self.make_example_branch()
64
self.build_tree(['unversioned-file'])
65
out, err = self.runbzr('diff unversioned-file', retcode=3)
66
self.assertContainsRe(err, 'not versioned.*unversioned-file')
68
# TODO: What should diff say for a file deleted in working tree?
70
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'])
79
def test_diff_branches(self):
80
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"
99
"+contents of branch1/file\n"
102
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'])
112
def test_diff_to_working_tree(self):
113
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])
120
class TestCheckoutDiff(TestDiff):
122
def make_example_branch(self):
123
super(TestCheckoutDiff, self).make_example_branch()
124
self.runbzr('checkout . checkout')
127
def example_branch2(self):
128
super(TestCheckoutDiff, self).example_branch2()
129
os.mkdir('checkouts')
130
self.runbzr('checkout branch1 checkouts/branch1')
131
os.chdir('checkouts')
133
def example_branches(self):
134
super(TestCheckoutDiff, self).example_branches()
135
os.mkdir('checkouts')
136
self.runbzr('checkout branch1 checkouts/branch1')
137
self.runbzr('checkout branch2 checkouts/branch2')
138
os.chdir('checkouts')
141
class TestDiffLabels(TestDiff):
143
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])
149
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])
156
def test_diff_label_modified(self):
157
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])
162
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])
added
removed
bzrlib/tests/blackbox/test_diff.py
