/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-10-14 19:49:27 UTC
  • Revision ID: jelmer@samba.org-20081014194927-l8hyj1i4j3sxktte
Fix paths for patch handling command and icons.

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
 
17
20
try:
18
21
    import pygtk
19
22
    pygtk.require("2.0")
24
27
import gobject
25
28
import pango
26
29
 
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 dialog import error_dialog, question_dialog
36
 
from errors import show_bzr_error
 
35
from bzrlib.plugins.gtk.dialog import question_dialog
 
36
from bzrlib.plugins.gtk.errors import show_bzr_error
37
37
 
38
38
try:
39
39
    import dbus
101
101
    """Implementation of Commit."""
102
102
 
103
103
    def __init__(self, wt, selected=None, parent=None):
104
 
        gtk.Dialog.__init__(self, title="Commit - Olive",
 
104
        gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
105
105
                                  parent=parent,
106
106
                                  flags=0,
107
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
107
                                  buttons=(gtk.STOCK_CANCEL,
 
108
                                           gtk.RESPONSE_CANCEL))
108
109
        self._question_dialog = question_dialog
109
110
 
110
111
        self._wt = wt
653
654
        if message == '':
654
655
            response = self._question_dialog(
655
656
                _i18n('Commit with an empty message?'),
656
 
                _i18n('You can describe your commit intent in the message.'))
 
657
                _i18n('You can describe your commit intent in the message.'),
 
658
                parent=self)
657
659
            if response == gtk.RESPONSE_NO:
658
660
                # Kindly give focus to message area
659
661
                self._global_message_text_view.grab_focus()
673
675
        for path in self._wt.unknowns():
674
676
            response = self._question_dialog(
675
677
                _i18n("Commit with unknowns?"),
676
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
 
678
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
 
679
                parent=self)
 
680
                # Doesn't set a parent for the dialog..
677
681
            if response == gtk.RESPONSE_NO:
678
682
                return
679
683
            break
693
697
            response = self._question_dialog(
694
698
                _i18n('Commit with no changes?'),
695
699
                _i18n('There are no changes in the working tree.'
696
 
                      ' Do you want to commit anyway?'))
 
700
                      ' Do you want to commit anyway?'),
 
701
                parent=self)
697
702
            if response == gtk.RESPONSE_YES:
698
703
                rev_id = self._wt.commit(message,
699
704
                               allow_pointless=True,