/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/test_diff.py

merge trunk and resolve conflicts to cleanup submission

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1299
1299
    def test_from_string(self):
1300
1300
        diff_obj = DiffFromTool.from_string('diff', None, None, None)
1301
1301
        self.addCleanup(diff_obj.finish)
1302
 
        self.assertEqual(['diff', '%(old_path)s', '%(new_path)s'],
 
1302
        self.assertEqual(['diff', '@old_path', '@new_path'],
1303
1303
            diff_obj.command_template)
1304
1304
 
1305
1305
    def test_from_string_u5(self):
1306
1306
        diff_obj = DiffFromTool.from_string('diff -u\\ 5', None, None, None)
1307
1307
        self.addCleanup(diff_obj.finish)
1308
 
        self.assertEqual(['diff', '-u 5', '%(old_path)s', '%(new_path)s'],
 
1308
        self.assertEqual(['diff', '-u 5', '@old_path', '@new_path'],
1309
1309
                         diff_obj.command_template)
1310
1310
        self.assertEqual(['diff', '-u 5', 'old-path', 'new-path'],
1311
1311
                         diff_obj._get_command('old-path', 'new-path'))
1313
1313
    def test_execute(self):
1314
1314
        output = StringIO()
1315
1315
        diff_obj = DiffFromTool(['python', '-c',
1316
 
                                 'print "%(old_path)s %(new_path)s"'],
 
1316
                                 'print "@old_path @new_path"'],
1317
1317
                                None, None, output)
1318
1318
        self.addCleanup(diff_obj.finish)
1319
1319
        diff_obj._execute('old', 'new')
1338
1338
        tree.lock_read()
1339
1339
        self.addCleanup(tree.unlock)
1340
1340
        diff_obj = DiffFromTool(['python', '-c',
1341
 
                                 'print "%(old_path)s %(new_path)s"'],
 
1341
                                 'print "@old_path @new_path"'],
1342
1342
                                tree, tree, output)
1343
1343
        diff_obj._prepare_files('file-id', 'file', 'file')
1344
1344
        self.assertReadableByAttrib(diff_obj._root, 'old\\file', r'old\\file')
1370
1370
        tree.lock_read()
1371
1371
        self.addCleanup(tree.unlock)
1372
1372
        diff_obj = DiffFromTool(['python', '-c',
1373
 
                                 'print "%(old_path)s %(new_path)s"'],
 
1373
                                 'print "@old_path @new_path"'],
1374
1374
                                old_tree, tree, output)
1375
1375
        self.addCleanup(diff_obj.finish)
1376
1376
        self.assertContainsRe(diff_obj._root, 'bzr-diff-[^/]*')