Kiln » TortoiseHg » TortoiseHg
Clone URL:  
commit.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
# # commit.py - commit dialog for TortoiseHg # # Copyright 2007 Brad Schick, brad at gmail . com # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com> # import os import threading import StringIO import sys import shutil import tempfile import datetime import cPickle import pygtk pygtk.require('2.0') import gtk import gobject import pango from mercurial.i18n import _ from mercurial.node import * from mercurial import cmdutil, util, ui, hg, commands, patch from hgext import extdiff from shlib import shell_notify from gdialog import * from gtools import cmdtable from status import GStatus from hgcmd import CmdDialog class GCommit(GStatus): """GTK+ based dialog for displaying repository status and committing changes. Also provides related operations like add, delete, remove, revert, refresh, ignore, diff, and edit. """ ### Overrides of base class methods ### def parse_opts(self): GStatus.parse_opts(self) # Need an entry, because extdiff code expects it if not self.test_opt('rev'): self.opts['rev'] = '' if self.test_opt('message'): buffer = gtk.TextBuffer() buffer.set_text(self.opts['message']) self.text.set_buffer(buffer) if self.test_opt('logfile'): buffer = gtk.TextBuffer() buffer.set_text('Comment will be read from file ' + self.opts['logfile']) self.text.set_buffer(buffer) self.text.set_sensitive(False) def get_title(self): return os.path.basename(self.repo.root) + ' commit ' + ' '.join(self.pats) + ' ' + self.opts['user'] + ' ' + self.opts['date'] def get_icon(self): return 'menucommit.ico' def auto_check(self): if self.test_opt('check'): for entry in self.model : if entry[1] in 'MAR': entry[0] = True def save_settings(self): settings = GStatus.save_settings(self) settings['gcommit'] = self._vpaned.get_position() return settings def load_settings(self, settings): GStatus.load_settings(self, settings) if settings: self._setting_vpos = settings['gcommit'] else: self._setting_vpos = -1 def get_tbbuttons(self): tbbuttons = GStatus.get_tbbuttons(self) tbbuttons.insert(2, self.make_toolbutton(gtk.STOCK_OK, '_Commit', self._commit_clicked, tip='commit')) return tbbuttons def changed_cb(self, combobox): model = combobox.get_model() index = combobox.get_active() if index >= 0: buffer = self.text.get_buffer() begin, end = buffer.get_bounds() cur_msg = buffer.get_text(begin, end) if len(cur_msg): response = Confirm('Discard Message', [], self, 'Discard current commit message?').run() if response != gtk.RESPONSE_YES: return buffer.set_text(model[index][1]) def _update_recent_messages(self, msg=None): if msg is not None: self._mru_messages.add(msg) self.settings.write() liststore = self.msg_cbbox.get_model() liststore.clear() for msg in self._mru_messages: sumline = msg.split("\n")[0] liststore.append([sumline, msg]) #self.msg_cbbox.set_active(-1) def get_body(self): status_body = GStatus.get_body(self) vbox = gtk.VBox() mbox = gtk.HBox() label = gtk.Label('Recent Commit Messages: ') mbox.pack_start(label, False, False, 2) self.msg_cbbox = gtk.combo_box_new_text() liststore = gtk.ListStore(str, str) self.msg_cbbox = gtk.ComboBox(liststore) cell = gtk.CellRendererText() self.msg_cbbox.pack_start(cell, True) self.msg_cbbox.add_attribute(cell, 'text', 0) #cell = gtk.CellRendererText() #self.msg_cbbox.pack_start(cell, True) #self.msg_cbbox.add_attribute(cell, 'text', 1) mbox.pack_start(self.msg_cbbox) vbox.pack_start(mbox, False, False) self._mru_messages = self.settings.mrul('recent_messages') self._update_recent_messages() self.msg_cbbox.connect('changed', self.changed_cb) frame = gtk.Frame() frame.set_shadow_type(gtk.SHADOW_ETCHED_IN) scroller = gtk.ScrolledWindow() scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) frame.add(scroller) vbox.pack_start(frame) self.text = gtk.TextView() self.text.set_wrap_mode(gtk.WRAP_WORD) self.text.modify_font(pango.FontDescription(self.fontcomment)) scroller.add(self.text) self._vpaned = gtk.VPaned() self._vpaned.add1(vbox) self._vpaned.add2(status_body) self._vpaned.set_position(self._setting_vpos) return self._vpaned def get_menu_info(self): """Returns menu info in this order: merge, addrem, unknown, clean, ignored, deleted """ merge, addrem, unknown, clean, ignored, deleted = GStatus.get_menu_info(self) return (merge + (('_commit', self._commit_file),), addrem + (('_commit', self._commit_file),), unknown + (('_commit', self._commit_file),), clean, ignored, deleted + (('_commit', self._commit_file),)) def should_live(self, widget=None, event=None): # If there are more than a few character typed into the commit # message, ask if the exit should continue. live = False if self.text.get_buffer().get_char_count() > 10: dialog = Confirm('Exit', [], self, 'Discard commit message and exit?') if dialog.run() == gtk.RESPONSE_NO: live = True return live ### End of overridable methods ### def _commit_clicked(self, toolbutton, data=None): if not self._ready_message(): return True commitable = 'MAR' addremove_list = self._relevant_files('?!') if len(addremove_list) and self._should_addremove(addremove_list): commitable += '?!' commit_list = self._relevant_files(commitable) if len(commit_list) > 0: self._hg_commit(commit_list) else: Prompt('Nothing Commited', 'No committable files selected', self).run() return True def _commit_file(self, stat, file): if self._ready_message(): if stat not in '?!' or self._should_addremove([file]): self._hg_commit([file]) return True def _should_addremove(self, files): if self.test_opt('addremove'): return True else: response = Confirm('Add/Remove', files, self).run() if response == gtk.RESPONSE_YES: # This will stay set for further commits (meaning no more prompts). Problem? self.opts['addremove'] = True return True return False def _ready_message(self): begin, end = self.text.get_buffer().get_bounds() message = self.text.get_buffer().get_text(begin, end) if not self.test_opt('logfile') and not message: Prompt('Nothing Commited', 'Please enter commit message', self).run() self.text.grab_focus() return False else: if not self.test_opt('logfile'): self.opts['message'] = message return True def _hg_commit(self, files): if not self.repo.ui.config('ui', 'username'): Prompt('Username not configured', 'Please enter a username', self).run() from thgconfig import ConfigDialog dlg = ConfigDialog(self.repo.root, False) dlg.show_all() dlg.focus_field('ui.username') dlg.run() dlg.hide() self.repo = hg.repository(ui.ui(), self.repo.root) self.ui = self.repo.ui # call the threaded CmdDialog to do the commit, so the the large commit # won't get locked up by potential large commit. CmdDialog will also # display the progress of the commit operation. cmdline = ["hg", "commit", "--verbose", "--repository", self.repo.root] if self.opts['addremove']: cmdline += ['--addremove'] cmdline += ['--message', self.opts['message']] cmdline += [self.repo.wjoin(x) for x in files] dialog = CmdDialog(cmdline, True) dialog.set_transient_for(self) dialog.run() dialog.hide() # refresh overlay icons and commit dialog self.text.set_buffer(gtk.TextBuffer()) self._update_recent_messages(self.opts['message']) shell_notify([self.cwd] + files) self.reload_status() def launch(root='', files=[], cwd='', main=True): u = ui.ui() u.updateopts(debug=False, traceback=False) repo = hg.repository(u, path=root) ct = repo.ui.config('tortoisehg', 'commit', 'internal') if ct != 'internal': from hglib import thgdispatch args = ['--repository', root, ct] try: ret = thgdispatch(repo.ui, args=args) except SystemExit: pass return None cmdoptions = { 'user':'', 'date':'', 'modified':True, 'added':True, 'removed':True, 'deleted':True, 'unknown':False, 'ignored':False, 'exclude':[], 'include':[], 'check': False, 'git':False, 'logfile':'', 'addremove':False, } dialog = GCommit(u, repo, cwd, files, cmdoptions, main) dialog.display() return dialog def run(root='', files=[], cwd='', **opts): # If no files or directories were selected, take current dir # TODO: Not clear if this is best; user may expect repo wide if not files and cwd: files = [cwd] if launch(root, files, cwd, True): gtk.gdk.threads_init() gtk.gdk.threads_enter() gtk.main() gtk.gdk.threads_leave() if __name__ == "__main__": import sys opts = {} opts['root'] = len(sys.argv) > 1 and sys.argv[1] or '' run(**opts)