Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

thgstrip: cleanup preview logic

Changeset 386655773202…

Parent 7ef89dec4b4e…

by Yuki KODAMA

Changes to one file · Browse files at 386655773202 Showing diff from parent 7ef89dec4b4e Diff from another changeset...

Change 1 of 8 Show Changes Only tortoisehg/​hgtk/​thgstrip.py Stacked
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
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
310
311
312
313
314
315
316
317
 # thgstrip.py - strip dialog for TortoiseHg  #  # Copyright 2009 Yuki KODAMA <endflow.net@gmail.com>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import os  import gtk  import gobject  import pango    from mercurial import hg, ui  from mercurial.node import nullrev    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, paths    from tortoisehg.hgtk import hgcmd, gtklib, gdialog  from tortoisehg.hgtk import changesetinfo as csinfo    MODE_NORMAL = 'normal'  MODE_WORKING = 'working'    class StripDialog(gtk.Dialog):   """ Dialog to strip changesets """     def __init__(self, rev=None, *pats):   """ Initialize the Dialog """   gtk.Dialog.__init__(self)   gtklib.set_tortoise_icon(self, 'menudelete.ico')   gtklib.set_tortoise_keys(self)   self.set_resizable(False)   self.set_has_separator(False)   self.connect('response', self.dialog_response)   self.timeout_queue = []     # buttons   self.stripbtn = self.add_button(_('Strip'), gtk.RESPONSE_OK)   self.closebtn = self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)     try:   repo = hg.repository(ui.ui(), path=paths.find_root())   except hglib.RepoError:   gobject.idle_add(self.destroy)   return   self.repo = repo   self.set_title(_('Strip - %s') % hglib.get_reponame(repo))     if len(pats) > 0:   rev = pats[0]   elif rev is None:   rev = 'tip'   rev = str(rev) - self.prevrev = None - self.prevnum = None + self.currev = None + self.curnum = None     # layout table   self.table = table = gtklib.LayoutTable()   self.vbox.pack_start(table, True, True, 2)     ## target revision combo   self.revcombo = gtk.combo_box_entry_new_text()   table.add_row(_('Strip:'), self.revcombo) - self.revcombo.connect('changed', lambda c: self.update_on_timeout()) + self.revcombo.connect('changed', lambda c: self.preview(queue=True))   reventry = self.revcombo.child   reventry.set_text(rev)   reventry.set_width_chars(32)   reventry.connect('activate', lambda b: self.response(gtk.RESPONSE_OK))     def createlabel():   label = gtk.Label()   label.set_alignment(0, 0.5)   label.set_size_request(-1, 24)   label.size_request()   return label     ## result label   self.resultlbl = createlabel()   table.add_row(_('Result:'), self.resultlbl, padding=False)     ## preview box   pframe = gtk.Frame()   table.add_row(None, pframe, padding=False)   pframe.set_shadow_type(gtk.SHADOW_IN)   pbox = gtk.VBox()   pframe.add(pbox)     ### preview status box   self.pstatbox = gtk.HBox()   pbox.pack_start(self.pstatbox, True, True)   pbox.pack_start(gtk.HSeparator(), True, True, 2)     #### status label   self.pstatlbl = createlabel()   self.pstatbox.pack_start(self.pstatlbl, False, False, 2)     #### show all button   self.allbtn = gtk.Button(_('Show all')) # add later   self.allbtn.connect('clicked', - lambda b: self.preview_changesets(limit=False)) + lambda b: self.preview(limit=False))     #### preview option   self.compactopt = gtk.CheckButton(_('Use compact view'))   self.pstatbox.pack_end(self.compactopt, False, False, 2)     ### changeset view   rview = gtk.ScrolledWindow()   pbox.add(rview)   rview.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   rview.set_size_request(400, 180)   rview.size_request()   self.resultbox = gtk.VBox()   rview.add_with_viewport(self.resultbox)   rview.child.set_shadow_type(gtk.SHADOW_NONE)     # prepare to show - self.preview_changesets() + self.preview()   self.stripbtn.grab_focus()   gobject.idle_add(self.after_init)     def after_init(self):   # add 'Show all' button   self.pstatbox.pack_start(self.allbtn, False, False, 4)     # CmdWidget   self.cmd = hgcmd.CmdWidget()   self.cmd.show_all()   self.cmd.hide()   self.vbox.pack_start(self.cmd, True, True, 6)     # abort button   self.abortbtn = self.add_button(_('Abort'), gtk.RESPONSE_CANCEL)   self.abortbtn.hide()     def set_notify_func(self, func, *args, **kargs):   self.notify_func = func   self.notify_args = args   self.notify_kargs = kargs   - def preview_changesets(self, rev=None, limit=True): - # validate revision + def preview(self, limit=True, queue=False): + def clear_preview(): + for child in self.resultbox.get_children(): + self.resultbox.remove(child) + def update_info(num=None): + if num is None: + info = '<span weight="bold" foreground="#880000">%s</span>' \ + % _('Unknown revision!') + else: + info = _('<span weight="bold">%s changesets</span> will' + ' be stripped') % num + self.resultlbl.set_markup(info) + def update_stat(show=None, total=None): + if show is None or total is None: + all = False + stat = _('No changesets to display') + else: + all = show == total + if all: + stat = _('Displaying all changesets') + else: + stat = _('Displaying %(count)d of %(total)d changesets') \ + % dict(count=show, total=total) + self.pstatlbl.set_text(stat) + return all + + # check revision + rev = self.get_rev()   if rev is None: - rev = self.get_rev() - if rev is None: - self.update_info() - return - if limit and self.prevrev == rev: - self.update_info(self.prevnum) # use cached count + clear_preview() + update_info() + update_stat() + self.timeout_queue = [] + self.currev = None   return - self.prevrev = rev + elif limit and self.currev == rev: # is already shown? + update_info(self.curnum) + return + elif queue: # queueing if need + def timeout(eid): + if self.timeout_queue and self.timeout_queue[-1] == eid[0]: + self.preview() + self.timeout_queue = [] + return False # don't repeat + event_id = [None] + event_id[0] = gobject.timeout_add(600, timeout, event_id) + self.timeout_queue.append(event_id[0]) + return + self.currev = rev     # enumerate all descendants   # borrowed from strip() in 'mercurial/repair.py'   cl = self.repo.changelog   tostrip = [rev,]   for r in xrange(rev + 1, len(cl)):   parents = cl.parentrevs(r)   if parents[0] in tostrip or parents[1] in tostrip:   tostrip.append(r) - self.prevnum = numstrip = len(tostrip) + self.curnum = numtotal = len(tostrip)   - # update changeset preview - for child in self.resultbox.get_children(): - self.resultbox.remove(child) - NLIMIT = 50 - if limit and numstrip > NLIMIT: - showrevs, lastrev = tostrip[:NLIMIT-1], tostrip[NLIMIT-1:][-1] - else: - showrevs, lastrev = tostrip, None - def add_info(revnum): + LIM = 50 + def add_csinfo(revnum):   info = csinfo.changesetinfo(self.repo, revnum)[1]   self.resultbox.pack_start(info, False, False, 2) - for r in showrevs: - add_info(r) - if not r == showrevs[-1]: - self.resultbox.pack_start(gtk.HSeparator()) - if lastrev: + def add_sep(): + self.resultbox.pack_start(gtk.HSeparator()) + def add_snip():   snipbox = gtk.HBox()   self.resultbox.pack_start(snipbox, False, False, 4)   spacer = gtk.Label()   snipbox.pack_start(spacer, False, False)   spacer.set_width_chars(24)   sniplbl = gtk.Label()   snipbox.pack_start(sniplbl, False, False)   sniplbl.set_markup('<span size="large" weight="heavy"'   ' font_family="monospace">...</span>')   sniplbl.set_angle(90)   snipbox.pack_start(gtk.Label()) - add_info(lastrev) + + # update changeset preview + if limit and numtotal > LIM: + toshow, lastrev = tostrip[:LIM-1], tostrip[LIM-1:][-1] + else: + toshow, lastrev = tostrip, None + numshow = len(toshow) + (lastrev and 1 or 0) + clear_preview() + for r in toshow: + add_csinfo(r) + if not r == toshow[-1]: # no need to append to the last + add_sep() + if lastrev: + add_snip() + add_csinfo(lastrev)   self.resultbox.show_all()     # update info label - self.update_info(numstrip) + update_info(numtotal)   - # update preview status - numshow = len(showrevs) + (lastrev and 1 or 0) - notall = numstrip > numshow - if notall: - text = _('Displaying %(count)d of %(total)d changesets') \ - % dict(count=numshow, total=numstrip) - else: - text = _('Displaying all changesets') - self.pstatlbl.set_text(text) - self.allbtn.set_property('visible', notall) - - def update_info(self, num=None): - if num is None: - text = '<span weight="bold" foreground="#880000">%s</span>' \ - % _('Unknown revision!') - else: - text = _('<span weight="bold">%s changesets</span> will' - ' be stripped') % num - self.resultlbl.set_markup(text) + # update preview status & button + all = update_stat(numshow, numtotal) + self.allbtn.set_property('visible', not all)     def dialog_response(self, dialog, response_id):   def abort():   self.cmd.stop()   self.cmd.show_log()   self.switch_to(MODE_NORMAL, cmd=False)   # Strip button   if response_id == gtk.RESPONSE_OK:   self.strip()   # Close button or dialog closing by the user   elif response_id in (gtk.RESPONSE_CLOSE, gtk.RESPONSE_DELETE_EVENT):   if self.cmd.is_alive():   ret = gdialog.Confirm(_('Confirm Abort'), [], self,   _('Do you want to abort?')).run()   if ret == gtk.RESPONSE_YES:   abort()   else:   self.destroy()   return # close dialog   # Abort button   elif response_id == gtk.RESPONSE_CANCEL:   abort()   else:   raise _('unexpected response id: %s') % response_id     self.run() # don't close dialog     def get_rev(self):   """ Return integer revision number or None """   revstr = self.revcombo.get_active_text()   if len(revstr) == 0:   return None   try:   revnum = self.repo[revstr].rev()   except (hglib.RepoError, hglib.LookupError):   return None   return revnum   - def update_on_timeout(self): - rev = self.get_rev() - if rev is None: - self.update_info() - self.timeout_queue = [] - return - def timeout(eid, revnum): - if self.timeout_queue and self.timeout_queue[-1] == eid[0]: - self.preview_changesets(rev=revnum) - self.timeout_queue = [] - return False # don't repeat - event_id = [None] - event_id[0] = gobject.timeout_add(600, timeout, event_id, rev) - self.timeout_queue.append(event_id[0]) -   def switch_to(self, mode, cmd=True):   if mode == MODE_NORMAL:   normal = True   self.closebtn.grab_focus()   elif mode == MODE_WORKING:   normal = False   self.abortbtn.grab_focus()   else:   raise _('unknown mode name: %s') % mode   working = not normal     self.table.set_sensitive(normal)   self.stripbtn.set_property('visible', normal)   self.closebtn.set_property('visible', normal)   if cmd:   self.cmd.set_property('visible', working)   self.abortbtn.set_property('visible', working)     def strip(self):   revstr = self.revcombo.get_active_text()   cmdline = ['hg', 'strip', '--verbose', revstr]   def cmd_done(returncode, useraborted):   self.switch_to(MODE_NORMAL, cmd=False)   if returncode == 0:   if hasattr(self, 'notify_func'):   self.notify_func(*self.notify_args, **self.notify_kargs)   if not self.cmd.is_show_log():   self.response(gtk.RESPONSE_CLOSE)   self.cmd.set_result(_('Stripped successfully'), style='ok')   elif useraborted:   self.cmd.set_result(_('Canceled stripping'), style='error')   else:   self.cmd.set_result(_('Failed to strip'), style='error')   self.switch_to(MODE_WORKING)   self.cmd.execute(cmdline, cmd_done)    def run(ui, *pats, **opts):   return StripDialog(None, *pats)