/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
126.1.24 by Szilveszter Farkas (Phanatic)
Implemented Conflicts dialog. Added gconflicts command.
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
try:
18
    import pygtk
19
    pygtk.require("2.0")
20
except:
21
    pass
22
242.1.1 by Adeodato Simó
Use subprocess.Popen() instead of os.system().
23
import subprocess
126.1.24 by Szilveszter Farkas (Phanatic)
Implemented Conflicts dialog. Added gconflicts command.
24
25
import gtk
26
import gobject
27
28
from bzrlib.config import GlobalConfig
29
30
from dialog import error_dialog, warning_dialog
31
from errors import show_bzr_error
32
33
class ConflictsDialog(gtk.Dialog):
34
    """ This dialog displays the list of conflicts. """
35
    def __init__(self, wt, parent=None):
36
        """ Initialize the Conflicts dialog. """
37
        gtk.Dialog.__init__(self, title="Conflicts - Olive",
38
                                  parent=parent,
39
                                  flags=0,
40
                                  buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CANCEL))
41
        
42
        # Get arguments
43
        self.wt = wt
44
        
45
        # Create the widgets
46
        self._scrolledwindow = gtk.ScrolledWindow()
47
        self._treeview = gtk.TreeView()
48
        self._label_diff3 = gtk.Label(_("External utility:"))
49
        self._entry_diff3 = gtk.Entry()
50
        self._image_diff3 = gtk.Image()
51
        self._button_diff3 = gtk.Button()
52
        self._hbox_diff3 = gtk.HBox()
53
        
54
        # Set callbacks
55
        self._button_diff3.connect('clicked', self._on_diff3_clicked)
56
        
57
        # Set properties
58
        self._scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC,
59
                                        gtk.POLICY_AUTOMATIC)
60
        self._image_diff3.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
61
        self._button_diff3.set_image(self._image_diff3)
62
        self._entry_diff3.set_text(self._get_diff3())
63
        self._hbox_diff3.set_spacing(3)
64
        self.vbox.set_spacing(3)
65
        self.set_default_size(400, 300)
66
        
67
        # Construct dialog
68
        self._hbox_diff3.pack_start(self._label_diff3, False, False)
69
        self._hbox_diff3.pack_start(self._entry_diff3, True, True)
70
        self._hbox_diff3.pack_start(self._button_diff3, False, False)
71
        self._scrolledwindow.add(self._treeview)
72
        self.vbox.pack_start(self._scrolledwindow, True, True)
73
        self.vbox.pack_start(self._hbox_diff3, False, False)
74
        
75
        # Create the conflict list
76
        self._create_conflicts()
77
        
78
        # Show the dialog
79
        self.vbox.show_all()
80
    
81
    def _get_diff3(self):
82
        """ Get the specified diff3 utility. Default is meld. """
83
        config = GlobalConfig()
84
        diff3 = config.get_user_option('gconflicts_diff3')
85
        if diff3 is None:
86
            diff3 = 'meld'
87
        return diff3
88
    
89
    def _set_diff3(self, cmd):
90
        """ Set the default diff3 utility to cmd. """
91
        config = GlobalConfig()
92
        config.set_user_option('gconflicts_diff3', cmd)
93
    
94
    def _create_conflicts(self):
95
        """ Construct the list of conflicts. """
96
        if len(self.wt.conflicts()) == 0:
97
            self.model = gtk.ListStore(gobject.TYPE_STRING)
98
            self._treeview.set_model(self.model)
99
            self._treeview.append_column(gtk.TreeViewColumn(_('Conflicts'),
100
                                         gtk.CellRendererText(), text=0))
101
            self._treeview.set_headers_visible(False)            
102
            self.model.append([ _("No conflicts in working tree.") ])
442.1.1 by Szilveszter Farkas (Phanatic)
Fixed bug #131471 (don't allow pressing the button if there are no conflicts).
103
            self._button_diff3.set_sensitive(False)
126.1.24 by Szilveszter Farkas (Phanatic)
Implemented Conflicts dialog. Added gconflicts command.
104
        else:
105
            self.model = gtk.ListStore(gobject.TYPE_STRING,
106
                                       gobject.TYPE_STRING,
107
                                       gobject.TYPE_STRING)
108
            self._treeview.set_model(self.model)
109
            self._treeview.append_column(gtk.TreeViewColumn(_('Path'),
110
                                         gtk.CellRendererText(), text=0))
111
            self._treeview.append_column(gtk.TreeViewColumn(_('Type'),
112
                                         gtk.CellRendererText(), text=1))
113
            self._treeview.set_search_column(0)
114
            for conflict in self.wt.conflicts():
115
                if conflict.typestring == 'path conflict':
116
                    t = _("path conflict")
117
                elif conflict.typestring == 'contents conflict':
118
                    t = _("contents conflict")
119
                elif conflict.typestring == 'text conflict':
120
                    t = _("text conflict")
121
                elif conflict.typestring == 'duplicate id':
122
                    t = _("duplicate id")
123
                elif conflict.typestring == 'duplicate':
124
                    t = _("duplicate")
125
                elif conflict.typestring == 'parent loop':
126
                    t = _("parent loop")
127
                elif conflict.typestring == 'unversioned parent':
128
                    t = _("unversioned parent")
129
                elif conflict.typestring == 'missing parent':
130
                    t = _("missing parent")
131
                elif conflict.typestring == 'deleting parent':
132
                    t = _("deleting parent")
133
                else:
134
                    t = _("unknown type of conflict")
135
                
136
                self.model.append([ conflict.path, t, conflict.typestring ]) 
137
    
138
    def _get_selected_file(self):
139
        """ Return the selected conflict's filename. """
140
        treeselection = self._treeview.get_selection()
141
        (model, iter) = treeselection.get_selected()
142
        
143
        if iter is None:
144
            return None
145
        else:
146
            return model.get_value(iter, 0)
147
    
148
    def _get_selected_type(self):
149
        """ Return the type of the selected conflict. """
150
        treeselection = self._treeview.get_selection()
151
        (model, iter) = treeselection.get_selected()
152
        
153
        if iter is None:
154
            return None
155
        else:
156
            return model.get_value(iter, 2)
157
    
158
    def _on_diff3_clicked(self, widget):
159
        """ Launch external utility to resolve conflicts. """
160
        self._set_diff3(self._entry_diff3.get_text())
161
        selected = self._get_selected_file()
162
        if selected is None:
163
            error_dialog(_('No file was selected'),
164
                         _('Please select a file from the list.'))
165
            return
166
        elif self._get_selected_type() == 'text conflict':
167
            base = self.wt.abspath(selected) + '.BASE'
168
            this = self.wt.abspath(selected) + '.THIS'
169
            other = self.wt.abspath(selected) + '.OTHER'
242.1.1 by Adeodato Simó
Use subprocess.Popen() instead of os.system().
170
            try:
171
                p = subprocess.Popen([ self._entry_diff3.get_text(), base, this, other ])
172
                p.wait()
173
            except OSError, e:
174
                warning_dialog(_('Call to external utility failed'), str(e))
126.1.24 by Szilveszter Farkas (Phanatic)
Implemented Conflicts dialog. Added gconflicts command.
175
        else:
176
            warning_dialog(_('Cannot resolve conflict'),
177
                           _('Only conflicts on the text of files can be resolved with Olive at the moment. Content conflicts, on the structure of the tree, need to be resolved using the command line.'))
178
            return