/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 olive/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2006-10-01 01:56:17 UTC
  • mfrom: (0.8.98 merge)
  • Revision ID: jelmer@samba.org-20061001015617-9827cc403415cbf0
[merge] more changes from Szilveszter

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/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 sys
18
 
 
19
17
try:
20
18
    import pygtk
21
19
    pygtk.require("2.0")
22
20
except:
23
21
    pass
 
22
 
24
23
import gtk
25
24
import gtk.glade
26
25
import gobject
27
26
import pango
28
27
 
29
 
from bzrlib import version_info
30
 
 
31
28
import bzrlib.errors as errors
32
 
from bzrlib.workingtree import WorkingTree
33
29
 
34
30
from dialog import error_dialog
35
31
from olive import gladefile
74
70
        """ Display the Push dialog. """
75
71
        if self.notbranch:
76
72
            error_dialog(_('Directory is not a branch'),
77
 
                                     _('You can perform this action only in a branch.'))
 
73
                         _('You can perform this action only in a branch.'))
78
74
            self.close()
79
75
        else:
80
76
            if self.wt.branch.get_bound_location() is not None:
144
140
                           specific_files=specific_files)
145
141
        except errors.NotBranchError:
146
142
            error_dialog(_('Directory is not a branch'),
147
 
                                     _('You can perform this action only in a branch.'))
 
143
                         _('You can perform this action only in a branch.'))
148
144
            return
149
145
        except errors.LocalRequiresBoundBranch:
150
146
            error_dialog(_('Directory is not a checkout'),
151
 
                                     _('You can perform local commit only on checkouts.'))
 
147
                         _('You can perform local commit only on checkouts.'))
152
148
            return
153
149
        except errors.PointlessCommit:
154
150
            error_dialog(_('No changes to commit'),
155
 
                                     _('Try force commit if you want to commit anyway.'))
 
151
                         _('Try force commit if you want to commit anyway.'))
156
152
            return
157
153
        except errors.ConflictsInTree:
158
154
            error_dialog(_('Conflicts in tree'),
159
 
                                     _('You need to resolve the conflicts before committing.'))
 
155
                         _('You need to resolve the conflicts before committing.'))
160
156
            return
161
157
        except errors.StrictCommitFailed:
162
158
            error_dialog(_('Strict commit failed'),
163
 
                                     _('There are unknown files in the working tree.\nPlease add or delete them.'))
 
159
                         _('There are unknown files in the working tree.\nPlease add or delete them.'))
164
160
            return
165
161
        except errors.BoundBranchOutOfDate, errmsg:
166
162
            error_dialog(_('Bound branch is out of date'),
167
 
                                     _('%s') % errmsg)
 
163
                         _('%s') % errmsg)
168
164
            return
169
165
        except errors.BzrError, msg:
170
166
            error_dialog(_('Unknown bzr error'), str(msg))