bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
1 |
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
2 |
#
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
7 |
#
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
12 |
#
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
try: |
|
18 |
import pygtk |
|
19 |
pygtk.require("2.0") |
|
20 |
except: |
|
21 |
pass
|
|
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
22 |
|
0.13.11
by Jelmer Vernooij
Bunch of small fixes, cleanups and simplifications. |
23 |
import gtk |
24 |
import gtk.glade |
|
25 |
import gobject |
|
26 |
import pango |
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
27 |
|
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
28 |
import bzrlib.errors as errors |
93.1.10
by Alexander Belchenko
- Show file kind marker with path (i.e. directory path ends with '/') |
29 |
from bzrlib import osutils |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
30 |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
31 |
from dialog import error_dialog |
93.1.12
by Alexander Belchenko
Names XML files with GUI resources obtained via olive/guifiles.py |
32 |
from guifiles import GLADEFILENAME |
93.1.6
by Alexander Belchenko
detecting name of glade file doing in separate module (olive.gladefile) |
33 |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
34 |
|
89
by Jelmer Vernooij
Rename OliveBranch -> BranchDialog. |
35 |
class CommitDialog: |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
36 |
""" Display Commit dialog and perform the needed actions. """ |
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
37 |
def __init__(self, wt, wtpath, notbranch): |
93.1.7
by Alexander Belchenko
Fix gcommit bug 66937 (bzr still running after cancel/commit clicked) |
38 |
""" Initialize the Commit dialog. |
91.1.9
by Jelmer Vernooij
Use epydoc style (for consistency with Bazaar). |
39 |
:param wt: bzr working tree object
|
40 |
:param wtpath: path to working tree root
|
|
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
41 |
:param notbranch: flag that path is not a brach
|
42 |
:type notbranch: bool
|
|
93.1.7
by Alexander Belchenko
Fix gcommit bug 66937 (bzr still running after cancel/commit clicked) |
43 |
"""
|
93.1.6
by Alexander Belchenko
detecting name of glade file doing in separate module (olive.gladefile) |
44 |
self.glade = gtk.glade.XML(GLADEFILENAME, 'window_commit', 'olive-gtk') |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
45 |
|
0.13.1
by Jelmer Vernooij
Remove communicator use from Commit. |
46 |
self.wt = wt |
47 |
self.wtpath = wtpath |
|
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
48 |
self.notbranch = notbranch |
93.1.7
by Alexander Belchenko
Fix gcommit bug 66937 (bzr still running after cancel/commit clicked) |
49 |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
50 |
# Get some important widgets
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
51 |
self.window = self.glade.get_widget('window_commit') |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
52 |
self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local') |
53 |
self.textview = self.glade.get_widget('textview_commit') |
|
54 |
self.file_view = self.glade.get_widget('treeview_commit_select') |
|
95
by Szilveszter Farkas (Phanatic)
Added pending merges to Commit dialog. Fixed bug #66091. |
55 |
self.pending_label = self.glade.get_widget('label_commit_pending') |
56 |
self.pending_view = self.glade.get_widget('treeview_commit_pending') |
|
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
57 |
|
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
58 |
if wt is None or notbranch: |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
59 |
return
|
60 |
||
61 |
# Set the delta
|
|
62 |
self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision()) |
|
0.13.6
by Jelmer Vernooij
Don't pass along dialog context everywhere. |
63 |
self.delta = self.wt.changes_from(self.old_tree) |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
64 |
|
95
by Szilveszter Farkas (Phanatic)
Added pending merges to Commit dialog. Fixed bug #66091. |
65 |
# Get pending merges
|
66 |
self.pending = self._pending_merges(self.wt) |
|
67 |
||
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
68 |
# Dictionary for signal_autoconnect
|
69 |
dic = { "on_button_commit_commit_clicked": self.commit, |
|
70 |
"on_button_commit_cancel_clicked": self.close } |
|
93.1.7
by Alexander Belchenko
Fix gcommit bug 66937 (bzr still running after cancel/commit clicked) |
71 |
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
72 |
# Connect the signals to the handlers
|
73 |
self.glade.signal_autoconnect(dic) |
|
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
74 |
|
75 |
# Create the file list
|
|
76 |
self._create_file_view() |
|
95
by Szilveszter Farkas (Phanatic)
Added pending merges to Commit dialog. Fixed bug #66091. |
77 |
# Create the pending merges
|
78 |
self._create_pending_merges() |
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
79 |
|
80 |
def display(self): |
|
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
81 |
""" Display the Push dialog. |
82 |
@return: True if dialog is shown.
|
|
83 |
"""
|
|
84 |
if self.wt is None and not self.notbranch: |
|
85 |
error_dialog(_('Directory does not have a working tree'), |
|
86 |
_('Operation aborted.')) |
|
87 |
self.close() |
|
88 |
return False |
|
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
89 |
if self.notbranch: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
90 |
error_dialog(_('Directory is not a branch'), |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
91 |
_('You can perform this action only in a branch.')) |
0.8.46
by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups. |
92 |
self.close() |
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
93 |
return False |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
94 |
else: |
0.13.1
by Jelmer Vernooij
Remove communicator use from Commit. |
95 |
if self.wt.branch.get_bound_location() is not None: |
0.8.23
by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update |
96 |
# we have a checkout, so the local commit checkbox must appear
|
97 |
self.checkbutton_local.show() |
|
98 |
||
95
by Szilveszter Farkas (Phanatic)
Added pending merges to Commit dialog. Fixed bug #66091. |
99 |
if self.pending: |
100 |
# There are pending merges, file selection not supported
|
|
101 |
self.file_view.set_sensitive(False) |
|
102 |
else: |
|
103 |
# No pending merges
|
|
104 |
self.pending_view.set_sensitive(False) |
|
105 |
||
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
106 |
self.textview.modify_font(pango.FontDescription("Monospace")) |
0.8.23
by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update |
107 |
self.window.show() |
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
108 |
return True |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
109 |
|
110 |
def _create_file_view(self): |
|
93.1.13
by Alexander Belchenko
Fix bug introduced by revid:bialix@ukr.net-20061025102040-90bcdbad341ee3fa |
111 |
self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN, # [0] checkbox |
112 |
gobject.TYPE_STRING, # [1] path to display |
|
113 |
gobject.TYPE_STRING, # [2] changes type |
|
114 |
gobject.TYPE_STRING) # [3] real path |
|
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
115 |
self.file_view.set_model(self.file_store) |
116 |
crt = gtk.CellRendererToggle() |
|
117 |
crt.set_property("activatable", True) |
|
118 |
crt.connect("toggled", self._toggle_commit, self.file_store) |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
119 |
self.file_view.append_column(gtk.TreeViewColumn(_('Commit'), |
0.8.21
by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
120 |
crt, active=0)) |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
121 |
self.file_view.append_column(gtk.TreeViewColumn(_('Path'), |
0.8.21
by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
122 |
gtk.CellRendererText(), text=1)) |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
123 |
self.file_view.append_column(gtk.TreeViewColumn(_('Type'), |
0.8.21
by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
124 |
gtk.CellRendererText(), text=2)) |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
125 |
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
126 |
for path, id, kind in self.delta.added: |
93.1.10
by Alexander Belchenko
- Show file kind marker with path (i.e. directory path ends with '/') |
127 |
marker = osutils.kind_marker(kind) |
93.1.13
by Alexander Belchenko
Fix bug introduced by revid:bialix@ukr.net-20061025102040-90bcdbad341ee3fa |
128 |
self.file_store.append([ True, path+marker, _('added'), path ]) |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
129 |
|
130 |
for path, id, kind in self.delta.removed: |
|
93.1.10
by Alexander Belchenko
- Show file kind marker with path (i.e. directory path ends with '/') |
131 |
marker = osutils.kind_marker(kind) |
93.1.13
by Alexander Belchenko
Fix bug introduced by revid:bialix@ukr.net-20061025102040-90bcdbad341ee3fa |
132 |
self.file_store.append([ True, path+marker, _('removed'), path ]) |
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
133 |
|
134 |
for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed: |
|
93.1.10
by Alexander Belchenko
- Show file kind marker with path (i.e. directory path ends with '/') |
135 |
marker = osutils.kind_marker(kind) |
93.1.13
by Alexander Belchenko
Fix bug introduced by revid:bialix@ukr.net-20061025102040-90bcdbad341ee3fa |
136 |
if text_modified or meta_modified: |
137 |
changes = _('renamed and modified') |
|
138 |
else: |
|
139 |
changes = _('renamed') |
|
93.1.10
by Alexander Belchenko
- Show file kind marker with path (i.e. directory path ends with '/') |
140 |
self.file_store.append([ True, |
141 |
oldpath+marker + ' => ' + newpath+marker, |
|
93.1.13
by Alexander Belchenko
Fix bug introduced by revid:bialix@ukr.net-20061025102040-90bcdbad341ee3fa |
142 |
changes, |
143 |
newpath
|
|
144 |
])
|
|
0.8.55
by Szilveszter Farkas (Phanatic)
Gettext support added. |
145 |
|
146 |
for path, id, kind, text_modified, meta_modified in self.delta.modified: |
|
93.1.10
by Alexander Belchenko
- Show file kind marker with path (i.e. directory path ends with '/') |
147 |
marker = osutils.kind_marker(kind) |
93.1.13
by Alexander Belchenko
Fix bug introduced by revid:bialix@ukr.net-20061025102040-90bcdbad341ee3fa |
148 |
self.file_store.append([ True, path+marker, _('modified'), path ]) |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
149 |
|
95
by Szilveszter Farkas (Phanatic)
Added pending merges to Commit dialog. Fixed bug #66091. |
150 |
def _create_pending_merges(self): |
151 |
liststore = gtk.ListStore(gobject.TYPE_STRING, |
|
152 |
gobject.TYPE_STRING, |
|
153 |
gobject.TYPE_STRING) |
|
154 |
self.pending_view.set_model(liststore) |
|
155 |
||
156 |
self.pending_view.append_column(gtk.TreeViewColumn(_('Date'), |
|
157 |
gtk.CellRendererText(), text=0)) |
|
158 |
self.pending_view.append_column(gtk.TreeViewColumn(_('Committer'), |
|
159 |
gtk.CellRendererText(), text=1)) |
|
160 |
self.pending_view.append_column(gtk.TreeViewColumn(_('Summary'), |
|
161 |
gtk.CellRendererText(), text=2)) |
|
162 |
||
163 |
if not self.pending: |
|
164 |
return
|
|
165 |
||
166 |
for item in self.pending: |
|
167 |
liststore.append([ item['date'], |
|
168 |
item['committer'], |
|
169 |
item['summary'] ]) |
|
170 |
||
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
171 |
def _get_specific_files(self): |
172 |
ret = [] |
|
173 |
it = self.file_store.get_iter_first() |
|
174 |
while it: |
|
175 |
if self.file_store.get_value(it, 0): |
|
93.1.13
by Alexander Belchenko
Fix bug introduced by revid:bialix@ukr.net-20061025102040-90bcdbad341ee3fa |
176 |
# get real path from hidden column 3
|
177 |
ret.append(self.file_store.get_value(it, 3)) |
|
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
178 |
it = self.file_store.iter_next(it) |
179 |
||
180 |
return ret |
|
181 |
||
182 |
def _toggle_commit(self, cell, path, model): |
|
183 |
model[path][0] = not model[path][0] |
|
184 |
return
|
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
185 |
|
95
by Szilveszter Farkas (Phanatic)
Added pending merges to Commit dialog. Fixed bug #66091. |
186 |
def _pending_merges(self, wt): |
187 |
""" Return a list of pending merges or None if there are none of them. """ |
|
188 |
parents = wt.get_parent_ids() |
|
189 |
if len(parents) < 2: |
|
190 |
return None |
|
191 |
||
192 |
import re |
|
193 |
from bzrlib.osutils import format_date |
|
194 |
||
195 |
pending = parents[1:] |
|
196 |
branch = wt.branch |
|
197 |
last_revision = parents[0] |
|
198 |
||
199 |
if last_revision is not None: |
|
200 |
try: |
|
201 |
ignore = set(branch.repository.get_ancestry(last_revision)) |
|
202 |
except errors.NoSuchRevision: |
|
203 |
# the last revision is a ghost : assume everything is new
|
|
204 |
# except for it
|
|
205 |
ignore = set([None, last_revision]) |
|
206 |
else: |
|
207 |
ignore = set([None]) |
|
208 |
||
209 |
pm = [] |
|
210 |
for merge in pending: |
|
211 |
ignore.add(merge) |
|
212 |
try: |
|
213 |
m_revision = branch.repository.get_revision(merge) |
|
214 |
||
215 |
rev = {} |
|
216 |
rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ') |
|
217 |
rev['summary'] = m_revision.get_summary() |
|
218 |
rev['date'] = format_date(m_revision.timestamp, |
|
219 |
m_revision.timezone or 0, |
|
220 |
'original', date_fmt="%Y-%m-%d", |
|
221 |
show_offset=False) |
|
222 |
||
223 |
pm.append(rev) |
|
224 |
||
225 |
inner_merges = branch.repository.get_ancestry(merge) |
|
226 |
assert inner_merges[0] is None |
|
227 |
inner_merges.pop(0) |
|
228 |
inner_merges.reverse() |
|
229 |
for mmerge in inner_merges: |
|
230 |
if mmerge in ignore: |
|
231 |
continue
|
|
232 |
mm_revision = branch.repository.get_revision(mmerge) |
|
233 |
||
234 |
rev = {} |
|
235 |
rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ') |
|
236 |
rev['summary'] = mm_revision.get_summary() |
|
237 |
rev['date'] = format_date(mm_revision.timestamp, |
|
238 |
mm_revision.timezone or 0, |
|
239 |
'original', date_fmt="%Y-%m-%d", |
|
240 |
show_offset=False) |
|
241 |
||
242 |
pm.append(rev) |
|
243 |
||
244 |
ignore.add(mmerge) |
|
245 |
except errors.NoSuchRevision: |
|
246 |
print "DEBUG: NoSuchRevision:", merge |
|
247 |
||
248 |
return pm |
|
249 |
||
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
250 |
def commit(self, widget): |
0.8.26
by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit) |
251 |
textbuffer = self.textview.get_buffer() |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
252 |
start, end = textbuffer.get_bounds() |
93.1.9
by Alexander Belchenko
Fix bug 67927 (non-ascii commit message saved as utf-8 string) |
253 |
message = textbuffer.get_text(start, end).decode('utf-8') |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
254 |
|
255 |
checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict') |
|
256 |
checkbutton_force = self.glade.get_widget('checkbutton_commit_force') |
|
257 |
||
95
by Szilveszter Farkas (Phanatic)
Added pending merges to Commit dialog. Fixed bug #66091. |
258 |
if not self.pending: |
259 |
specific_files = self._get_specific_files() |
|
260 |
else: |
|
261 |
specific_files = None |
|
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
262 |
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
263 |
try: |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
264 |
self.wt.commit(message, |
265 |
allow_pointless=checkbutton_force.get_active(), |
|
266 |
strict=checkbutton_strict.get_active(), |
|
0.8.23
by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update |
267 |
local=self.checkbutton_local.get_active(), |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
268 |
specific_files=specific_files) |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
269 |
except errors.NotBranchError: |
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
270 |
error_dialog(_('Directory is not a branch'), |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
271 |
_('You can perform this action only in a branch.')) |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
272 |
return
|
273 |
except errors.LocalRequiresBoundBranch: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
274 |
error_dialog(_('Directory is not a checkout'), |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
275 |
_('You can perform local commit only on checkouts.')) |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
276 |
return
|
277 |
except errors.PointlessCommit: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
278 |
error_dialog(_('No changes to commit'), |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
279 |
_('Try force commit if you want to commit anyway.')) |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
280 |
return
|
281 |
except errors.ConflictsInTree: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
282 |
error_dialog(_('Conflicts in tree'), |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
283 |
_('You need to resolve the conflicts before committing.')) |
0.8.20
by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
284 |
return
|
285 |
except errors.StrictCommitFailed: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
286 |
error_dialog(_('Strict commit failed'), |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
287 |
_('There are unknown files in the working tree.\nPlease add or delete them.')) |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
288 |
return
|
289 |
except errors.BoundBranchOutOfDate, errmsg: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
290 |
error_dialog(_('Bound branch is out of date'), |
0.8.98
by Szilveszter Farkas (Phanatic)
Loads of fixes. Pyflakes cleanup. |
291 |
_('%s') % errmsg) |
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
292 |
return
|
0.13.2
by Jelmer Vernooij
Handle unknown errors in commit. |
293 |
except errors.BzrError, msg: |
0.13.4
by Jelmer Vernooij
Handle non-bzr unknown errors as well. |
294 |
error_dialog(_('Unknown bzr error'), str(msg)) |
295 |
return
|
|
296 |
except Exception, msg: |
|
0.13.3
by Jelmer Vernooij
Start removing dialog context (it's not required). |
297 |
error_dialog(_('Unknown error'), str(msg)) |
0.13.2
by Jelmer Vernooij
Handle unknown errors in commit. |
298 |
return
|
93.1.7
by Alexander Belchenko
Fix gcommit bug 66937 (bzr still running after cancel/commit clicked) |
299 |
|
91.1.11
by Jelmer Vernooij
Cherrypick Alexanders' fix for #68127. |
300 |
self.close() |
301 |
||
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
302 |
def close(self, widget=None): |
303 |
self.window.destroy() |