1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <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.
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.
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
34
if bzrlib.version_info[1] < 9:
35
# function deprecated after 0.9
36
from bzrlib.delta import compare_trees
38
import bzrlib.errors as errors
39
from bzrlib.workingtree import WorkingTree
41
from dialog import OliveDialog
44
""" Display Commit dialog and perform the needed actions. """
45
def __init__(self, gladefile, comm):
46
""" Initialize the Commit dialog. """
47
self.gladefile = gladefile
48
self.glade = gtk.glade.XML(self.gladefile, 'window_commit')
52
self.dialog = OliveDialog(self.gladefile)
54
# Check if current location is a branch
56
(self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
57
branch = self.wt.branch
58
except errors.NotBranchError:
64
file_id = self.wt.path2id(path)
66
self.notbranch = False
72
self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
73
if bzrlib.version_info[1] < 9:
74
self.delta = compare_trees(self.old_tree, self.wt)
76
self.delta = self.wt.changes_from(self.old_tree)
78
# Get the Commit dialog widget
79
self.window = self.glade.get_widget('window_commit')
81
# Dictionary for signal_autoconnect
82
dic = { "on_button_commit_commit_clicked": self.commit,
83
"on_button_commit_cancel_clicked": self.close }
85
# Connect the signals to the handlers
86
self.glade.signal_autoconnect(dic)
88
# Create the file list
89
self._create_file_view()
91
# Some additional widgets
92
self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
93
self.textview = self.glade.get_widget('textview_commit')
96
""" Display the Push dialog. """
98
self.dialog.error_dialog('Directory is not a branch.')
100
from olive.backend.info import is_checkout
101
if is_checkout(self.comm.get_path()):
102
# we have a checkout, so the local commit checkbox must appear
103
self.checkbutton_local.show()
105
self.textview.modify_font(pango.FontDescription("Monospace"))
109
# This code is from Jelmer Vernooij's bzr-gtk branch
110
def _create_file_view(self):
111
self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,
114
self.file_view = self.glade.get_widget('treeview_commit_select')
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)
119
self.file_view.append_column(gtk.TreeViewColumn("Commit",
121
self.file_view.append_column(gtk.TreeViewColumn("Path",
122
gtk.CellRendererText(), text=1))
123
self.file_view.append_column(gtk.TreeViewColumn("Type",
124
gtk.CellRendererText(), text=2))
126
for path, _, _ in self.delta.added:
127
self.file_store.append([ True, path, "added" ])
129
for path, _, _ in self.delta.removed:
130
self.file_store.append([ True, path, "removed" ])
132
for oldpath, _, _, _, _, _ in self.delta.renamed:
133
self.file_store.append([ True, oldpath, "renamed"])
135
for path, _, _, _, _ in self.delta.modified:
136
self.file_store.append([ True, path, "modified"])
138
def _get_specific_files(self):
140
it = self.file_store.get_iter_first()
142
if self.file_store.get_value(it, 0):
143
ret.append(self.file_store.get_value(it, 1))
144
it = self.file_store.iter_next(it)
147
# end of bzr-gtk code
149
def _toggle_commit(self, cell, path, model):
150
model[path][0] = not model[path][0]
153
def commit(self, widget):
154
textbuffer = self.textview.get_buffer()
155
start, end = textbuffer.get_bounds()
156
message = textbuffer.get_text(start, end)
158
checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
159
checkbutton_force = self.glade.get_widget('checkbutton_commit_force')
161
specific_files = self._get_specific_files()
163
self.comm.set_busy(self.window)
164
# merged from Jelmer Vernooij's olive integration branch
166
self.wt.commit(message,
167
allow_pointless=checkbutton_force.get_active(),
168
strict=checkbutton_strict.get_active(),
169
local=self.checkbutton_local.get_active(),
170
specific_files=specific_files)
171
except errors.NotBranchError:
172
self.dialog.error_dialog('Directory is not a branch.')
173
self.comm.set_busy(self.window, False)
175
except errors.LocalRequiresBoundBranch:
176
self.dialog.error_dialog('Local commit requires a bound branch.')
177
self.comm.set_busy(self.window, False)
179
except errors.PointlessCommit:
180
self.dialog.error_dialog('No changes to commit. Try force commit.')
181
self.comm.set_busy(self.window, False)
183
except errors.ConflictsInTree:
184
self.dialog.error_dialog('Conflicts in tree. Please resolve them first.')
185
self.comm.set_busy(self.window, False)
187
except errors.StrictCommitFailed:
188
self.dialog.error_dialog('Strict commit failed. There are unknown files.')
189
self.comm.set_busy(self.window, False)
191
except errors.BoundBranchOutOfDate, errmsg:
192
self.dialog.error_dialog('Bound branch is out of date: %s' % errmsg)
193
self.comm.set_busy(self.window, False)
199
self.comm.refresh_right()
201
def close(self, widget=None):
202
self.window.destroy()
added
removed
olive/frontend/gtk/commit.py
