Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

add a branch name column to the tree view

Changeset 179439f723df…

Parent 261f240e4c35…

by Henrik Stuart

Changes to 3 files · Browse files at 179439f723df Showing diff from parent 261f240e4c35 Diff from another changeset...

Change 1 of 4 Show Entire File hggtk/​history.py Stacked
 
146
147
148
 
 
 
 
 
 
149
150
151
 
219
220
221
222
 
 
223
224
225
 
256
257
258
259
 
260
261
262
 
266
267
268
 
 
 
269
270
271
 
146
147
148
149
150
151
152
153
154
155
156
157
 
225
226
227
 
228
229
230
231
232
 
263
264
265
 
266
267
268
269
 
273
274
275
276
277
278
279
280
281
@@ -146,6 +146,12 @@
  button.set_active(self._show_date)   button.set_draw_as_radio(True)   menu.append(button) + button = gtk.CheckMenuItem("Show Branch") + button.connect("toggled", self.toggle_view_column, + 'branch-column-visible') + button.set_active(self._show_branch) + button.set_draw_as_radio(True) + menu.append(button)   menu.show_all()   return menu   @@ -219,7 +225,8 @@
  self._hpaned.get_position(),   self.graphview.get_property('rev-column-visible'),   self.graphview.get_property('date-column-visible'), - self.graphview.get_property('id-column-visible')) + self.graphview.get_property('id-column-visible'), + self.graphview.get_property('branch-column-visible'))   return settings     def get_graphlimit(self, suggestion): @@ -256,7 +263,7 @@
  GDialog.load_settings(self, settings)   self._setting_vpos = -1   self._setting_hpos = -1 - self._show_rev, self._show_date, self._show_id = True, True, False + self._show_rev, self._show_date, self._show_id, self._show_branch = True, True, False, False   if settings:   data = settings['glog']   if type(data) == int: @@ -266,6 +273,9 @@
  elif len(data) == 5:   (self._setting_vpos, self._setting_hpos,   self._show_rev, self._show_date, self._show_id) = data + elif len(data) == 6: + (self._setting_vpos, self._setting_hpos, + self._show_rev, self._show_date, self._show_id, self._show_branch) = data     def reload_log(self, filteropts={}):   """Send refresh event to treeview object"""
Change 1 of 4 Show Entire File hggtk/​vis/​treemodel.py Stacked
 
42
43
44
 
45
46
47
48
49
50
 
51
52
53
 
76
77
78
 
79
80
81
 
119
120
121
 
122
 
123
124
125
 
126
127
128
 
143
144
145
 
146
147
 
148
149
150
 
 
151
152
153
 
42
43
44
45
46
47
48
49
50
51
52
53
54
55
 
78
79
80
81
82
83
84
 
122
123
124
125
126
127
128
129
130
131
132
133
134
 
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
@@ -42,12 +42,14 @@
 TAGS = 11  FGCOLOR = 12  HEXID = 13 +BRANCHES = 14    class TreeModel(gtk.GenericTreeModel):     def __init__ (self, repo, graphdata, color_func):   gtk.GenericTreeModel.__init__(self)   self.revisions = {} + self.branch_names = {}   self.repo = repo   self.parents = [x.rev() for x in repo.changectx(None).parents()]   self.heads = [repo.changelog.rev(x) for x in repo.heads()] @@ -76,6 +78,7 @@
  if index == TAGS: return gobject.TYPE_STRING   if index == FGCOLOR: return gobject.TYPE_STRING   if index == HEXID: return gobject.TYPE_STRING + if index == BRANCHES: return gobject.TYPE_STRING     def on_get_iter(self, path):   return path[0] @@ -119,10 +122,13 @@
  branches = webutil.nodebranchdict(self.repo, ctx)   inbranches = webutil.nodeinbranch(self.repo, ctx)   bstr = '' + branchstr = ''   for branch in branches: + branchstr += branch['name']   bstr += '<span background="#aaffaa"> %s </span> ' % \   branch['name']   for branch in inbranches: + branchstr += branch['name']   bstr += '<span background="#d5dde6"> %s </span> ' % \   branch['name']   @@ -143,11 +149,15 @@
  author, date, None, parents, wc_parent, head, taglist,   color, short(node))   self.revisions[revid] = revision + self.branch_names[revid] = branchstr   else:   revision = self.revisions[revid] + branchstr = self.branch_names[revid]     if column == REVISION:   return revision + if column == BRANCHES: + return branchstr   return revision[column]     def on_iter_next(self, rowref):
Change 1 of 4 Show Entire File hggtk/​vis/​treeview.py Stacked
 
56
57
58
 
 
 
 
 
 
59
60
61
 
203
204
205
 
 
206
207
208
 
219
220
221
 
 
222
223
224
 
355
356
357
 
 
 
 
 
 
 
 
 
 
 
 
 
358
359
360
 
56
57
58
59
60
61
62
63
64
65
66
67
 
209
210
211
212
213
214
215
216
 
227
228
229
230
231
232
233
234
 
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
@@ -56,6 +56,12 @@
  'Show revision ID column',   False,   gobject.PARAM_READWRITE), + + 'branch-column-visible': (gobject.TYPE_BOOLEAN, + 'Branch', + 'Show branch', + False, + gobject.PARAM_READWRITE),   }     __gsignals__ = { @@ -203,6 +209,8 @@
  return self.id_column.get_visible()   elif property.name == 'rev-column-visible':   return self.rev_column.get_visible() + elif property.name == 'branch-column-visible': + return self.branch_column.get_visible()   elif property.name == 'repo':   return self.repo   elif property.name == 'limit': @@ -219,6 +227,8 @@
  self.id_column.set_visible(value)   elif property.name == 'rev-column-visible':   self.rev_column.set_visible(value) + elif property.name == 'branch-column-visible': + self.branch_column.set_visible(value)   elif property.name == 'repo':   self.repo = value   elif property.name == 'limit': @@ -355,6 +365,19 @@
  self.treeview.append_column(self.id_column)     cell = gtk.CellRendererText() + cell.set_property("width-chars", 15) + cell.set_property("ellipsize", pango.ELLIPSIZE_END) + self.branch_column = gtk.TreeViewColumn("Branch") + self.branch_column.set_visible(False) + self.branch_column.set_resizable(True) + self.branch_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + self.branch_column.set_fixed_width(cell.get_size(self.treeview)[2]) + self.branch_column.pack_start(cell, expand=True) + self.branch_column.add_attribute(cell, "foreground", treemodel.FGCOLOR) + self.branch_column.add_attribute(cell, "markup", treemodel.BRANCHES) + self.treeview.append_column(self.branch_column) + cell = gtk.CellRendererText() +   cell.set_property("width-chars", 65)   cell.set_property("ellipsize", pango.ELLIPSIZE_END)   self.msg_column = gtk.TreeViewColumn("Summary")