/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 12:43:48 UTC
  • mto: (126.1.38 bzr-gtk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315124348-0nx0zb7fv4pa8xk6
Fix the indentation error in the TortoiseBZR test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
26
26
 
27
27
import os.path
28
28
 
29
 
from bzrlib import errors, osutils
30
 
from bzrlib.trace import mutter
 
29
import bzrlib.errors as errors
 
30
from bzrlib import osutils
31
31
 
32
32
from dialog import error_dialog, question_dialog
33
33
from errors import show_bzr_error
35
35
try:
36
36
    import dbus
37
37
    import dbus.glib
38
 
    have_dbus = True
 
38
    bus = dbus.SystemBus()
 
39
    proxy_obj = bus.get_object('org.freedesktop.NetworkManager', 
 
40
                              '/org/freedesktop/NetworkManager')
 
41
    dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.NetworkManager')
 
42
    have_nm = True
39
43
except ImportError:
40
 
    have_dbus = False
 
44
    have_nm = False
41
45
 
42
46
class CommitDialog(gtk.Dialog):
43
47
    """ New implementation of the Commit dialog. """
86
90
        
87
91
        # Create the widgets
88
92
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
 
93
        self._check_strict = gtk.CheckButton(_("_Allow unknown files"),
 
94
                                             use_underline=True)
89
95
        self._expander_files = gtk.Expander(_("File(s) to commit"))
90
96
        self._vpaned_main = gtk.VPaned()
91
97
        self._scrolledwindow_files = gtk.ScrolledWindow()
100
106
            self._vpaned_list = gtk.VPaned()
101
107
            self._scrolledwindow_merges = gtk.ScrolledWindow()
102
108
            self._treeview_merges = gtk.TreeView()
103
 
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
104
 
                                                   gtk.POLICY_AUTOMATIC)
105
109
 
106
110
        # Set callbacks
107
111
        self._button_commit.connect('clicked', self._on_commit_clicked)
117
121
        self._vpaned_main.set_position(200)
118
122
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
119
123
 
 
124
        if self._is_pending:
 
125
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
 
126
                                                   gtk.POLICY_AUTOMATIC)
 
127
            self._treeview_files.set_sensitive(False)
 
128
        
120
129
        # Construct the dialog
121
130
        self.action_area.pack_end(self._button_commit)
122
131
        
144
153
            self._check_local = gtk.CheckButton(_("_Only commit locally"),
145
154
                                                use_underline=True)
146
155
            self.vbox.pack_start(self._check_local, False, False)
147
 
            if have_dbus:
148
 
                bus = dbus.SystemBus()
149
 
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager', 
150
 
                              '/org/freedesktop/NetworkManager')
151
 
                dbus_iface = dbus.Interface(
152
 
                        proxy_obj, 'org.freedesktop.NetworkManager')
153
 
                try:
154
 
                    # 3 is the enum value for STATE_CONNECTED
155
 
                    self._check_local.set_active(dbus_iface.state() != 3)
156
 
                except dbus.DBusException, e:
157
 
                    # Silently drop errors. While DBus may be 
158
 
                    # available, NetworkManager doesn't necessarily have to be
159
 
                    mutter("unable to get networkmanager state: %r" % e)
160
 
                
 
156
            if have_nm:
 
157
                # 3 is the enum value for STATE_CONNECTED
 
158
                self._check_local.set_active(dbus_iface.state() != 3)
 
159
        self.vbox.pack_start(self._check_strict, False, False)
 
160
        
161
161
        # Create the file list
162
162
        self._create_file_view()
163
163
        # Create the pending merges
220
220
            local = self._check_local.get_active()
221
221
        else:
222
222
            local = False
223
 
 
224
 
        if list(self.wt.unknowns()) != []:
225
 
            response = question_dialog(_("Commit with unknowns?"),
226
 
               _("Unknown files exist in the working tree. Commit anyway?"))
227
 
            if response == gtk.RESPONSE_NO:
228
 
                return
229
223
        
230
224
        try:
231
225
            self.wt.commit(message,
232
226
                       allow_pointless=False,
233
 
                       strict=False,
 
227
                       strict=self._check_strict.get_active(),
234
228
                       local=local,
235
229
                       specific_files=specific_files)
236
230
        except errors.PointlessCommit:
239
233
            if response == gtk.RESPONSE_YES:
240
234
                self.wt.commit(message,
241
235
                               allow_pointless=True,
242
 
                               strict=False,
 
236
                               strict=self._check_strict.get_active(),
243
237
                               local=local,
244
238
                               specific_files=specific_files)
245
239
        self.response(gtk.RESPONSE_OK)
317
311
        crt = gtk.CellRendererToggle()
318
312
        crt.set_property("activatable", True)
319
313
        crt.connect("toggled", self._toggle_commit, self._file_store)
320
 
        commit_column = gtk.TreeViewColumn(_('Commit'), crt, active=0)
321
 
        if self._is_pending:
322
 
            commit_column.set_visible(False)
323
 
        self._treeview_files.append_column(commit_column)
 
314
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
 
315
                                     crt, active=0))
324
316
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
325
317
                                     gtk.CellRendererText(), text=1))
326
318
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),