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

  • Committer: Curtis Hovey
  • Date: 2011-09-03 22:00:09 UTC
  • mto: This revision was merged to the branch mainline in revision 738.
  • Revision ID: sinzui.is@verizon.net-20110903220009-rvrgi2q1npy27jsw
Added basic tests to verify __eq__ is fixed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os.path
18
17
import re
19
18
 
20
19
try:
28
27
import pango
29
28
 
30
29
from bzrlib import (
31
 
    branch,
32
30
    errors,
33
31
    osutils,
34
32
    trace,
38
36
except ImportError:
39
37
    from bzrlib.util import bencode
40
38
 
41
 
from bzrlib.plugins.gtk import _i18n
42
39
from bzrlib.plugins.gtk.dialog import question_dialog
43
40
from bzrlib.plugins.gtk.errors import show_bzr_error
 
41
from bzrlib.plugins.gtk.i18n import _i18n
44
42
 
45
43
try:
46
44
    import dbus
514
512
                                             gtk.CellRendererText(), text=3))
515
513
 
516
514
    def _construct_diff_view(self):
517
 
        from diff import DiffView
 
515
        from bzrlib.plugins.gtk.diff import DiffView
518
516
 
519
517
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
520
518
        #       decide that we really don't ever want to display it, we should
812
810
            self.global_message = u''
813
811
            self.file_messages = {}
814
812
        else:
815
 
            config = branch.get_config()._get_branch_data_config()
 
813
            config = branch.get_config()
816
814
            self.global_message = config.get_user_option(
817
815
                'gtk_global_commit_message')
818
816
            if self.global_message is None: