/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: Aaron Bentley
  • Date: 2008-05-22 02:33:40 UTC
  • mfrom: (487.2.8 save-patch)
  • Revision ID: aaron@aaronbentley.com-20080522023340-3x585s8593j6a409
Allow saving from patch window, refactoring, testing.

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
 
import re
19
 
 
20
17
try:
21
18
    import pygtk
22
19
    pygtk.require("2.0")
27
24
import gobject
28
25
import pango
29
26
 
 
27
import os.path
 
28
import re
 
29
 
30
30
from bzrlib import errors, osutils
31
31
from bzrlib.trace import mutter
32
32
from bzrlib.util import bencode
33
33
 
34
34
from bzrlib.plugins.gtk import _i18n
35
 
from bzrlib.plugins.gtk.dialog import question_dialog
36
 
from bzrlib.plugins.gtk.errors import show_bzr_error
 
35
from dialog import error_dialog, question_dialog
 
36
from errors import show_bzr_error
37
37
 
38
38
try:
39
39
    import dbus
105
105
                                  parent=parent,
106
106
                                  flags=0,
107
107
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
108
        self._question_dialog = question_dialog
108
109
 
109
110
        self._wt = wt
110
111
        # TODO: Do something with this value, it is used by Olive
302
303
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
303
304
        self.add_accel_group(group)
304
305
 
305
 
        # ignore the escape key (avoid closing the window)
306
 
        self.connect_object('close', self.emit_stop_by_name, 'close')
307
 
 
308
306
    def _construct_left_pane(self):
309
307
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
310
308
        self._construct_file_list()
650
648
        message = self._get_global_commit_message()
651
649
 
652
650
        if message == '':
653
 
            response = question_dialog(
 
651
            response = self._question_dialog(
654
652
                _i18n('Commit with an empty message?'),
655
 
                _i18n('You can describe your commit intent in the message.'),
656
 
                parent=self)
 
653
                _i18n('You can describe your commit intent in the message.'))
657
654
            if response == gtk.RESPONSE_NO:
658
655
                # Kindly give focus to message area
659
656
                self._global_message_text_view.grab_focus()
671
668
        #       entirely, since there isn't a way for them to add the unknown
672
669
        #       files at this point.
673
670
        for path in self._wt.unknowns():
674
 
            response = question_dialog(
 
671
            response = self._question_dialog(
675
672
                _i18n("Commit with unknowns?"),
676
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
677
 
                parent=self)
678
 
                # Doesn't set a parent for the dialog..
 
673
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
679
674
            if response == gtk.RESPONSE_NO:
680
675
                return
681
676
            break
692
687
                       specific_files=specific_files,
693
688
                       revprops=revprops)
694
689
        except errors.PointlessCommit:
695
 
            response = question_dialog(
 
690
            response = self._question_dialog(
696
691
                _i18n('Commit with no changes?'),
697
692
                _i18n('There are no changes in the working tree.'
698
 
                      ' Do you want to commit anyway?'),
699
 
                parent=self)
 
693
                      ' Do you want to commit anyway?'))
700
694
            if response == gtk.RESPONSE_YES:
701
695
                rev_id = self._wt.commit(message,
702
696
                               allow_pointless=True,