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

history: add optional UTC column, defaults to hidden

Fixes #172

Changeset cbaeef188dab…

Parent f978eeb99f20…

by Steve Borho

Changes to 4 files · Browse files at cbaeef188dab Showing diff from parent f978eeb99f20 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​history.py Stacked
 
165
166
167
168
 
169
170
171
172
173
 
 
 
 
 
 
174
175
176
 
274
275
276
277
 
278
279
280
 
304
305
306
307
 
308
309
310
 
165
166
167
 
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
 
280
281
282
 
283
284
285
286
 
310
311
312
 
313
314
315
316
@@ -165,12 +165,18 @@
  button.set_active(self.showcol.get('id', False))   button.set_draw_as_radio(True)   menu.append(button) - button = gtk.CheckMenuItem(_('Show Date')) + button = gtk.CheckMenuItem(_('Show Local Date'))   button.connect('toggled', self.toggle_view_column,   'date-column-visible')   button.set_active(self.showcol.get('date', True))   button.set_draw_as_radio(True)   menu.append(button) + button = gtk.CheckMenuItem(_('Show UTC Date')) + button.connect('toggled', self.toggle_view_column, + 'utc-column-visible') + button.set_active(self.showcol.get('utc', False)) + button.set_draw_as_radio(True) + menu.append(button)   button = gtk.CheckMenuItem(_('Show Branch'))   button.connect('toggled', self.toggle_view_column,   'branch-column-visible') @@ -274,7 +280,7 @@
  settings = gdialog.GDialog.save_settings(self)   settings['glog-vpane'] = self.vpaned.get_position()   settings['glog-hpane'] = self.hpaned.get_position() - for col in ('rev', 'date', 'id', 'branch'): + for col in ('rev', 'date', 'id', 'branch', 'utc'):   vis = self.graphview.get_property(col+'-column-visible')   settings['glog-vis-'+col] = vis   return settings @@ -304,7 +310,7 @@
  try:   self.setting_vpos = settings['glog-vpane']   self.setting_hpos = settings['glog-hpane'] - for col in ('rev', 'date', 'id', 'branch'): + for col in ('rev', 'date', 'id', 'branch', 'utc'):   vis = settings['glog-vis-'+col]   self.showcol[col] = vis   except KeyError:
Change 1 of 5 Show Entire File hggtk/​logview/​treemodel.py Stacked
 
29
30
31
32
 
 
33
34
35
 
65
66
67
68
 
69
70
71
 
83
84
85
 
86
87
88
 
141
142
143
 
144
145
146
 
152
153
154
155
 
156
157
158
 
29
30
31
 
32
33
34
35
36
 
66
67
68
 
69
70
71
72
 
84
85
86
87
88
89
90
 
143
144
145
146
147
148
149
 
155
156
157
 
158
159
160
161
@@ -29,7 +29,8 @@
 TAGS = 11  FGCOLOR = 12  HEXID = 13 -BRANCHES = 14 +UTC = 14 +BRANCHES = 15    class TreeModel(gtk.GenericTreeModel):   @@ -65,7 +66,7 @@
  return gtk.TREE_MODEL_LIST_ONLY     def on_get_n_columns(self): - return 14 + return 15     def on_get_column_type(self, index):   if index == NODE: return gobject.TYPE_PYOBJECT @@ -83,6 +84,7 @@
  if index == FGCOLOR: return gobject.TYPE_STRING   if index == HEXID: return gobject.TYPE_STRING   if index == BRANCHES: return gobject.TYPE_STRING + if index == UTC: return gobject.TYPE_STRING     def on_get_iter(self, path):   return path[0] @@ -141,6 +143,7 @@
    author = hglib.toutf(author)   date = hglib.displaytime(ctx.date()) + utc = hglib.utctime(ctx.date())     wc_parent = revid in self.parents   head = revid in self.heads @@ -152,7 +155,7 @@
    revision = (None, node, revid, None, sumstr,   author, date, None, parents, wc_parent, head, taglist, - color, str(ctx)) + color, str(ctx), utc)   self.revisions[revid] = revision   self.branch_names[revid] = branchstr   else:
Change 1 of 5 Show Entire File hggtk/​logview/​treeview.py Stacked
 
56
57
58
 
 
 
 
 
59
60
61
 
227
228
229
 
 
230
231
232
 
247
248
249
 
 
250
251
252
 
424
425
426
427
 
428
429
430
 
434
435
436
 
 
 
 
 
 
 
 
 
 
 
 
 
437
438
439
 
56
57
58
59
60
61
62
63
64
65
66
 
232
233
234
235
236
237
238
239
 
254
255
256
257
258
259
260
261
 
433
434
435
 
436
437
438
439
 
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
@@ -56,6 +56,11 @@
  'Show date column',   False,   gobject.PARAM_READWRITE), + 'utc-column-visible': (gobject.TYPE_BOOLEAN, + 'UTC', + 'Show UTC/GMT date column', + False, + gobject.PARAM_READWRITE),   'rev-column-visible': (gobject.TYPE_BOOLEAN,   'Rev',   'Show revision number column', @@ -227,6 +232,8 @@
  return self.rev_column.get_visible()   elif property.name == 'branch-column-visible':   return self.branch_column.get_visible() + elif property.name == 'utc-column-visible': + return self.utc_column.get_visible()   elif property.name == 'repo':   return self.repo   elif property.name == 'limit': @@ -247,6 +254,8 @@
  self.rev_column.set_visible(value)   elif property.name == 'branch-column-visible':   self.branch_column.set_visible(value) + elif property.name == 'utc-column-visible': + self.utc_column.set_visible(value)   elif property.name == 'repo':   self.repo = value   elif property.name == 'limit': @@ -424,7 +433,7 @@
  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 = gtk.TreeViewColumn(_('Local Date'))   self.date_column.set_visible(False)   self.date_column.set_resizable(True)   self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) @@ -434,6 +443,19 @@
  self.date_column.add_attribute(cell, "foreground", treemodel.FGCOLOR)   self.treeview.append_column(self.date_column)   + cell = gtk.CellRendererText() + cell.set_property("width-chars", 20) + cell.set_property("ellipsize", pango.ELLIPSIZE_END) + self.utc_column = gtk.TreeViewColumn(_('Universal Date')) + self.utc_column.set_visible(False) + self.utc_column.set_resizable(True) + self.utc_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + self.utc_column.set_fixed_width(cell.get_size(self.treeview)[2]) + self.utc_column.pack_start(cell, expand=True) + self.utc_column.add_attribute(cell, "text", treemodel.UTC) + self.utc_column.add_attribute(cell, "foreground", treemodel.FGCOLOR) + self.treeview.append_column(self.utc_column) +   def text_color_orig(self, parents, rev, author):   if self.origtip is not None and int(rev) > self.origtip:   return 'darkgreen'
Change 1 of 2 Show Entire File thgutil/​hglib.py Stacked
 
10
11
12
 
13
14
15
 
172
173
174
 
 
175
176
177
 
10
11
12
13
14
15
16
 
173
174
175
176
177
178
179
180
@@ -10,6 +10,7 @@
 import sys  import traceback  import shlib +import time  from mercurial import hg, ui, util, extensions, commands, hook    from i18n import _ @@ -172,6 +173,8 @@
 def displaytime(date):   return util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2')   +def utctime(date): + return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(date[0]))    # the remaining functions are only needed for Mercurial versions < 1.3  def _earlygetopt(aliases, args):