/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: Martin Pool
  • Date: 2010-05-27 03:07:30 UTC
  • mfrom: (688.1.5 201956-help)
  • Revision ID: mbp@canonical.com-20100527030730-os0opv1xroetccm9
https://launchpad.net/bugs/201965
Make find/goto more discoverable

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
17
18
import re
18
19
 
19
20
try:
27
28
import pango
28
29
 
29
30
from bzrlib import (
 
31
    branch,
30
32
    errors,
31
33
    osutils,
32
34
    trace,
36
38
except ImportError:
37
39
    from bzrlib.util import bencode
38
40
 
 
41
from bzrlib.plugins.gtk import _i18n
39
42
from bzrlib.plugins.gtk.dialog import question_dialog
40
43
from bzrlib.plugins.gtk.errors import show_bzr_error
41
 
from bzrlib.plugins.gtk.i18n import _i18n
42
44
 
43
45
try:
44
46
    import dbus
512
514
                                             gtk.CellRendererText(), text=3))
513
515
 
514
516
    def _construct_diff_view(self):
515
 
        from bzrlib.plugins.gtk.diff import DiffView
 
517
        from diff import DiffView
516
518
 
517
519
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
518
520
        #       decide that we really don't ever want to display it, we should
810
812
            self.global_message = u''
811
813
            self.file_messages = {}
812
814
        else:
813
 
            config = branch.get_config()
 
815
            config = branch.get_config()._get_branch_data_config()
814
816
            self.global_message = config.get_user_option(
815
817
                'gtk_global_commit_message')
816
818
            if self.global_message is None: