/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_diff.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-11 23:45:20 UTC
  • mfrom: (2601 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070711234520-do3h7zw8skbathpz
[merge] bzr.dev 2601

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
53
53
    def test_diff(self):
54
54
        self.make_example_branch()
55
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)
 
56
        self.run_bzr('commit -m fixing hello')
 
57
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
58
58
        self.assert_('\n+hello world!' in output)
59
 
        output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
 
59
        output = self.run_bzr('diff -r last:3..last:1',
 
60
                retcode=1)[0]
60
61
        self.assert_('\n+baz' in output)
61
 
        file('moo', 'wb').write('moo')
62
 
        self.runbzr('add moo')
 
62
        self.build_tree(['moo'])
 
63
        self.run_bzr('add moo')
63
64
        os.unlink('moo')
64
 
        self.runbzr('diff')
 
65
        self.run_bzr('diff')
65
66
 
66
67
    def test_diff_prefix(self):
67
68
        """diff --prefix appends to filenames in output"""
68
69
        self.make_example_branch()
69
70
        file('hello', 'wb').write('hello world!\n')
70
 
        out, err = self.runbzr('diff --prefix old/:new/', retcode=1)
 
71
        out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
71
72
        self.assertEquals(err, '')
72
73
        self.assertEqualDiff(subst_dates(out), '''\
73
74
=== modified file 'hello'
81
82
 
82
83
    def test_diff_illegal_prefix_value(self):
83
84
        # There was an error in error reporting for this option
84
 
        out, err = self.runbzr('diff --prefix old/', retcode=3)
 
85
        out, err = self.run_bzr('diff --prefix old/', retcode=3)
85
86
        self.assertContainsRe(err,
86
87
            '--prefix expects two values separated by a colon')
87
88
 
89
90
        """diff -p1 produces lkml-style diffs"""
90
91
        self.make_example_branch()
91
92
        file('hello', 'wb').write('hello world!\n')
92
 
        out, err = self.runbzr('diff -p1', retcode=1)
 
93
        out, err = self.run_bzr('diff -p1', retcode=1)
93
94
        self.assertEquals(err, '')
94
95
        self.assertEqualDiff(subst_dates(out), '''\
95
96
=== modified file 'hello'
105
106
        """diff -p0 produces diffs with no prefix"""
106
107
        self.make_example_branch()
107
108
        file('hello', 'wb').write('hello world!\n')
108
 
        out, err = self.runbzr('diff -p0', retcode=1)
 
109
        out, err = self.run_bzr('diff -p0', retcode=1)
109
110
        self.assertEquals(err, '')
110
111
        self.assertEqualDiff(subst_dates(out), '''\
111
112
=== modified file 'hello'
121
122
        # Get an error from a file that does not exist at all
122
123
        # (Malone #3619)
123
124
        self.make_example_branch()
124
 
        out, err = self.runbzr('diff does-not-exist', retcode=3)
 
125
        out, err = self.run_bzr('diff does-not-exist', retcode=3)
125
126
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
126
127
 
127
128
    def test_diff_illegal_revision_specifiers(self):
128
 
        out, err = self.runbzr('diff -r 1..23..123', retcode=3)
 
129
        out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
129
130
        self.assertContainsRe(err, 'one or two revision specifiers')
130
131
 
131
132
    def test_diff_unversioned(self):
133
134
        # (Malone #3619)
134
135
        self.make_example_branch()
135
136
        self.build_tree(['unversioned-file'])
136
 
        out, err = self.runbzr('diff unversioned-file', retcode=3)
 
137
        out, err = self.run_bzr('diff unversioned-file', retcode=3)
137
138
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
138
139
 
139
140
    # TODO: What should diff say for a file deleted in working tree?
140
141
 
141
142
    def example_branches(self):
142
143
        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'])
 
144
        self.run_bzr('init branch1')[0]
 
145
        self.run_bzr('add branch1/file')[0]
 
146
        self.run_bzr(['commit', '-m', 'add file', 'branch1'])
 
147
        self.run_bzr('branch branch1 branch2')[0]
 
148
        self.build_tree_contents([('branch2/file', 'new content\n')])
 
149
        self.run_bzr(['commit', '-m', 'update file', 'branch2'])
149
150
 
150
151
    def test_diff_branches(self):
151
152
        self.example_branches()
152
153
        # should open branch1 and diff against branch2, 
153
 
        out, err = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 
154
 
                                          'branch1'],
155
 
                                         retcode=1)
 
154
        out, err = self.run_bzr('diff -r branch:branch2 branch1',
 
155
                                retcode=1)
156
156
        self.assertEquals('', err)
157
157
        self.assertEquals("=== modified file 'file'\n"
158
158
                          "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
161
161
                          "-new content\n"
162
162
                          "+contents of branch1/file\n"
163
163
                          "\n", subst_dates(out))
164
 
        out, err = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
 
164
        out, err = self.run_bzr('diff branch2 branch1',
165
165
                                         retcode=1)
166
166
        self.assertEquals('', err)
167
167
        self.assertEqualDiff("=== modified file 'file'\n"
175
175
    def test_diff_revno_branches(self):
176
176
        self.example_branches()
177
177
        print >> open('branch2/file', 'wb'), 'even newer content'
178
 
        self.run_bzr_captured(['commit', '-m', 
179
 
                               'update file once more', 'branch2'])
 
178
        self.run_bzr(['commit', '-m',
 
179
                      'update file once more', 'branch2'])
180
180
 
181
 
        out, err = self.run_bzr_captured(['diff', '-r',
182
 
                                          'revno:1:branch2..revno:1:branch1'],
183
 
                                         retcode=0)
 
181
        out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
 
182
                                )
184
183
        self.assertEquals('', err)
185
184
        self.assertEquals('', out)
186
 
        out, err = self.run_bzr_captured(['diff', '-r', 
187
 
                                          'revno:2:branch2..revno:1:branch1'],
188
 
                                         retcode=1)
 
185
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
 
186
                                retcode=1)
189
187
        self.assertEquals('', err)
190
188
        self.assertEqualDiff("=== modified file 'file'\n"
191
189
                              "--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
197
195
 
198
196
    def example_branch2(self):
199
197
        self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
200
 
        self.capture('init branch1')
201
 
        self.capture('add branch1/file1')
 
198
        self.run_bzr('init branch1')[0]
 
199
        self.run_bzr('add branch1/file1')[0]
202
200
        print >> open('branch1/file1', 'wb'), 'original line'
203
 
        self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
 
201
        self.run_bzr(['commit', '-m', 'first commit', 'branch1'])
204
202
        
205
203
        print >> open('branch1/file1', 'wb'), 'repo line'
206
 
        self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
 
204
        self.run_bzr(['commit', '-m', 'second commit', 'branch1'])
207
205
 
208
206
    def test_diff_to_working_tree(self):
209
207
        self.example_branch2()
210
208
        
211
209
        print >> open('branch1/file1', 'wb'), 'new line'
212
 
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'],
213
 
                                       retcode=1)
 
210
        output = self.run_bzr('diff -r 1.. branch1',
 
211
                              retcode=1)
214
212
        self.assertTrue('\n-original line\n+new line\n' in output[0])
215
213
 
216
214
    def test_diff_across_rename(self):
217
215
        """The working tree path should always be considered for diffing"""
218
216
        self.make_example_branch()
219
 
        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
 
217
        self.run_bzr('diff -r 0..1 hello', retcode=1)
220
218
        wt = workingtree.WorkingTree.open_containing('.')[0]
221
219
        wt.rename_one('hello', 'hello1')
222
 
        self.run_bzr('diff', 'hello1', retcode=1)
223
 
        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
 
220
        self.run_bzr('diff hello1', retcode=1)
 
221
        self.run_bzr('diff -r 0..1 hello1', retcode=1)
224
222
 
225
223
 
226
224
class TestCheckoutDiff(TestDiff):
227
225
 
228
226
    def make_example_branch(self):
229
227
        super(TestCheckoutDiff, self).make_example_branch()
230
 
        self.runbzr('checkout . checkout')
 
228
        self.run_bzr('checkout . checkout')
231
229
        os.chdir('checkout')
232
230
 
233
231
    def example_branch2(self):
234
232
        super(TestCheckoutDiff, self).example_branch2()
235
233
        os.mkdir('checkouts')
236
 
        self.runbzr('checkout branch1 checkouts/branch1')
 
234
        self.run_bzr('checkout branch1 checkouts/branch1')
237
235
        os.chdir('checkouts')
238
236
 
239
237
    def example_branches(self):
240
238
        super(TestCheckoutDiff, self).example_branches()
241
239
        os.mkdir('checkouts')
242
 
        self.runbzr('checkout branch1 checkouts/branch1')
243
 
        self.runbzr('checkout branch2 checkouts/branch2')
 
240
        self.run_bzr('checkout branch1 checkouts/branch1')
 
241
        self.run_bzr('checkout branch2 checkouts/branch2')
244
242
        os.chdir('checkouts')
245
243
 
246
244
 
248
246
 
249
247
    def test_diff_label_removed(self):
250
248
        super(TestDiffLabels, self).make_example_branch()
251
 
        self.runbzr('remove hello')
252
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
249
        self.run_bzr('remove hello')
 
250
        diff = self.run_bzr('diff', retcode=1)
253
251
        self.assertTrue("=== removed file 'hello'" in diff[0])
254
252
 
255
253
    def test_diff_label_added(self):
256
254
        super(TestDiffLabels, self).make_example_branch()
257
255
        file('barbar', 'wt').write('barbar')
258
 
        self.runbzr('add barbar')
259
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
256
        self.run_bzr('add barbar')
 
257
        diff = self.run_bzr('diff', retcode=1)
260
258
        self.assertTrue("=== added file 'barbar'" in diff[0])
261
259
 
262
260
    def test_diff_label_modified(self):
263
261
        super(TestDiffLabels, self).make_example_branch()
264
262
        file('hello', 'wt').write('barbar')
265
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
263
        diff = self.run_bzr('diff', retcode=1)
266
264
        self.assertTrue("=== modified file 'hello'" in diff[0])
267
265
 
268
266
    def test_diff_label_renamed(self):
269
267
        super(TestDiffLabels, self).make_example_branch()
270
 
        self.runbzr('rename hello gruezi')
271
 
        diff = self.run_bzr_captured(['diff'], retcode=1)
 
268
        self.run_bzr('rename hello gruezi')
 
269
        diff = self.run_bzr('diff', retcode=1)
272
270
        self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
273
271
 
274
272