Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

changeset: reformat header, show date, TZ and age

fixed user to see email (added xml_escape)

Changeset 0abb436591b4

Parent 431f8f9e66fe

by Adrian Buehlmann

Changes to one file · Browse files at 0abb436591b4 Showing diff from parent 431f8f9e66fe Diff from another changeset...

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
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
 # Copyright (c) 2009-2010 LOGILAB S.A. (Paris, FRANCE).  # http://www.logilab.fr/ -- mailto:contact@logilab.fr  #  # This program is free software; you can redistribute it and/or modify it under  # the terms of the GNU General Public License as published by the Free Software  # Foundation; either version 2 of the License, or (at your option) any later  # version.  #  # This program is distributed in the hope that it will be useful, but WITHOUT  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS  # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  #  # You should have received a copy of the GNU General Public License along with  # this program; if not, write to the Free Software Foundation, Inc.,  # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.    from mercurial.node import short as short_hex    from PyQt4 import QtCore, QtGui  Qt = QtCore.Qt  connect = QtCore.QObject.connect  SIGNAL = QtCore.SIGNAL    from tortoisehg.util.util import format_desc, xml_escape +from tortoisehg.util import hglib    from tortoisehg.hgqt.config import HgConfig    headerstyle = '''  <style type="text/css">  .rev_number { font-family:Courier; }  .rev_hash { font-family:Courier; } +.label { color:gray; }  </style>  '''    class RevDisplay(QtGui.QWidget):   """   Display metadata for one revision (rev, author, description, etc.)   """   def __init__(self, parent=None):   QtGui.QWidget.__init__(self, parent)   self._message = None     vb = QtGui.QVBoxLayout()   vb.setMargin(0)     self._header = w = QtGui.QLabel()   w.setTextInteractionFlags(Qt.TextSelectableByMouse | Qt.LinksAccessibleByMouse)   vb.addWidget(w)     self.setLayout(vb)   - self.descwidth = 60 # number of chars displayed for parent/child descriptions + self.descwidth = 80 # number of chars displayed for parent/child descriptions     connect(self._header,   SIGNAL('linkActivated(const QString&)'),   self.anchorClicked)     def sizeHint(self):   return self.minimumSizeHint()     def minimumSizeHint(self):   return self._header.minimumSizeHint()     def setMessageWidget(self, w):   self._message = w     def anchorClicked(self, qurl):   """   Callback called when a link is clicked in the text browser   """   rev = str(qurl)   if rev.startswith('diff_'):   self.diffrev = int(rev[5:])   self.refreshDisplay()   # TODO: emit a signal to recompute the diff   self.emit(SIGNAL('parentRevisionSelected'), self.diffrev)   else:   self.emit(SIGNAL('revisionSelected'), int(rev))     def setDiffRevision(self, rev):   if rev != self.diffrev:   self.diffrev = rev   self.refreshDisplay()     def displayRevision(self, ctx):   self.ctx = ctx   self.diffrev = ctx.parents()[0].rev()   if hasattr(self.ctx._repo, "mq"):   self.mqseries = self.ctx._repo.mq.series[:]   self.mqunapplied = [x[1] for x in self.ctx._repo.mq.unapplied(self.ctx._repo)]   mqpatch = set(self.ctx.tags()).intersection(self.mqseries)   if mqpatch:   self.mqpatch = mqpatch.pop()   else:   self.mqpatch = None   else:   self.mqseries = []   self.mqunapplied = []   self.mqpatch = None     self.refreshDisplay()     def selectNone(self):   self._message.selectNone()     def searchString(self, text):   self._message.searchString(text)     def refreshDisplay(self):   ctx = self.ctx   rev = ctx.rev()   buf = headerstyle - buf += "<table width=100%>\n"   if self.mqpatch: + buf += "<table width=100%>\n"   buf += '<tr bgcolor=%s>' % HgConfig(ctx._repo.ui).getMQFGColor()   buf += '<td colspan=3 width=100%><b>Patch queue:</b>&nbsp;'   for p in self.mqseries:   if p in self.mqunapplied:   p = "<i>%s</i>" % p   elif p == self.mqpatch:   p = "<b>%s</b>" % p   buf += '&nbsp;%s&nbsp;' % (p)   buf += '</td></tr>\n' + buf += "</table>\n"   - buf += '<tr>' + buf += '<table width=100%>\n<tr>'   if rev is None: - buf += "<td><b>Working Directory</b></td>\n" + buf += '<td><b>Working Directory</b></td>'   else: - buf += '<td><b>Revision:</b>&nbsp;'\ - '<span class="rev_number">%d</span>:'\ - '<span class="rev_hash">%s</span></td>'\ - '\n' % (ctx.rev(), short_hex(ctx.node())) + desc = format_desc(ctx.description(), 80) + buf += '<td><b><span class="rev_number">%d:</span>'\ + '<span class="rev_hash">%s&nbsp;</span>'\ + '<span class="short_desc">%s</span></b></td>'\ + '\n' % (ctx.rev(), short_hex(ctx.node()), desc) + buf += '<td width=50 align=right><span class="label">Branch&nbsp;</span></td>'\ + '<td>%s</td>'\ + '\n' % ctx.branch() + buf += '</tr></table>\n'   - buf += '<td><b>Author:</b>&nbsp;'\ - '%s</td>'\ - '\n' % unicode(ctx.user(), 'utf-8', 'replace') - buf += '<td><b>Branch:</b>&nbsp;%s</td>' % ctx.branch() - buf += '</tr>' - buf += "</table>\n" - buf += "<table width=100%>\n" + buf += '<table width=100%>\n' + buf += '<tr><td width=50 align="right"><span class="label">Author&nbsp;</span></td>'\ + '<td colspan=5>%s</td></tr>'\ + '\n' % xml_escape(unicode(ctx.user(), 'utf-8', 'replace')) + d = ctx.date() + buf += '<tr><td width=50 align="right"><span class="label">Date&nbsp;</span></td>'\ + '<td>%s (%s)</td></tr>'\ + '\n' % (hglib.displaytime(d), hglib.age(d)) +   parents = [p for p in ctx.parents() if p]   for p in parents:   if p.rev() > -1:   short = short_hex(p.node())   desc = format_desc(p.description(), self.descwidth)   p_rev = p.rev()   p_fmt = '<span class="rev_number">%s</span>:'\   '<a href="%s" class="rev_hash">%s</a>' - if p_rev == self.diffrev: - p_rev = '<b>%s</b>' % (p_fmt % (p_rev, p_rev, short)) - else: - p_rev = p_fmt % ('<a href="diff_%s" class="rev_diff">%s</a>' % (p_rev, p_rev), p_rev, short) - buf += '<tr><td width=50 class="label"><b>Parent:</b></td>'\ - '<td colspan=5>%s&nbsp;'\ - '<span class="short_desc">%s</span></td></tr>'\ + p_rev = p_fmt % (p_rev, p_rev, short) + buf += '<tr><td width=50 align="right"><span class="label">Parent&nbsp;</span></td>'\ + '<td>%s'\ + '<span class="short_desc">&nbsp;%s</span></td></tr>'\   '\n' % (p_rev, desc)   if len(parents) == 2:   p = parents[0].ancestor(parents[1])   short = short_hex(p.node())   desc = format_desc(p.description(), self.descwidth)   p_rev = p.rev()   p_fmt = '<span class="rev_number">%s</span>:'\   '<a href="%s" class="rev_hash">%s</a>' - if p_rev == self.diffrev: - p_rev = '<b>%s</b>' % (p_fmt % (p_rev, p_rev, short)) - else: - p_rev = p_fmt % ('<a href="diff_%s" class="rev_diff">%s</a>' % (p_rev, p_rev), p_rev, short) - buf += '<tr><td width=50 class="label"><b>Ancestor:</b></td>'\ - '<td colspan=5>%s&nbsp;'\ + p_rev = p_fmt % (p_rev, p_rev, short) + buf += '<tr><td width=50 align="right"><span class="label">Ancestor</span></td>'\ + '<td>%s&nbsp;'\   '<span class="short_desc">%s</span></td></tr>'\   '\n' % (p_rev, desc)     for p in ctx.children():   if p.rev() > -1:   short = short_hex(p.node())   desc = format_desc(p.description(), self.descwidth) - buf += '<tr><td class="label"><b>Child:</b></td>'\ - '<td colspan=5><span class="rev_number">%d</span>:'\ + buf += '<tr><td align="right"><span class="label">Child&nbsp;</span></td>'\ + '<td><span class="rev_number">%d</span>:'\   '<a href="%s" class="rev_hash">%s</a>&nbsp;'\   '<span class="short_desc">%s</span></td></tr>'\   '\n' % (p.rev(), p.rev(), short, desc)     buf += "</table>\n"   self._header.setText(buf)     self._message.displayRevision(ctx)      class RevMessage(QtGui.QWidget):     def __init__(self, parent=None):   QtGui.QWidget.__init__(self, parent)     vb = QtGui.QVBoxLayout()   vb.setMargin(0)     self._message = w = QtGui.QTextBrowser()   vb.addWidget(w)     self.setLayout(vb)     def displayRevision(self, ctx):   self.ctx = ctx   desc = xml_escape(unicode(ctx.description(), 'utf-8', 'replace'))   desc = desc.replace('\n', '<br/>\n')   buf = '<div class="diff_desc"><p>%s</p></div>' % desc   self._message.setHtml(buf)     def selectNone(self):   msg = self._message   cursor = msg.textCursor()   cursor.clearSelection()   cursor.setPosition(0)   msg.setTextCursor(cursor)   msg.setExtraSelections([])     def searchString(self, text):   msg = self._message   self.selectNone()   if text in unicode(msg.toPlainText()):   clist = []   while msg.find(text):   eselect = msg.ExtraSelection()   eselect.cursor = msg.textCursor()   eselect.format.setBackground(QtGui.QColor('#ffffbb'))   clist.append(eselect)   self.selectNone()   msg.setExtraSelections(clist)   def finditer(msg, text):   if text:   while True:   if msg.find(text):   yield self.ctx.rev(), None   else:   break   return finditer(msg, text)