Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

thgpbranch: Show full patch message

Changeset 1b2721ab8332…

Parent 2b364ae2c6f9…

by Peer Sommerlund

Changes to one file · Browse files at 1b2721ab8332 Showing diff from parent 2b364ae2c6f9 Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgtk/​thgpbranch.py Stacked
 
23
24
25
 
 
26
27
28
29
30
31
 
32
33
34
 
53
54
55
 
 
 
 
 
56
57
58
 
131
132
133
134
 
 
 
135
136
 
 
 
137
138
139
 
181
182
183
 
184
185
186
 
264
265
266
267
268
269
270
 
 
 
 
 
 
 
 
 
271
272
273
 
518
519
520
 
521
522
523
 
582
583
584
 
 
585
586
587
 
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
 
56
57
58
59
60
61
62
63
64
65
66
 
139
140
141
 
142
143
144
145
146
147
148
149
150
151
152
 
194
195
196
197
198
199
200
 
278
279
280
 
 
 
 
281
282
283
284
285
286
287
288
289
290
291
292
 
537
538
539
540
541
542
543
 
602
603
604
605
606
607
608
609
@@ -23,12 +23,15 @@
 M_NAME = 3  M_STATUS = 4  M_TITLE = 5 +M_MSG = 6 +M_MSGESC = 7    # Patch Branch column enumeration  C_GRAPH = 0  C_STATUS = 1  C_NAME = 2  C_TITLE = 3 +C_MSG = 4    class PBranchWidget(gtk.VBox):   @@ -53,6 +56,11 @@
  'Show title column',   False,   gobject.PARAM_READWRITE), + 'message-column-visible': (gobject.TYPE_BOOLEAN, + 'Title', + 'Show title column', + False, + gobject.PARAM_READWRITE),   'show-internal-branches': (gobject.TYPE_BOOLEAN,   'ShowInternalBranches',   "Show internal branches", @@ -131,9 +139,14 @@
  gobject.TYPE_PYOBJECT, # out-lines   str, # patch name   str, # patch status - str) # patch title + str, # patch title + str, # patch message + str) # patch message escaped   #### patch list view   self.list = gtk.TreeView(self.model) + # To support old PyGTK (<2.12) + if hasattr(self.list, 'set_tooltip_column'): + self.list.set_tooltip_column(M_MSGESC)   self.list.connect('button-press-event', self.list_pressed)   self.list.connect('row-activated', self.list_row_activated)   self.list.connect('size-allocate', self.list_size_allocated) @@ -181,6 +194,7 @@
  addcol(_('St'), C_STATUS, M_STATUS)   addcol(_('Name'), C_NAME, M_NAME, editfunc=cell_edited)   addcol(_('Title'), C_TITLE, M_TITLE) + addcol(_('Message'), C_MSG, M_MSG)     pane.add(self.list)   @@ -264,10 +278,15 @@
    stat = patch_status[name] and 'M' or 'C' # patch status   patchname = name - msg = self.pmessage(name) or '' # summary - msg_esc = 'message for tool-tip' # escaped summary (utf-8) - title = msg.split('\n')[0] - self.model.append((node, in_lines, out_lines, patchname, stat, title)) + msg = self.pmessage(name) # summary + if msg: + msg_esc = gtklib.markup_escape_text(msg) # escaped summary (utf-8) + title = msg.split('\n')[0] + else: + msg_esc = None + title = None + self.model.append((node, in_lines, out_lines, patchname, stat, + title, msg, msg_esc))   # Loop   in_lines = out_lines   dep_list = next_dep_list @@ -518,6 +537,7 @@
  colappend(_('Show status'), C_STATUS, active=False)   colappend(_('Show name'), C_NAME)   colappend(_('Show title'), C_TITLE, active=False) + colappend(_('Show message'), C_MSG, active=False)     append(sep=True)   @@ -582,6 +602,8 @@
  return 'name-column-visible'   if col_idx == C_TITLE:   return 'title-column-visible' + if col_idx == C_MSG: + return 'message-column-visible'   return ''     ### signal handlers ###