Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.6, 0.7, and 0.7.1

history: convert tag column to display changeset id

Changeset 25e2fe12f5e3…

Parent 026284bad055…

by TK Soh

Changes to 3 files · Browse files at 25e2fe12f5e3 Showing diff from parent 026284bad055 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
129
130
131
132
 
133
134
135
136
137
138
 
139
140
141
 
 
142
143
144
 
129
130
131
 
132
133
134
135
136
137
 
138
139
 
 
140
141
142
143
144
@@ -129,16 +129,16 @@
  def _view_menu(self):   menu = gtk.Menu()   - button = gtk.CheckMenuItem("Show Ids") + button = gtk.CheckMenuItem("Show Rev")   button.connect("toggled", self.toggle_view_column,   'rev-column-visible')   button.set_active(True)   button.set_draw_as_radio(True)   menu.append(button) - button = gtk.CheckMenuItem("Show Tags") + button = gtk.CheckMenuItem("Show ID")   button.connect("toggled", self.toggle_view_column, - 'tags-column-visible') - button.set_active(True) + 'id-column-visible') + button.set_active(False)   button.set_draw_as_radio(True)   menu.append(button)   button = gtk.CheckMenuItem("Show Date")
Change 1 of 4 Show Entire File hggtk/​vis/​treemodel.py Stacked
 
12
13
14
 
15
16
17
 
41
42
43
 
44
45
46
 
75
76
77
 
78
79
80
 
120
121
122
123
 
124
125
126
 
12
13
14
15
16
17
18
 
42
43
44
45
46
47
48
 
77
78
79
80
81
82
83
 
123
124
125
 
126
127
128
129
@@ -12,6 +12,7 @@
 import re  from time import (strftime, gmtime)  from mercurial import util +from mercurial.node import short    # FIXME: dirty hack to import toutf() from hggtk.hglib.  # @@ -41,6 +42,7 @@
 TAGS = 11  MARKED = 12  FGCOLOR = 13 +HEXID = 14    class TreeModel(gtk.GenericTreeModel):   @@ -75,6 +77,7 @@
  if index == TAGS: return gobject.TYPE_STRING   if index == MARKED: return gobject.TYPE_BOOLEAN   if index == FGCOLOR: return gobject.TYPE_STRING + if index == HEXID: return gobject.TYPE_STRING     def on_get_iter(self, path):   return path[0] @@ -120,7 +123,7 @@
    revision = (None, node, revid, None, summary,   author, date, None, parents, wc_parent, head, taglist, - None, color) + None, color, short(node))   self.revisions[revid] = revision   else:   revision = self.revisions[revid]
Change 1 of 4 Show Changes Only hggtk/​vis/​treeview.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
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
 
323
324
325
326
327
328
329
330
331
332
 
 
 
 
 
 
 
 
 
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
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
318
319
320
321
 
322
323
 
 
 
 
 
 
 
 
 
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
 ''' Mercurial revision DAG visualization library     Implements a gtk.TreeModel which visualizes a Mercurial repository   revision history.    Portions of this code stolen mercilessly from bzr-gtk visualization  dialog. Other portions stolen from graphlog extension.  '''    import gtk  import gobject  import pango  import treemodel  import re  from graphcell import CellRendererGraph  from revgraph import *  from mercurial.node import hex      class TreeView(gtk.ScrolledWindow):     __gproperties__ = {   'repo': (gobject.TYPE_PYOBJECT,   'Repository',   'The Mercurial repository being visualized',   gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),     'limit': (gobject.TYPE_PYOBJECT,   'Revision Display Limit',   'The maximum number of revisions to display',   gobject.PARAM_READWRITE),     'revision': (gobject.TYPE_PYOBJECT,   'Revision',   'The currently selected revision',   gobject.PARAM_READWRITE),     'revision-number': (gobject.TYPE_STRING,   'Revision number',   'The number of the selected revision',   '',   gobject.PARAM_READABLE),     'date-column-visible': (gobject.TYPE_BOOLEAN,   'Date',   'Show date column',   False,   gobject.PARAM_READWRITE),   'rev-column-visible': (gobject.TYPE_BOOLEAN,   'Rev', - 'Show revision id column', + 'Show revision number column',   False,   gobject.PARAM_READWRITE), - 'tags-column-visible': (gobject.TYPE_BOOLEAN, + 'id-column-visible': (gobject.TYPE_BOOLEAN,   'Tags', - 'Show tags column', + 'Show revision ID column',   False,   gobject.PARAM_READWRITE),   }     __gsignals__ = {   'revisions-loaded': (gobject.SIGNAL_RUN_FIRST,   gobject.TYPE_NONE,   ()),   'revision-selected': (gobject.SIGNAL_RUN_FIRST,   gobject.TYPE_NONE,   ())   }     def __init__(self, repo, limit=500, pbar=None):   """Create a new TreeView.     :param repo: Repository object to show   """   gtk.ScrolledWindow.__init__(self)     self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   self.set_shadow_type(gtk.SHADOW_IN)     self.batchsize = limit   self.repo = repo   self.currev = None   self.marked_rev = None   self.construct_treeview()   self.pbar = pbar     def search_in_tree(self, model, column, key, iter, data):   """Searches all fields shown in the tree when the user hits crtr+f,   not just the ones that are set via tree.set_search_column.   Case insensitive   """   key = key.lower()     node = hex(model.get_value(iter, treemodel.REVISION)[treemodel.NODE])   if node.startswith(key):   return False     for col in (treemodel.REVID, treemodel.TAGS, treemodel.COMMITER,   treemodel.MESSAGE):   if key in model.get_value(iter, col).lower():   return False   return True     def create_log_generator(self, graphcol, pats, opts):   if 'filehist' in opts:   self.grapher = filelog_grapher(self.repo, opts['filehist'])   elif graphcol:   end = 0   if pats is not None: # branch name   b = self.repo.branchtags()   if pats in b:   node = b[pats]   start = self.repo.changelog.rev(node)   else:   start = len(self.repo.changelog) - 1   elif opts['revrange']:   if len(opts['revrange']) >= 2:   start, end = opts['revrange']   else:   start = opts['revrange'][0]   end = start   else:   start = len(self.repo.changelog) - 1   self.grapher = revision_grapher(self.repo, start, end, pats)   elif opts.get('revs', None):   self.grapher = dumb_log_generator(self.repo, opts['revs'])   else:   self.grapher = filtered_log_generator(self.repo, pats, opts)   self.show_graph = graphcol   self.graphdata = []   self.index = {}   self.max_cols = 1   self.model = None   self.limit = self.batchsize     def populate(self, revision=None):   """Fill the treeview with contents.   """   stopped = False   try:   (rev, node, lines, parents) = self.grapher.next()   self.max_cols = max(self.max_cols, len(lines))   self.index[rev] = len(self.graphdata)   self.graphdata.append( (rev, node, lines, parents) )   if self.model:   rowref = self.model.get_iter(len(self.graphdata)-1)   path = self.model.get_path(rowref)   self.model.row_inserted(path, rowref)   except StopIteration:   stopped = True     if stopped:   pass   elif self.limit is None:   return True   elif len(self.graphdata) < self.limit:   return True     if not len(self.graphdata):   self.treeview.set_model(None)   self.pbar.end()   self.emit('revisions-loaded')   return False     if not self.model:   self.model = treemodel.TreeModel(self.repo, self.graphdata,   self.color_func)   self.treeview.set_model(self.model)   self.model.marked_rev = self.marked_rev     self.graph_cell.columns_len = self.max_cols   width = self.graph_cell.get_size(self.treeview)[2]   if width > 500:   width = 500   self.graph_column.set_fixed_width(width)   self.graph_column.set_max_width(width)   self.graph_column.set_visible(self.show_graph)     if stopped:   self.emit('revisions-loaded')   if revision is not None:   self.set_revision_id(revision[treemodel.REVID])   self.pbar.end()   return False     def do_get_property(self, property):   if property.name == 'date-column-visible':   return self.date_column.get_visible() - elif property.name == 'tags-column-visible': - return self.tag_column.get_visible() + elif property.name == 'id-column-visible': + return self.id_column.get_visible()   elif property.name == 'rev-column-visible':   return self.rev_column.get_visible()   elif property.name == 'repo':   return self.repo   elif property.name == 'limit':   return self.limit   elif property.name == 'revision':   return self.currev   else:   raise AttributeError, 'unknown property %s' % property.name     def do_set_property(self, property, value):   if property.name == 'date-column-visible':   self.date_column.set_visible(value) - elif property.name == 'tags-column-visible': - self.tag_column.set_visible(value) + elif property.name == 'id-column-visible': + self.id_column.set_visible(value)   elif property.name == 'rev-column-visible':   self.rev_column.set_visible(value)   elif property.name == 'repo':   self.repo = value   elif property.name == 'limit':   self.batchsize = value   elif property.name == 'revision':   self.set_revision_id(value)   else:   raise AttributeError, 'unknown property %s' % property.name     def next_revision_batch(self):   self.limit += self.batchsize   self.pbar.begin()   gobject.idle_add(self.populate)     def load_all_revisions(self):   self.limit = None   self.pbar.begin()   gobject.idle_add(self.populate)     def get_revision(self):   """Return revision id of currently selected revision, or None."""   return self.get_property('revision')     def scroll_to_revision(self, revid):   if revid in self.index:   row = self.index[revid]   self.treeview.scroll_to_cell(row, use_align=True, row_align=0.5)     def set_revision_id(self, revid):   """Change the currently selected revision.     :param revid: Revision id of revision to display.   """   if revid in self.index:   row = self.index[revid]   self.treeview.set_cursor(row)   self.treeview.grab_focus()     def get_parents(self):   """Return the parents of the currently selected revision.     :return: list of revision ids.   """   return self.get_property('parents')     def refresh(self, graphcol, pats, opts):   self.repo.invalidate()   self.repo.dirstate.invalidate()   if len(self.repo.changelog) > 0:   self.create_log_generator(graphcol, pats, opts)   self.pbar.begin()   gobject.idle_add(self.populate, self.get_revision())   else:   self.pbar.set_status_text('Repository is empty')     def construct_treeview(self):   self.treeview = gtk.TreeView()   self.treeview.set_rules_hint(True)   self.treeview.set_reorderable(False)   self.treeview.set_enable_search(True)   self.treeview.set_search_equal_func(self.search_in_tree, None)     # If user has configured authorcolor in [tortoisehg], color   # rows by author matches   self.author_pats = []   for k, v in self.repo.ui.configitems('tortoisehg'):   if not k.startswith('authorcolor.'): continue   pat = k[12:]   self.author_pats.append((re.compile(pat, re.I), v))   if self.author_pats or self.repo.ui.configbool('tortoisehg',   'authorcolor'):   self.color_func = self.text_color_author   else:   self.color_func = self.text_color_orig     # Fix old PyGTK (<1.12) bug - by JAM   set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)   if set_tooltip is not None:   set_tooltip(treemodel.MESSAGE)     self.treeview.get_selection().set_mode(gtk.SELECTION_SINGLE)   self.treeview.connect("cursor-changed", self._on_selection_changed)   self.treeview.set_property('fixed-height-mode', True)   self.treeview.show()   self.add(self.treeview)     self.graph_cell = CellRendererGraph()   self.graph_column = gtk.TreeViewColumn('Graph')   self.graph_column.set_resizable(True)   self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)   self.graph_column.pack_start(self.graph_cell, expand=False)   self.graph_column.add_attribute(self.graph_cell,   "node", treemodel.NODE)   self.graph_column.add_attribute(self.graph_cell,   "in-lines", treemodel.LAST_LINES)   self.graph_column.add_attribute(self.graph_cell,   "out-lines", treemodel.LINES)   self.treeview.append_column(self.graph_column)     cell = gtk.CellRendererText()   cell.set_property("width-chars", 8)   cell.set_property("ellipsize", pango.ELLIPSIZE_END)   self.rev_column = gtk.TreeViewColumn("Rev")   self.rev_column.set_visible(False)   self.rev_column.set_resizable(True)   self.rev_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)   self.rev_column.set_fixed_width(cell.get_size(self.treeview)[2])   self.rev_column.pack_start(cell, expand=True)   self.rev_column.add_attribute(cell, "text", treemodel.REVID)   #self.rev_column.add_attribute(cell, "foreground", treemodel.FGCOLOR)   self.treeview.append_column(self.rev_column)     cell = gtk.CellRendererText() - cell.set_property("width-chars", 10) + cell.set_property("width-chars", 15)   cell.set_property("ellipsize", pango.ELLIPSIZE_END) - self.tag_column = gtk.TreeViewColumn("Tag") - self.tag_column.set_visible(False) - self.tag_column.set_resizable(True) - self.tag_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - self.tag_column.set_fixed_width(cell.get_size(self.treeview)[2]) - self.tag_column.pack_start(cell, expand=True) - self.tag_column.add_attribute(cell, "text", treemodel.TAGS) - self.tag_column.add_attribute(cell, "foreground", treemodel.FGCOLOR) - self.treeview.append_column(self.tag_column) + self.id_column = gtk.TreeViewColumn("ID") + self.id_column.set_visible(False) + self.id_column.set_resizable(True) + self.id_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + self.id_column.set_fixed_width(cell.get_size(self.treeview)[2]) + self.id_column.pack_start(cell, expand=True) + self.id_column.add_attribute(cell, "text", treemodel.HEXID) + self.id_column.add_attribute(cell, "foreground", treemodel.FGCOLOR) + self.treeview.append_column(self.id_column)     cell = gtk.CellRendererText()   mcell = gtk.CellRendererPixbuf()   pcell = gtk.CellRendererPixbuf()   hcell = gtk.CellRendererPixbuf()   cell.set_property("width-chars", 65)   cell.set_property("ellipsize", pango.ELLIPSIZE_END)   self.msg_column = gtk.TreeViewColumn("Summary")   self.msg_column.set_resizable(True)   self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)   self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])   self.msg_column.pack_start(mcell, expand=False)   self.msg_column.pack_start(pcell, expand=False)   self.msg_column.pack_start(hcell, expand=False)   self.msg_column.pack_end(cell, expand=True)   self.msg_column.add_attribute(cell, "foreground", treemodel.FGCOLOR)   self.msg_column.add_attribute(cell, "markup", treemodel.MESSAGE)   self.msg_column.add_attribute(pcell, "visible", treemodel.WCPARENT)   self.msg_column.add_attribute(hcell, "visible", treemodel.HEAD)   self.msg_column.add_attribute(mcell, "visible", treemodel.MARKED)   mcell.set_property('stock-id', gtk.STOCK_GO_FORWARD)   pcell.set_property('stock-id', gtk.STOCK_HOME)   hcell.set_property('stock-id', gtk.STOCK_EXECUTE)   self.treeview.append_column(self.msg_column)     cell = gtk.CellRendererText()   cell.set_property("width-chars", 20)   cell.set_property("ellipsize", pango.ELLIPSIZE_END)   self.committer_column = gtk.TreeViewColumn("User")   self.committer_column.set_resizable(True)   self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)   self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])   self.committer_column.pack_start(cell, expand=True)   self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)   self.committer_column.add_attribute(cell, "foreground",   treemodel.FGCOLOR)   self.treeview.append_column(self.committer_column)     cell = gtk.CellRendererText()   cell.set_property("width-chars", 20)   cell.set_property("ellipsize", pango.ELLIPSIZE_END)   self.date_column = gtk.TreeViewColumn("Date")   self.date_column.set_visible(False)   self.date_column.set_resizable(True)   self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)   self.date_column.set_fixed_width(cell.get_size(self.treeview)[2])   self.date_column.pack_start(cell, expand=True)   self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)   self.date_column.add_attribute(cell, "foreground", treemodel.FGCOLOR)   self.treeview.append_column(self.date_column)     def set_mark_rev(self, rev):   '''User has marked a revision for diff'''   self.marked_rev = long(rev)   self.msg_column.queue_resize()   if self.model:   self.model.marked_rev = self.marked_rev     def get_mark_rev(self):   return self.marked_rev     def text_color_orig(self, parents, rev, author):   if len(parents) == 2:   # mark merge changesets green   return '#006400'   elif len(parents) == 1:   # detect non-trivial parent   if long(rev) != parents[0]+1:   return '#900000'   else:   return 'black'   else:   return 'black'     colors = '''black blue deeppink mediumorchid blue burlywood4 goldenrod   slateblue red2 navy dimgrey'''.split()   color_cache = {}     def text_color_author(self, parents, rev, author):   for re, v in self.author_pats:   if (re.search(author)):   return v   if author not in self.color_cache:   color = self.colors[len(self.color_cache.keys()) % len(self.colors)]   self.color_cache[author] = color   return self.color_cache[author]     def _on_selection_changed(self, treeview):   """callback for when the treeview changes."""   (path, focus) = treeview.get_cursor()   if path is not None and self.model is not None:   iter = self.model.get_iter(path)   self.currev = self.model.get_value(iter, treemodel.REVISION)   self.emit('revision-selected')