1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
# Copyright (C) 2005 by Canonical Ltd
# -*- coding: utf-8 -*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Black-box tests for bzr diff.
"""
import os
import bzrlib
from bzrlib.branch import Branch
from bzrlib.tests.blackbox import ExternalBase
class TestDiff(ExternalBase):
def example_branch(test):
# FIXME: copied from test_too_much -- share elsewhere?
test.runbzr('init')
file('hello', 'wt').write('foo')
test.runbzr('add hello')
test.runbzr('commit -m setup hello')
file('goodbye', 'wt').write('baz')
test.runbzr('add goodbye')
test.runbzr('commit -m setup goodbye')
def test_diff(self):
self.example_branch()
file('hello', 'wt').write('hello world!')
self.runbzr('commit -m fixing hello')
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
self.assert_('\n+hello world!' in output)
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
self.assert_('\n+baz' in output)
file('moo', 'wb').write('moo')
self.runbzr('add moo')
os.unlink('moo')
self.runbzr('diff')
def example_branches(self):
self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
self.capture('init branch1')
self.capture('add branch1/file')
self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
self.capture('branch branch1 branch2')
print >> open('branch2/file', 'wb'), 'new content'
self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
def test_diff_branches(self):
self.example_branches()
# should open branch1 and diff against branch2,
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
'branch1'],
retcode=1)
self.assertEquals(("=== modified file 'a/file'\n"
"--- a/file\t\n"
"+++ b/file\t\n"
"@@ -1,1 +1,1 @@\n"
"-new content\n"
"+contents of branch1/file\n"
"\n", ''), output)
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
retcode=1)
self.assertEqualDiff(("=== modified file 'a/file'\n"
"--- a/file\t\n"
"+++ b/file\t\n"
"@@ -1,1 +1,1 @@\n"
"-new content\n"
"+contents of branch1/file\n"
"\n", ''), output)
def example_branch2(self):
self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
self.capture('init branch1')
self.capture('add branch1/file1')
print >> open('branch1/file1', 'wb'), 'original line'
self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
print >> open('branch1/file1', 'wb'), 'repo line'
self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
def test_diff_to_working_tree(self):
self.example_branch2()
print >> open('branch1/file1', 'wb'), 'new line'
output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
self.assertTrue('\n-original line\n+new line\n' in output[0])
class TestCheckoutDiff(TestDiff):
def example_branch(self):
super(TestCheckoutDiff, self).example_branch()
self.runbzr('checkout . checkout')
os.chdir('checkout')
def example_branch2(self):
super(TestCheckoutDiff, self).example_branch2()
os.mkdir('checkouts')
self.runbzr('checkout branch1 checkouts/branch1')
os.chdir('checkouts')
def example_branches(self):
super(TestCheckoutDiff, self).example_branches()
os.mkdir('checkouts')
self.runbzr('checkout branch1 checkouts/branch1')
self.runbzr('checkout branch2 checkouts/branch2')
os.chdir('checkouts')
class TestDiffLabels(TestDiff):
def test_diff_label_removed(self):
super(TestDiffLabels, self).example_branch()
self.runbzr('remove hello')
diff = self.run_bzr_captured(['diff'], retcode=1)
self.assertTrue("=== removed file 'a/hello'" in diff[0])
def test_diff_label_added(self):
super(TestDiffLabels, self).example_branch()
file('barbar', 'wt').write('barbar')
self.runbzr('add barbar')
diff = self.run_bzr_captured(['diff'], retcode=1)
self.assertTrue("=== added file 'b/barbar'" in diff[0])
def test_diff_label_modified(self):
super(TestDiffLabels, self).example_branch()
file('hello', 'wt').write('barbar')
diff = self.run_bzr_captured(['diff'], retcode=1)
self.assertTrue("=== modified file 'a/hello'" in diff[0])
def test_diff_label_renamed(self):
super(TestDiffLabels, self).example_branch()
self.runbzr('rename hello gruezi')
diff = self.run_bzr_captured(['diff'], retcode=1)
self.assertTrue("=== renamed file 'a/hello' => 'b/gruezi'" in diff[0])
|