/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: Jelmer Vernooij
  • Date: 2008-06-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

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
650
651
        message = self._get_global_commit_message()
651
652
 
652
653
        if message == '':
653
 
            response = question_dialog(
 
654
            response = self._question_dialog(
654
655
                _i18n('Commit with an empty message?'),
655
 
                _i18n('You can describe your commit intent in the message.'),
656
 
                parent=self)
 
656
                _i18n('You can describe your commit intent in the message.'))
657
657
            if response == gtk.RESPONSE_NO:
658
658
                # Kindly give focus to message area
659
659
                self._global_message_text_view.grab_focus()
671
671
        #       entirely, since there isn't a way for them to add the unknown
672
672
        #       files at this point.
673
673
        for path in self._wt.unknowns():
674
 
            response = question_dialog(
 
674
            response = self._question_dialog(
675
675
                _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..
 
676
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
679
677
            if response == gtk.RESPONSE_NO:
680
678
                return
681
679
            break
692
690
                       specific_files=specific_files,
693
691
                       revprops=revprops)
694
692
        except errors.PointlessCommit:
695
 
            response = question_dialog(
 
693
            response = self._question_dialog(
696
694
                _i18n('Commit with no changes?'),
697
695
                _i18n('There are no changes in the working tree.'
698
 
                      ' Do you want to commit anyway?'),
699
 
                parent=self)
 
696
                      ' Do you want to commit anyway?'))
700
697
            if response == gtk.RESPONSE_YES:
701
698
                rev_id = self._wt.commit(message,
702
699
                               allow_pointless=True,