/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
81
81
        rev_id1 = tree.commit('one')
82
82
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
83
83
        rev_id2 = tree2.commit('two')
 
84
        rev_id3 = tree2.commit('three')
84
85
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
85
 
        rev_id3 = tree2.commit('three')
86
86
        rev_id4 = tree3.commit('four')
87
87
        rev_id5 = tree3.commit('five')
88
88
        tree.merge_from_branch(tree2.branch)
411
411
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
412
412
                                    diff_buffer.get_end_iter()).splitlines(True)
413
413
 
414
 
        self.assertEqual("=== modified file 'a'\n", text[0])
 
414
        self.assertEqual("=== removed file 'b'\n", text[0])
415
415
        self.assertContainsRe(text[1],
 
416
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
417
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])
 
418
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])
 
419
        self.assertEqual('-contents of tree/b\n', text[4])
 
420
        self.assertEqual('\n', text[5])
 
421
 
 
422
        self.assertEqual("=== modified file 'a'\n", text[6])
 
423
        self.assertContainsRe(text[7],
416
424
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
417
 
        self.assertContainsRe(text[2],
418
 
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
419
 
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])
420
 
        self.assertEqual('-contents of tree/a\n', text[4])
421
 
        self.assertEqual('+new contents for a\n', text[5])
422
 
        self.assertEqual('\n', text[6])
423
 
 
424
 
        self.assertEqual("=== removed file 'b'\n", text[7])
425
425
        self.assertContainsRe(text[8],
426
 
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
427
 
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])
428
 
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])
429
 
        self.assertEqual('-contents of tree/b\n', text[11])
 
426
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
427
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])
 
428
        self.assertEqual('-contents of tree/a\n', text[10])
 
429
        self.assertEqual('+new contents for a\n', text[11])
430
430
        self.assertEqual('\n', text[12])
431
431
 
432
432
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
985
985
                         ], bencode.bdecode(file_info))
986
986
 
987
987
    def test_commit_unicode_messages(self):
988
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
988
        from bzrlib.tests.test_diff import UnicodeFilename
 
989
        self.requireFeature(UnicodeFilename)
989
990
 
990
991
        tree = self.make_branch_and_tree('tree')
991
992
        tree.branch.get_config().set_user_option('per_file_commits', 'true')