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 |
||
576.1.1
by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit |
17 |
import re |
18 |
||
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
19 |
from gi.repository import Gdk |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
20 |
from gi.repository import Gtk |
21 |
from gi.repository import GObject |
|
22 |
from gi.repository import Pango |
|
0.8.19
by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com> |
23 |
|
742
by Jelmer Vernooij
Move commit message saving to separate file. |
24 |
try: |
25 |
from bzrlib import bencode |
|
26 |
except ImportError: |
|
27 |
from bzrlib.util import bencode |
|
28 |
||
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
29 |
from bzrlib import ( |
30 |
errors, |
|
31 |
trace, |
|
32 |
)
|
|
576.1.1
by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit |
33 |
from bzrlib.plugins.gtk.dialog import question_dialog |
34 |
from bzrlib.plugins.gtk.errors import show_bzr_error |
|
729.1.1
by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used. |
35 |
from bzrlib.plugins.gtk.i18n import _i18n |
742
by Jelmer Vernooij
Move commit message saving to separate file. |
36 |
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager |
93.1.6
by Alexander Belchenko
detecting name of glade file doing in separate module (olive.gladefile) |
37 |
|
158
by Jelmer Vernooij
If available, use NetworkManager to find out whether a commit should be local or not. |
38 |
try: |
39 |
import dbus |
|
40 |
import dbus.glib |
|
180
by Jelmer Vernooij
Don't obtain handle to network manager until it's actually needed. |
41 |
have_dbus = True |
158
by Jelmer Vernooij
If available, use NetworkManager to find out whether a commit should be local or not. |
42 |
except ImportError: |
180
by Jelmer Vernooij
Don't obtain handle to network manager until it's actually needed. |
43 |
have_dbus = False |
158
by Jelmer Vernooij
If available, use NetworkManager to find out whether a commit should be local or not. |
44 |
|
278.1.4
by John Arbash Meinel
Just playing around. |
45 |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
46 |
def pending_revisions(wt): |
47 |
"""Return a list of pending merges or None if there are none of them. |
|
48 |
||
49 |
Arguably this should be a core function, and
|
|
50 |
``bzrlib.status.show_pending_merges`` should be built on top of it.
|
|
51 |
||
52 |
:return: [(rev, [children])]
|
|
53 |
"""
|
|
54 |
parents = wt.get_parent_ids() |
|
55 |
if len(parents) < 2: |
|
56 |
return None |
|
57 |
||
58 |
# The basic pending merge algorithm uses the same algorithm as
|
|
59 |
# bzrlib.status.show_pending_merges
|
|
60 |
pending = parents[1:] |
|
61 |
branch = wt.branch |
|
62 |
last_revision = parents[0] |
|
63 |
||
64 |
if last_revision is not None: |
|
762
by Jelmer Vernooij
Avoid call to Repository.get_ancestry. |
65 |
graph = branch.repository.get_graph() |
66 |
ignore = set([r for r,ps in graph.iter_ancestry([last_revision])]) |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
67 |
else: |
762
by Jelmer Vernooij
Avoid call to Repository.get_ancestry. |
68 |
ignore = set([]) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
69 |
|
70 |
pm = [] |
|
71 |
for merge in pending: |
|
72 |
ignore.add(merge) |
|
73 |
try: |
|
74 |
rev = branch.repository.get_revision(merge) |
|
75 |
children = [] |
|
76 |
pm.append((rev, children)) |
|
77 |
||
78 |
# This does need to be topo sorted, so we search backwards
|
|
79 |
inner_merges = branch.repository.get_ancestry(merge) |
|
80 |
assert inner_merges[0] is None |
|
81 |
inner_merges.pop(0) |
|
82 |
for mmerge in reversed(inner_merges): |
|
83 |
if mmerge in ignore: |
|
84 |
continue
|
|
85 |
rev = branch.repository.get_revision(mmerge) |
|
86 |
children.append(rev) |
|
87 |
||
88 |
ignore.add(mmerge) |
|
89 |
except errors.NoSuchRevision: |
|
90 |
print "DEBUG: NoSuchRevision:", merge |
|
91 |
||
92 |
return pm |
|
93 |
||
94 |
||
622.1.1
by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized. |
95 |
_newline_variants_re = re.compile(r'\r\n?') |
96 |
def _sanitize_and_decode_message(utf8_message): |
|
97 |
"""Turn a utf-8 message into a sanitized Unicode message.""" |
|
98 |
fixed_newline = _newline_variants_re.sub('\n', utf8_message) |
|
99 |
return fixed_newline.decode('utf-8') |
|
100 |
||
101 |
||
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
102 |
class CommitDialog(Gtk.Dialog): |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
103 |
"""Implementation of Commit.""" |
104 |
||
105 |
def __init__(self, wt, selected=None, parent=None): |
|
734.1.51
by Curtis Hovey
Fix the initializer for many classes. |
106 |
super(CommitDialog, self).__init__( |
107 |
title="Commit to %s" % wt.basedir, parent=parent, flags=0) |
|
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
108 |
self.connect('delete-event', self._on_delete_window) |
606
by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest. |
109 |
self._question_dialog = question_dialog |
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
110 |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
111 |
self.set_type_hint(Gdk.WindowTypeHint.NORMAL) |
278.1.24
by John Arbash Meinel
Actually show the commit button. |
112 |
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
113 |
self._wt = wt |
278.1.34
by John Arbash Meinel
Cleanup, we are still ignoring the 'selected' property, and the 'wtpath' |
114 |
# TODO: Do something with this value, it is used by Olive
|
115 |
# It used to set all changes but this one to False
|
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
116 |
self._selected = selected |
278.1.33
by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config. |
117 |
self._enable_per_file_commits = True |
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
118 |
self._commit_all_changes = True |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
119 |
self.committed_revision_id = None # Nothing has been committed yet |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
120 |
self._saved_commit_messages_manager = SavedCommitMessagesManager( |
121 |
self._wt, self._wt.branch) |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
122 |
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
123 |
self.setup_params() |
124 |
self.construct() |
|
125 |
self.fill_in_data() |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
126 |
|
127 |
def setup_params(self): |
|
128 |
"""Setup the member variables for state.""" |
|
129 |
self._basis_tree = self._wt.basis_tree() |
|
278.1.12
by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names. |
130 |
self._delta = None |
762
by Jelmer Vernooij
Avoid call to Repository.get_ancestry. |
131 |
self._wt.lock_read() |
132 |
try: |
|
133 |
self._pending = pending_revisions(self._wt) |
|
134 |
finally: |
|
135 |
self._wt.unlock() |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
136 |
|
137 |
self._is_checkout = (self._wt.branch.get_bound_location() is not None) |
|
138 |
||
278.1.14
by John Arbash Meinel
Tests that we fill out the pending list correctly. |
139 |
def fill_in_data(self): |
140 |
# Now that we are built, handle changes to the view based on the state
|
|
141 |
self._fill_in_pending() |
|
278.1.20
by John Arbash Meinel
We always select the All Files record in the files view, |
142 |
self._fill_in_diff() |
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
143 |
self._fill_in_files() |
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
144 |
self._fill_in_checkout() |
278.1.33
by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config. |
145 |
self._fill_in_per_file_info() |
278.1.14
by John Arbash Meinel
Tests that we fill out the pending list correctly. |
146 |
|
147 |
def _fill_in_pending(self): |
|
148 |
if not self._pending: |
|
149 |
self._pending_box.hide() |
|
150 |
return
|
|
151 |
||
152 |
# TODO: We'd really prefer this to be a nested list
|
|
153 |
for rev, children in self._pending: |
|
154 |
rev_info = self._rev_to_pending_info(rev) |
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
155 |
self._pending_store.append([ |
278.1.14
by John Arbash Meinel
Tests that we fill out the pending list correctly. |
156 |
rev_info['revision_id'], |
157 |
rev_info['date'], |
|
158 |
rev_info['committer'], |
|
159 |
rev_info['summary'], |
|
160 |
])
|
|
161 |
for child in children: |
|
162 |
rev_info = self._rev_to_pending_info(child) |
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
163 |
self._pending_store.append([ |
278.1.14
by John Arbash Meinel
Tests that we fill out the pending list correctly. |
164 |
rev_info['revision_id'], |
165 |
rev_info['date'], |
|
166 |
rev_info['committer'], |
|
167 |
rev_info['summary'], |
|
168 |
])
|
|
169 |
self._pending_box.show() |
|
170 |
||
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
171 |
def _fill_in_files(self): |
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
172 |
# We should really use add a progress bar of some kind.
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
173 |
# While we fill in the view, hide the store
|
174 |
store = self._files_store |
|
175 |
self._treeview_files.set_model(None) |
|
176 |
||
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
177 |
added = _i18n('added') |
178 |
removed = _i18n('removed') |
|
179 |
renamed = _i18n('renamed') |
|
180 |
renamed_and_modified = _i18n('renamed and modified') |
|
181 |
modified = _i18n('modified') |
|
182 |
kind_changed = _i18n('kind changed') |
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
183 |
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
184 |
# The store holds:
|
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
185 |
# [file_id, real path, checkbox, display path, changes type, message]
|
450
by Aaron Bentley
Update to use new Tree.iter_changes |
186 |
# iter_changes returns:
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
187 |
# (file_id, (path_in_source, path_in_target),
|
188 |
# changed_content, versioned, parent, name, kind,
|
|
189 |
# executable)
|
|
190 |
||
278.1.35
by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog. |
191 |
all_enabled = (self._selected is None) |
278.1.20
by John Arbash Meinel
We always select the All Files record in the files view, |
192 |
# The first entry is always the 'whole tree'
|
278.1.35
by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog. |
193 |
all_iter = store.append([None, None, all_enabled, 'All Files', '', '']) |
194 |
initial_cursor = store.get_path(all_iter) |
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
195 |
# should we pass specific_files?
|
196 |
self._wt.lock_read() |
|
197 |
self._basis_tree.lock_read() |
|
198 |
try: |
|
450
by Aaron Bentley
Update to use new Tree.iter_changes |
199 |
from diff import iter_changes_to_status |
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
200 |
saved_file_messages = self._saved_commit_messages_manager.get()[1] |
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
201 |
for (file_id, real_path, change_type, display_path |
450
by Aaron Bentley
Update to use new Tree.iter_changes |
202 |
) in iter_changes_to_status(self._basis_tree, self._wt): |
278.1.35
by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog. |
203 |
if self._selected and real_path != self._selected: |
204 |
enabled = False |
|
205 |
else: |
|
206 |
enabled = True |
|
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
207 |
try: |
208 |
default_message = saved_file_messages[file_id] |
|
209 |
except KeyError: |
|
210 |
default_message = '' |
|
278.1.35
by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog. |
211 |
item_iter = store.append([ |
212 |
file_id, |
|
213 |
real_path.encode('UTF-8'), |
|
214 |
enabled, |
|
215 |
display_path.encode('UTF-8'), |
|
216 |
change_type, |
|
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
217 |
default_message, # Initial comment |
278.1.35
by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog. |
218 |
])
|
219 |
if self._selected and enabled: |
|
220 |
initial_cursor = store.get_path(item_iter) |
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
221 |
finally: |
222 |
self._basis_tree.unlock() |
|
223 |
self._wt.unlock() |
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
224 |
|
225 |
self._treeview_files.set_model(store) |
|
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
226 |
self._last_selected_file = None |
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
227 |
# This sets the cursor, which causes the expander to close, which
|
228 |
# causes the _file_message_text_view to never get realized. So we have
|
|
229 |
# to give it a little kick, or it warns when we try to grab the focus
|
|
734.1.22
by Curtis Hovey
GtkTreeView.set_cursor(tree_path, None, False) is the default args. |
230 |
self._treeview_files.set_cursor(initial_cursor, None, False) |
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
231 |
|
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
232 |
def _realize_file_message_tree_view(*args): |
233 |
self._file_message_text_view.realize() |
|
234 |
self.connect_after('realize', _realize_file_message_tree_view) |
|
235 |
||
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
236 |
def _fill_in_diff(self): |
237 |
self._diff_view.set_trees(self._wt, self._basis_tree) |
|
238 |
||
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
239 |
def _fill_in_checkout(self): |
240 |
if not self._is_checkout: |
|
241 |
self._check_local.hide() |
|
242 |
return
|
|
243 |
if have_dbus: |
|
244 |
bus = dbus.SystemBus() |
|
445
by Szilveszter Farkas (Phanatic)
Fix a traceback if NetworkManager is not available (#199513). |
245 |
try: |
246 |
proxy_obj = bus.get_object('org.freedesktop.NetworkManager', |
|
247 |
'/org/freedesktop/NetworkManager') |
|
446
by Szilveszter Farkas (Phanatic)
Hot fix. Sorry dudes. |
248 |
except dbus.DBusException: |
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
249 |
trace.mutter("networkmanager not available.") |
445
by Szilveszter Farkas (Phanatic)
Fix a traceback if NetworkManager is not available (#199513). |
250 |
self._check_local.show() |
251 |
return
|
|
252 |
||
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
253 |
dbus_iface = dbus.Interface(proxy_obj, |
254 |
'org.freedesktop.NetworkManager') |
|
255 |
try: |
|
256 |
# 3 is the enum value for STATE_CONNECTED
|
|
257 |
self._check_local.set_active(dbus_iface.state() != 3) |
|
258 |
except dbus.DBusException, e: |
|
259 |
# Silently drop errors. While DBus may be
|
|
260 |
# available, NetworkManager doesn't necessarily have to be
|
|
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
261 |
trace.mutter("unable to get networkmanager state: %r" % e) |
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
262 |
self._check_local.show() |
263 |
||
278.1.33
by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config. |
264 |
def _fill_in_per_file_info(self): |
265 |
config = self._wt.branch.get_config() |
|
266 |
enable_per_file_commits = config.get_user_option('per_file_commits') |
|
267 |
if (enable_per_file_commits is None |
|
268 |
or enable_per_file_commits.lower() |
|
269 |
not in ('y', 'yes', 'on', 'enable', '1', 't', 'true')): |
|
270 |
self._enable_per_file_commits = False |
|
271 |
else: |
|
272 |
self._enable_per_file_commits = True |
|
273 |
if not self._enable_per_file_commits: |
|
274 |
self._file_message_expander.hide() |
|
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
275 |
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>')) |
278.1.33
by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config. |
276 |
|
278.1.12
by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names. |
277 |
def _compute_delta(self): |
278 |
self._delta = self._wt.changes_from(self._basis_tree) |
|
279 |
||
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
280 |
def construct(self): |
281 |
"""Build up the dialog widgets.""" |
|
282 |
# The primary pane which splits it into left and right (adjustable)
|
|
283 |
# sections.
|
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
284 |
self._hpane = Gtk.HPaned() |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
285 |
|
286 |
self._construct_left_pane() |
|
287 |
self._construct_right_pane() |
|
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
288 |
self._construct_action_pane() |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
289 |
|
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
290 |
self.get_content_area().pack_start(self._hpane, True, True, 0) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
291 |
self._hpane.show() |
292 |
self.set_focus(self._global_message_text_view) |
|
293 |
||
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
294 |
self._construct_accelerators() |
295 |
self._set_sizes() |
|
296 |
||
297 |
def _set_sizes(self): |
|
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
298 |
# This seems like a reasonable default, we might like it to
|
299 |
# be a bit wider, so that by default we can fit an 80-line diff in the
|
|
300 |
# diff window.
|
|
301 |
# Alternatively, we should be saving the last position/size rather than
|
|
302 |
# setting it to a fixed value every time we start up.
|
|
303 |
screen = self.get_screen() |
|
304 |
monitor = 0 # We would like it to be the monitor we are going to |
|
305 |
# display on, but I don't know how to figure that out
|
|
306 |
# Only really useful for freaks like me that run dual
|
|
307 |
# monitor, with different sizes on the monitors
|
|
308 |
monitor_rect = screen.get_monitor_geometry(monitor) |
|
309 |
width = int(monitor_rect.width * 0.66) |
|
310 |
height = int(monitor_rect.height * 0.66) |
|
311 |
self.set_default_size(width, height) |
|
278.1.16
by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than |
312 |
self._hpane.set_position(300) |
313 |
||
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
314 |
def _construct_accelerators(self): |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
315 |
group = Gtk.AccelGroup() |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
316 |
group.connect(Gdk.keyval_from_name('N'), |
317 |
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next) |
|
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
318 |
self.add_accel_group(group) |
319 |
||
500.2.1
by Scott Scriven
Made 'gcommit' ignore the escape key ('close' signal). |
320 |
# ignore the escape key (avoid closing the window)
|
500.2.2
by Scott Scriven
Simpler/cleaner way to ignore the 'close' signal. |
321 |
self.connect_object('close', self.emit_stop_by_name, 'close') |
500.2.1
by Scott Scriven
Made 'gcommit' ignore the escape key ('close' signal). |
322 |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
323 |
def _construct_left_pane(self): |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
324 |
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
325 |
self._construct_file_list() |
326 |
self._construct_pending_list() |
|
327 |
||
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
328 |
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"), |
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
329 |
use_underline=True) |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
330 |
self._left_pane_box.pack_end(self._check_local, False, False, 0) |
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
331 |
self._check_local.set_active(False) |
332 |
||
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
333 |
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
334 |
self._left_pane_box.show() |
335 |
||
336 |
def _construct_right_pane(self): |
|
337 |
# TODO: I really want to make it so the diff view gets more space than
|
|
338 |
# the global commit message, and the per-file commit message gets even
|
|
339 |
# less. When I did it with wxGlade, I set it to 4 for diff, 2 for
|
|
340 |
# commit, and 1 for file commit, and it looked good. But I don't seem
|
|
341 |
# to have a way to do that with the gtk boxes... :( (Which is extra
|
|
342 |
# weird since wx uses gtk on Linux...)
|
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
343 |
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False) |
278.1.11
by John Arbash Meinel
Worked out the rest of the spacing. |
344 |
self._right_pane_table.set_row_spacings(5) |
345 |
self._right_pane_table.set_col_spacings(5) |
|
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
346 |
self._right_pane_table_row = 0 |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
347 |
self._construct_diff_view() |
348 |
self._construct_file_message() |
|
349 |
self._construct_global_message() |
|
350 |
||
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
351 |
self._right_pane_table.show() |
352 |
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True) |
|
353 |
||
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
354 |
def _construct_action_pane(self): |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
355 |
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL) |
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
356 |
self._button_cancel.connect('clicked', self._on_cancel_clicked) |
357 |
self._button_cancel.show() |
|
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
358 |
self.get_action_area().pack_end( |
359 |
self._button_cancel, True, True, 0) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
360 |
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True) |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
361 |
self._button_commit.connect('clicked', self._on_commit_clicked) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
362 |
self._button_commit.set_can_default(True) |
278.1.24
by John Arbash Meinel
Actually show the commit button. |
363 |
self._button_commit.show() |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
364 |
self.get_action_area().pack_end( |
365 |
self._button_commit, True, True, 0) |
|
278.1.24
by John Arbash Meinel
Actually show the commit button. |
366 |
self._button_commit.grab_default() |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
367 |
|
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
368 |
def _add_to_right_table(self, widget, weight, expanding=False): |
369 |
"""Add another widget to the table |
|
370 |
||
371 |
:param widget: The object to add
|
|
372 |
:param weight: How many rows does this widget get to request
|
|
373 |
:param expanding: Should expand|fill|shrink be set?
|
|
374 |
"""
|
|
375 |
end_row = self._right_pane_table_row + weight |
|
376 |
options = 0 |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
377 |
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK |
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
378 |
if expanding: |
379 |
options = expand_opts |
|
380 |
self._right_pane_table.attach(widget, 0, 1, |
|
381 |
self._right_pane_table_row, end_row, |
|
382 |
xoptions=expand_opts, yoptions=options) |
|
383 |
self._right_pane_table_row = end_row |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
384 |
|
385 |
def _construct_file_list(self): |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
386 |
self._files_box = Gtk.VBox(homogeneous=False, spacing=0) |
387 |
file_label = Gtk.Label(label=_i18n('Files')) |
|
278.1.41
by John Arbash Meinel
For the moment, just hide the section headings Files and Diff for *. |
388 |
# file_label.show()
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
389 |
self._files_box.pack_start(file_label, False, True, 0) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
390 |
|
734.1.19
by Curtis Hovey
Updated RadioButtons to gtk3. |
391 |
self._commit_all_files_radio = Gtk.RadioButton.new_with_label( |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
392 |
None, _i18n("Commit all changes")) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
393 |
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0) |
278.1.42
by John Arbash Meinel
start playing with using a radial box, rather than an entry in the list |
394 |
self._commit_all_files_radio.show() |
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
395 |
self._commit_all_files_radio.connect('toggled', |
396 |
self._toggle_commit_selection) |
|
734.1.19
by Curtis Hovey
Updated RadioButtons to gtk3. |
397 |
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget( |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
398 |
self._commit_all_files_radio, _i18n("Only commit selected changes")) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
399 |
self._files_box.pack_start(self._commit_selected_radio, False, True, 0) |
278.1.42
by John Arbash Meinel
start playing with using a radial box, rather than an entry in the list |
400 |
self._commit_selected_radio.show() |
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
401 |
self._commit_selected_radio.connect('toggled', |
402 |
self._toggle_commit_selection) |
|
403 |
if self._pending: |
|
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
404 |
self._commit_all_files_radio.set_label(_i18n('Commit all changes*')) |
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
405 |
self._commit_all_files_radio.set_sensitive(False) |
406 |
self._commit_selected_radio.set_sensitive(False) |
|
278.1.42
by John Arbash Meinel
start playing with using a radial box, rather than an entry in the list |
407 |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
408 |
scroller = Gtk.ScrolledWindow() |
409 |
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) |
|
410 |
self._treeview_files = Gtk.TreeView() |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
411 |
self._treeview_files.show() |
412 |
scroller.add(self._treeview_files) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
413 |
scroller.set_shadow_type(Gtk.ShadowType.IN) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
414 |
scroller.show() |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
415 |
self._files_box.pack_start(scroller, True, True, 0) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
416 |
self._files_box.show() |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
417 |
self._left_pane_box.pack_start(self._files_box, True, True, 0) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
418 |
|
278.1.31
by John Arbash Meinel
We can make bencode work again by a simple decode/encode step. |
419 |
# Keep note that all strings stored in a ListStore must be UTF-8
|
420 |
# strings. GTK does not support directly setting and restoring Unicode
|
|
421 |
# objects.
|
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
422 |
liststore = Gtk.ListStore( |
423 |
GObject.TYPE_STRING, # [0] file_id |
|
424 |
GObject.TYPE_STRING, # [1] real path |
|
425 |
GObject.TYPE_BOOLEAN, # [2] checkbox |
|
426 |
GObject.TYPE_STRING, # [3] display path |
|
427 |
GObject.TYPE_STRING, # [4] changes type |
|
428 |
GObject.TYPE_STRING, # [5] commit message |
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
429 |
)
|
430 |
self._files_store = liststore |
|
431 |
self._treeview_files.set_model(liststore) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
432 |
crt = Gtk.CellRendererToggle() |
278.1.39
by John Arbash Meinel
To disable a checkbox it is set_property('activatable', False), |
433 |
crt.set_property('activatable', not bool(self._pending)) |
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
434 |
crt.connect("toggled", self._toggle_commit, self._files_store) |
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
435 |
if self._pending: |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
436 |
name = _i18n('Commit*') |
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
437 |
else: |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
438 |
name = _i18n('Commit') |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
439 |
commit_col = Gtk.TreeViewColumn(name, crt, active=2) |
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
440 |
commit_col.set_visible(False) |
441 |
self._treeview_files.append_column(commit_col) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
442 |
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'), |
443 |
Gtk.CellRendererText(), text=3)) |
|
444 |
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'), |
|
445 |
Gtk.CellRendererText(), text=4)) |
|
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
446 |
self._treeview_files.connect('cursor-changed', |
447 |
self._on_treeview_files_cursor_changed) |
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
448 |
|
449 |
def _toggle_commit(self, cell, path, model): |
|
278.1.20
by John Arbash Meinel
We always select the All Files record in the files view, |
450 |
if model[path][0] is None: # No file_id means 'All Files' |
451 |
new_val = not model[path][2] |
|
452 |
for node in model: |
|
453 |
node[2] = new_val |
|
454 |
else: |
|
455 |
model[path][2] = not model[path][2] |
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
456 |
|
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
457 |
def _toggle_commit_selection(self, button): |
458 |
all_files = self._commit_all_files_radio.get_active() |
|
459 |
if self._commit_all_changes != all_files: |
|
460 |
checked_col = self._treeview_files.get_column(0) |
|
461 |
self._commit_all_changes = all_files |
|
462 |
if all_files: |
|
463 |
checked_col.set_visible(False) |
|
464 |
else: |
|
465 |
checked_col.set_visible(True) |
|
734.1.20
by Curtis Hovey
col.get_cell_renderers => col.get_cells. |
466 |
renderer = checked_col.get_cells()[0] |
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
467 |
renderer.set_property('activatable', not all_files) |
468 |
||
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
469 |
def _construct_pending_list(self): |
470 |
# Pending information defaults to hidden, we put it all in 1 box, so
|
|
471 |
# that we can show/hide all of them at once
|
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
472 |
self._pending_box = Gtk.VBox() |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
473 |
self._pending_box.hide() |
474 |
||
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
475 |
pending_message = Gtk.Label() |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
476 |
pending_message.set_markup( |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
477 |
_i18n('<i>* Cannot select specific files when merging</i>')) |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
478 |
self._pending_box.pack_start(pending_message, False, True, 5) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
479 |
pending_message.show() |
480 |
||
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
481 |
pending_label = Gtk.Label(label=_i18n('Pending Revisions')) |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
482 |
self._pending_box.pack_start(pending_label, False, True, 0) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
483 |
pending_label.show() |
484 |
||
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
485 |
scroller = Gtk.ScrolledWindow() |
486 |
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) |
|
487 |
self._treeview_pending = Gtk.TreeView() |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
488 |
scroller.add(self._treeview_pending) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
489 |
scroller.set_shadow_type(Gtk.ShadowType.IN) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
490 |
scroller.show() |
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
491 |
self._pending_box.pack_start(scroller, True, True, 5) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
492 |
self._treeview_pending.show() |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
493 |
self._left_pane_box.pack_start(self._pending_box, True, True, 0) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
494 |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
495 |
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id |
496 |
GObject.TYPE_STRING, # date |
|
497 |
GObject.TYPE_STRING, # committer |
|
498 |
GObject.TYPE_STRING, # summary |
|
278.1.14
by John Arbash Meinel
Tests that we fill out the pending list correctly. |
499 |
)
|
278.1.15
by John Arbash Meinel
Hook up the list of modified files. |
500 |
self._pending_store = liststore |
278.1.14
by John Arbash Meinel
Tests that we fill out the pending list correctly. |
501 |
self._treeview_pending.set_model(liststore) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
502 |
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'), |
503 |
Gtk.CellRendererText(), text=1)) |
|
504 |
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'), |
|
505 |
Gtk.CellRendererText(), text=2)) |
|
506 |
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'), |
|
507 |
Gtk.CellRendererText(), text=3)) |
|
278.1.14
by John Arbash Meinel
Tests that we fill out the pending list correctly. |
508 |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
509 |
def _construct_diff_view(self): |
729.1.1
by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used. |
510 |
from bzrlib.plugins.gtk.diff import DiffView |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
511 |
|
278.1.41
by John Arbash Meinel
For the moment, just hide the section headings Files and Diff for *. |
512 |
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
|
513 |
# decide that we really don't ever want to display it, we should
|
|
514 |
# actually remove it, and other references to it, along with the
|
|
515 |
# tests that it is set properly.
|
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
516 |
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree')) |
278.1.11
by John Arbash Meinel
Worked out the rest of the spacing. |
517 |
self._diff_label.set_alignment(0, 0) |
518 |
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0) |
|
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
519 |
self._add_to_right_table(self._diff_label, 1, False) |
278.1.41
by John Arbash Meinel
For the moment, just hide the section headings Files and Diff for *. |
520 |
# self._diff_label.show()
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
521 |
|
278.1.12
by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names. |
522 |
self._diff_view = DiffView() |
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
523 |
self._add_to_right_table(self._diff_view, 4, True) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
524 |
self._diff_view.show() |
525 |
||
526 |
def _construct_file_message(self): |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
527 |
scroller = Gtk.ScrolledWindow() |
528 |
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) |
|
278.1.9
by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly. |
529 |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
530 |
self._file_message_text_view = Gtk.TextView() |
278.1.9
by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly. |
531 |
scroller.add(self._file_message_text_view) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
532 |
scroller.set_shadow_type(Gtk.ShadowType.IN) |
278.1.9
by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly. |
533 |
scroller.show() |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
534 |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
535 |
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace")) |
536 |
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD) |
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
537 |
self._file_message_text_view.set_accepts_tab(False) |
538 |
self._file_message_text_view.show() |
|
539 |
||
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
540 |
self._file_message_expander = Gtk.Expander( |
541 |
label=_i18n('File commit message')) |
|
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
542 |
self._file_message_expander.set_expanded(True) |
543 |
self._file_message_expander.add(scroller) |
|
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
544 |
self._add_to_right_table(self._file_message_expander, 1, False) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
545 |
self._file_message_expander.show() |
546 |
||
547 |
def _construct_global_message(self): |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
548 |
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message')) |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
549 |
self._global_message_label.set_markup( |
550 |
_i18n('<b>Global Commit Message</b>')) |
|
278.1.11
by John Arbash Meinel
Worked out the rest of the spacing. |
551 |
self._global_message_label.set_alignment(0, 0) |
552 |
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0) |
|
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
553 |
self._add_to_right_table(self._global_message_label, 1, False) |
278.1.11
by John Arbash Meinel
Worked out the rest of the spacing. |
554 |
# Can we remove the spacing between the label and the box?
|
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
555 |
self._global_message_label.show() |
556 |
||
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
557 |
scroller = Gtk.ScrolledWindow() |
558 |
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) |
|
278.1.9
by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly. |
559 |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
560 |
self._global_message_text_view = Gtk.TextView() |
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
561 |
self._set_global_commit_message(self._saved_commit_messages_manager.get()[0]) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
562 |
self._global_message_text_view.modify_font(Pango.FontDescription("Monospace")) |
278.1.9
by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly. |
563 |
scroller.add(self._global_message_text_view) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
564 |
scroller.set_shadow_type(Gtk.ShadowType.IN) |
278.1.9
by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly. |
565 |
scroller.show() |
278.1.10
by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table. |
566 |
self._add_to_right_table(scroller, 2, True) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
567 |
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD) |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
568 |
self._file_message_text_view.set_accepts_tab(False) |
569 |
self._global_message_text_view.show() |
|
570 |
||
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
571 |
def _on_treeview_files_cursor_changed(self, treeview): |
278.1.18
by John Arbash Meinel
Start checking the diff view is correct. |
572 |
treeselection = treeview.get_selection() |
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
573 |
(model, selection) = treeselection.get_selected() |
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
574 |
|
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
575 |
if selection is not None: |
576 |
path, display_path = model.get(selection, 1, 3) |
|
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
577 |
self._diff_label.set_text(_i18n('Diff for ') + display_path) |
278.1.20
by John Arbash Meinel
We always select the All Files record in the files view, |
578 |
if path is None: |
579 |
self._diff_view.show_diff(None) |
|
580 |
else: |
|
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
581 |
self._diff_view.show_diff([path.decode('UTF-8')]) |
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
582 |
self._update_per_file_info(selection) |
583 |
||
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
584 |
def _on_accel_next(self, accel_group, window, keyval, modifier): |
585 |
# We don't really care about any of the parameters, because we know
|
|
586 |
# where this message came from
|
|
587 |
tree_selection = self._treeview_files.get_selection() |
|
588 |
(model, selection) = tree_selection.get_selected() |
|
589 |
if selection is None: |
|
590 |
next = None |
|
591 |
else: |
|
592 |
next = model.iter_next(selection) |
|
593 |
||
594 |
if next is None: |
|
595 |
# We have either made it to the end of the list, or nothing was
|
|
596 |
# selected. Either way, select All Files, and jump to the global
|
|
597 |
# commit message.
|
|
734.1.23
by Curtis Hovey
Always pass a Gtk.TreePath instead of an int or tuple. |
598 |
self._treeview_files.set_cursor( |
599 |
Gtk.TreePath(path=0), None, False) |
|
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
600 |
self._global_message_text_view.grab_focus() |
601 |
else: |
|
602 |
# Set the cursor to this entry, and jump to the per-file commit
|
|
603 |
# message
|
|
734.1.13
by Curtis Hovey
Fixed search in diff. |
604 |
self._treeview_files.set_cursor(model.get_path(next), None, False) |
278.1.32
by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages. |
605 |
self._file_message_text_view.grab_focus() |
606 |
||
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
607 |
def _save_current_file_message(self): |
608 |
if self._last_selected_file is None: |
|
609 |
return # Nothing to save |
|
610 |
text_buffer = self._file_message_text_view.get_buffer() |
|
611 |
cur_text = text_buffer.get_text(text_buffer.get_start_iter(), |
|
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
612 |
text_buffer.get_end_iter(), True) |
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
613 |
last_selected = self._files_store.get_iter(self._last_selected_file) |
614 |
self._files_store.set_value(last_selected, 5, cur_text) |
|
615 |
||
616 |
def _update_per_file_info(self, selection): |
|
617 |
# The node is changing, so cache the current message
|
|
278.1.33
by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config. |
618 |
if not self._enable_per_file_commits: |
619 |
return
|
|
620 |
||
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
621 |
self._save_current_file_message() |
622 |
text_buffer = self._file_message_text_view.get_buffer() |
|
623 |
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5) |
|
624 |
if file_id is None: # Whole tree |
|
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
625 |
self._file_message_expander.set_label(_i18n('File commit message')) |
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
626 |
self._file_message_expander.set_expanded(False) |
627 |
self._file_message_expander.set_sensitive(False) |
|
628 |
text_buffer.set_text('') |
|
629 |
self._last_selected_file = None |
|
630 |
else: |
|
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
631 |
self._file_message_expander.set_label(_i18n('Commit message for ') |
278.1.21
by John Arbash Meinel
Start tracking the per-file commit messages. |
632 |
+ display_path) |
633 |
self._file_message_expander.set_expanded(True) |
|
634 |
self._file_message_expander.set_sensitive(True) |
|
635 |
text_buffer.set_text(message) |
|
636 |
self._last_selected_file = self._files_store.get_path(selection) |
|
278.1.17
by John Arbash Meinel
Add a * reference for why you can't change the commit selection. |
637 |
|
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
638 |
def _get_specific_files(self): |
278.1.31
by John Arbash Meinel
We can make bencode work again by a simple decode/encode step. |
639 |
"""Return the list of selected paths, and file info. |
640 |
||
641 |
:return: ([unicode paths], [{utf-8 file info}]
|
|
642 |
"""
|
|
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
643 |
self._save_current_file_message() |
644 |
files = [] |
|
645 |
records = iter(self._files_store) |
|
646 |
rec = records.next() # Skip the All Files record |
|
647 |
assert rec[0] is None, "Are we skipping the wrong record?" |
|
648 |
||
649 |
file_info = [] |
|
650 |
for record in records: |
|
278.1.43
by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons. |
651 |
if self._commit_all_changes or record[2]:# [2] checkbox |
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
652 |
file_id = record[0] # [0] file_id |
278.1.31
by John Arbash Meinel
We can make bencode work again by a simple decode/encode step. |
653 |
path = record[1] # [1] real path |
622.1.1
by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized. |
654 |
# [5] commit message
|
655 |
file_message = _sanitize_and_decode_message(record[5]) |
|
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
656 |
files.append(path.decode('UTF-8')) |
278.1.33
by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config. |
657 |
if self._enable_per_file_commits and file_message: |
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
658 |
# All of this needs to be utf-8 information
|
622.1.1
by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized. |
659 |
file_message = file_message.encode('UTF-8') |
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
660 |
file_info.append({'path':path, 'file_id':file_id, |
661 |
'message':file_message}) |
|
662 |
file_info.sort(key=lambda x:(x['path'], x['file_id'])) |
|
278.1.33
by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config. |
663 |
if self._enable_per_file_commits: |
664 |
return files, file_info |
|
665 |
else: |
|
666 |
return files, [] |
|
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
667 |
|
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
668 |
@show_bzr_error
|
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
669 |
def _on_cancel_clicked(self, button): |
670 |
""" Cancel button clicked handler. """ |
|
671 |
self._do_cancel() |
|
672 |
||
673 |
@show_bzr_error
|
|
674 |
def _on_delete_window(self, source, event): |
|
675 |
""" Delete window handler. """ |
|
676 |
self._do_cancel() |
|
677 |
||
678 |
def _do_cancel(self): |
|
679 |
"""If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit""" |
|
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
680 |
mgr = SavedCommitMessagesManager() |
681 |
self._saved_commit_messages_manager = mgr |
|
682 |
mgr.insert(self._get_global_commit_message(), |
|
683 |
self._get_specific_files()[1]) |
|
684 |
if mgr.is_not_empty(): # maybe worth saving |
|
685 |
response = self._question_dialog( |
|
686 |
_i18n('Commit cancelled'), |
|
687 |
_i18n('Do you want to save your commit messages ?'), |
|
688 |
parent=self) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
689 |
if response == Gtk.ResponseType.NO: |
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
690 |
# save nothing and destroy old comments if any
|
691 |
mgr = SavedCommitMessagesManager() |
|
692 |
mgr.save(self._wt, self._wt.branch) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
693 |
self.response(Gtk.ResponseType.CANCEL) # close window |
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
694 |
|
695 |
@show_bzr_error
|
|
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
696 |
def _on_commit_clicked(self, button): |
697 |
""" Commit button clicked handler. """ |
|
698 |
self._do_commit() |
|
699 |
||
700 |
def _do_commit(self): |
|
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
701 |
message = self._get_global_commit_message() |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
702 |
|
703 |
if message == '': |
|
606
by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest. |
704 |
response = self._question_dialog( |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
705 |
_i18n('Commit with an empty message?'), |
576.1.1
by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit |
706 |
_i18n('You can describe your commit intent in the message.'), |
707 |
parent=self) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
708 |
if response == Gtk.ResponseType.NO: |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
709 |
# Kindly give focus to message area
|
710 |
self._global_message_text_view.grab_focus() |
|
711 |
return
|
|
712 |
||
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
713 |
specific_files, file_info = self._get_specific_files() |
278.1.28
by John Arbash Meinel
Ensure that we can set per-file messages even during a merge. |
714 |
if self._pending: |
715 |
specific_files = None |
|
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
716 |
|
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
717 |
local = self._check_local.get_active() |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
718 |
|
278.1.26
by John Arbash Meinel
Handle pointless commits and trees with unknown files. |
719 |
# All we care about is if there is a single unknown, so if this loop is
|
720 |
# entered, then there are unknown files.
|
|
721 |
# TODO: jam 20071002 It seems like this should cancel the dialog
|
|
722 |
# entirely, since there isn't a way for them to add the unknown
|
|
723 |
# files at this point.
|
|
724 |
for path in self._wt.unknowns(): |
|
606
by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest. |
725 |
response = self._question_dialog( |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
726 |
_i18n("Commit with unknowns?"), |
576.1.1
by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit |
727 |
_i18n("Unknown files exist in the working tree. Commit anyway?"), |
728 |
parent=self) |
|
729 |
# Doesn't set a parent for the dialog..
|
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
730 |
if response == Gtk.ResponseType.NO: |
278.1.26
by John Arbash Meinel
Handle pointless commits and trees with unknown files. |
731 |
return
|
732 |
break
|
|
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
733 |
|
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
734 |
rev_id = None |
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
735 |
revprops = {} |
736 |
if file_info: |
|
278.1.31
by John Arbash Meinel
We can make bencode work again by a simple decode/encode step. |
737 |
revprops['file-info'] = bencode.bencode(file_info).decode('UTF-8') |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
738 |
try: |
739 |
rev_id = self._wt.commit(message, |
|
740 |
allow_pointless=False, |
|
741 |
strict=False, |
|
742 |
local=local, |
|
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
743 |
specific_files=specific_files, |
744 |
revprops=revprops) |
|
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
745 |
except errors.PointlessCommit: |
606
by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest. |
746 |
response = self._question_dialog( |
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
747 |
_i18n('Commit with no changes?'), |
748 |
_i18n('There are no changes in the working tree.' |
|
576.1.1
by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit |
749 |
' Do you want to commit anyway?'), |
750 |
parent=self) |
|
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
751 |
if response == Gtk.ResponseType.YES: |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
752 |
rev_id = self._wt.commit(message, |
753 |
allow_pointless=True, |
|
754 |
strict=False, |
|
755 |
local=local, |
|
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
756 |
specific_files=specific_files, |
757 |
revprops=revprops) |
|
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
758 |
self.committed_revision_id = rev_id |
635.2.7
by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674. |
759 |
# destroy old comments if any
|
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
760 |
SavedCommitMessagesManager().save(self._wt, self._wt.branch) |
734.1.1
by Curtis Hovey
Mechanical changes made by pygi.convert.sh. |
761 |
self.response(Gtk.ResponseType.OK) |
278.1.23
by John Arbash Meinel
Beginning to support actual commit. |
762 |
|
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
763 |
def _get_global_commit_message(self): |
764 |
buf = self._global_message_text_view.get_buffer() |
|
765 |
start, end = buf.get_bounds() |
|
734.1.4
by Curtis Hovey
Updated commit to gtk3. |
766 |
text = buf.get_text(start, end, True) |
622.1.1
by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized. |
767 |
return _sanitize_and_decode_message(text) |
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
768 |
|
769 |
def _set_global_commit_message(self, message): |
|
770 |
"""Just a helper for the test suite.""" |
|
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
771 |
if isinstance(message, unicode): |
772 |
message = message.encode('UTF-8') |
|
278.1.25
by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though. |
773 |
self._global_message_text_view.get_buffer().set_text(message) |
774 |
||
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
775 |
def _set_file_commit_message(self, message): |
776 |
"""Helper for the test suite.""" |
|
278.1.29
by John Arbash Meinel
Start testing with Unicode data. |
777 |
if isinstance(message, unicode): |
778 |
message = message.encode('UTF-8') |
|
278.1.27
by John Arbash Meinel
Add the ability to commit just specific files. |
779 |
self._file_message_text_view.get_buffer().set_text(message) |
780 |
||
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
781 |
@staticmethod
|
782 |
def _rev_to_pending_info(rev): |
|
783 |
"""Get the information from a pending merge.""" |
|
126.1.1
by Szilveszter Farkas (Phanatic)
New Commit dialog implementation (no more Glade). |
784 |
from bzrlib.osutils import format_date |
278.1.5
by John Arbash Meinel
Starting to flesh out the dialog with actual windows. |
785 |
rev_dict = {} |
786 |
rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ') |
|
787 |
rev_dict['summary'] = rev.get_summary() |
|
788 |
rev_dict['date'] = format_date(rev.timestamp, |
|
789 |
rev.timezone or 0, |
|
790 |
'original', date_fmt="%Y-%m-%d", |
|
791 |
show_offset=False) |
|
792 |
rev_dict['revision_id'] = rev.revision_id |
|
793 |
return rev_dict |
|
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
794 |