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

colormap, annotate: make sure to colorize revisions of 1 year old

It cuts off revisions < 1 year old if the palette is full, because their colors
are mostly white.

Changeset 4b84a80c18df…

Parent c6bd6201f413…

by Yuya Nishihara

Changes to 3 files · Browse files at 4b84a80c18df Showing diff from parent c6bd6201f413 Diff from another changeset...

Change 1 of 1 Show Entire File tests/​colormap_test.py Stacked
 
89
90
91
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
@@ -89,3 +89,31 @@
  assert_equals(set([filectxs[0], filectxs[1]]), set(palette['#ffaaaa']))   assert_equals(set([filectxs[2], filectxs[3]]), set(palette['#ffaae9']))   assert_equals(set([filectxs[4]]), set(palette['#d4aaff'])) + +def test_makeannotatepalette_mindate_included(): + agestep = 10 * SECS_PER_DAY + filectxs = [fakectx(0, 0 * agestep), fakectx(0, 1 * agestep), + fakectx(0, 2 * agestep), fakectx(0, 3 * agestep), + fakectx(0, 4 * agestep), fakectx(0, 5 * agestep), + fakectx(0, 6 * agestep), fakectx(0, 7 * agestep)] + palette = colormap.makeannotatepalette(filectxs, now=7 * agestep, + maxcolors=4, maxhues=4, + maxsaturations=255, + mindate=2 * agestep) + palfctxs = set() + for _color, fctxs in palette.iteritems(): + palfctxs.update(fctxs) + for fctx in filectxs[2:]: + assert fctx in palfctxs + +def test_makeannotatepalette_mindate_earlier_than_rev0(): + agestep = 50 * SECS_PER_DAY + filectxs = [fakectx(0, 1 * agestep), fakectx(0, 2 * agestep)] + palette = colormap.makeannotatepalette(filectxs, now=2 * agestep, + maxcolors=1, maxhues=1, + maxsaturations=255, mindate=0) + palfctxs = set() + for _color, fctxs in palette.iteritems(): + palfctxs.update(fctxs) + for fctx in filectxs: + assert fctx in palfctxs
Change 1 of 1 Show Changes Only tortoisehg/​hgqt/​annotate.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
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
 # annotate.py - File annotation widget  #  # Copyright 2010 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import os    from mercurial import ui, error, util    from tortoisehg.hgqt import visdiff, qtlib, qscilib, wctxactions, thgrepo, lexers  from tortoisehg.util import paths, hglib, colormap, thread2  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt.grep import SearchWidget    from PyQt4.QtCore import *  from PyQt4.QtGui import *  from PyQt4.Qsci import QsciScintilla, QsciStyle    # Technical Debt  # Pass search parameters to grep  # forward/backward history buttons  # menu options for viewing appropriate changesets    class AnnotateView(qscilib.Scintilla):   revisionHint = pyqtSignal(QString)     searchRequested = pyqtSignal(QString)   """Emitted (pattern) when user request to search content"""     editSelected = pyqtSignal(unicode, object, int)   """Emitted (path, rev, line) when user requests to open editor"""     grepRequested = pyqtSignal(QString, dict)   """Emitted (pattern, **opts) when user request to search changelog"""     sourceChanged = pyqtSignal(unicode, object)   """Emitted (path, rev) when the content source changed"""     def __init__(self, repo, parent=None, **opts):   super(AnnotateView, self).__init__(parent)   self.setReadOnly(True)   self.setMarginLineNumbers(1, True)   self.setMarginType(2, QsciScintilla.TextMarginRightJustified)   self.setMouseTracking(True)   self.setFont(qtlib.getfont('fontlog').font())   self.setContextMenuPolicy(Qt.CustomContextMenu)   self.customContextMenuRequested.connect(self.menuRequest)     self.repo = repo   self.repo.configChanged.connect(self.configChanged)   self.configChanged()   self._rev = None   self.annfile = None   self._annotation_enabled = bool(opts.get('annotationEnabled', False))     self._links = [] # by line   self._revmarkers = {} # by rev   self._lastrev = None     self._thread = _AnnotateThread(self)   self._thread.finished.connect(self.fillModel)     def configChanged(self):   self.setIndentationWidth(self.repo.tabwidth)   self.setTabWidth(self.repo.tabwidth)   if self.repo.wsvisible == 'Visible':   self.setWhitespaceVisibility(QsciScintilla.WsVisible)   elif self.repo.wsvisible == 'VisibleAfterIndent':   self.setWhitespaceVisibility(QsciScintilla.WsVisibleAfterIndent)   else:   self.setWhitespaceVisibility(QsciScintilla.WsInvisible)     def keyPressEvent(self, event):   if event.key() == Qt.Key_Escape:   self._thread.abort()   return   return super(AnnotateView, self).keyPressEvent(event)     def mouseMoveEvent(self, event):   self._emitRevisionHintAtLine(self.lineAt(event.pos()))   super(AnnotateView, self).mouseMoveEvent(event)     def _emitRevisionHintAtLine(self, line):   if line < 0:   return   try:   fctx = self._links[line][0]   if fctx.rev() != self._lastrev:   s = hglib.get_revision_desc(fctx,   hglib.fromunicode(self.annfile))   self.revisionHint.emit(s)   self._lastrev = fctx.rev()   except IndexError:   pass     @pyqtSlot(QPoint)   def menuRequest(self, point):   menu = self.createStandardContextMenu()   line = self.lineAt(point)   point = self.mapToGlobal(point)   if line < 0 or not self.isAnnotationEnabled():   return menu.exec_(point)     fctx, line = self._links[line]   data = [hglib.tounicode(fctx.path()), fctx.rev(), line]     if self.hasSelectedText():   selection = self.selectedText()   def sreq(**opts):   return lambda: self.grepRequested.emit(selection, opts)   def sann():   self.searchRequested.emit(selection)   menu.addSeparator()   for name, func in [(_('Search in original revision'),   sreq(rev=fctx.rev())),   (_('Search in working revision'),   sreq(rev='.')),   (_('Search in current annotation'), sann),   (_('Search in history'), sreq(all=True))]:   def add(name, func):   action = menu.addAction(name)   action.triggered.connect(func)   add(name, func)     def annorig():   self.setSource(*data)   def editorig():   self.editSelected.emit(*data)   menu.addSeparator()   for name, func in [(_('Annotate originating revision'), annorig),   (_('View originating revision'), editorig)]:   def add(name, func):   action = menu.addAction(name)   action.triggered.connect(func)   add(name, func)   for pfctx in fctx.parents():   pdata = [hglib.tounicode(pfctx.path()), pfctx.changectx().rev(),   line]   def annparent(data):   self.setSource(*data)   def editparent(data):   self.editSelected.emit(*data)   for name, func in [(_('Annotate parent revision %d') % pdata[1],   annparent),   (_('View parent revision %d') % pdata[1],   editparent)]:   def add(name, func):   action = menu.addAction(name)   action.data = pdata   action.run = lambda: func(action.data)   action.triggered.connect(action.run)   add(name, func)   menu.exec_(point)     @property   def rev(self):   """Returns the current revision number"""   return self._rev     @pyqtSlot(unicode, object, int)   def setSource(self, wfile, rev, line=None):   """Change the content to the specified file at rev [unicode]     line is counted from 1.   """   if self.annfile == wfile and self.rev == rev:   if line:   self.setCursorPosition(int(line) - 1, 0)   return     try:   ctx = self.repo[rev]   fctx = ctx[hglib.fromunicode(wfile)]   except error.LookupError:   qtlib.ErrorMsgBox(_('Unable to annotate'),   _('%s is not found in revision %d') % (wfile, ctx.rev()))   return   self._rev = ctx.rev()   self.clear()   self.annfile = wfile   self.setText(hglib.tounicode(fctx.data()))   if line:   self.setCursorPosition(int(line) - 1, 0)   self._updatelexer(fctx)   self._updatemarginwidth()   self.sourceChanged.emit(wfile, self._rev)   self._updateannotation()     def _updateannotation(self):   if not self.isAnnotationEnabled() or not self.annfile:   return   ctx = self.repo[self._rev]   fctx = ctx[hglib.fromunicode(self.annfile)]   self._thread.abort()   self._thread.start(fctx)     @pyqtSlot()   def fillModel(self):   self._thread.wait()   if self._thread.data is None:   return     self._links = list(self._thread.data)     self._updaterevmargin()   self._updatemarkers()   self._updatemarginwidth()     def clear(self):   super(AnnotateView, self).clear()   self.clearMarginText()   self.markerDeleteAll()     @pyqtSlot(bool)   def setAnnotationEnabled(self, enabled):   """Enable / disable annotation"""   if bool(enabled) == self.isAnnotationEnabled():   return   self._annotation_enabled = bool(enabled)   self._updateannotation()   self._updatemarginwidth()   if not self.isAnnotationEnabled():   self.markerDeleteAll()     def isAnnotationEnabled(self):   """True if annotation enabled and available"""   if self.rev is None:   return False # annotate working copy is not supported   return self._annotation_enabled     def _updatelexer(self, fctx):   """Update the lexer according to the given file"""   lex = lexers.get_lexer(fctx.path(), hglib.tounicode(fctx.data()), self)   if lex:   self.setLexer(lex)     def _updaterevmargin(self):   """Update the content of margin area showing revisions"""   for i, (fctx, _origline) in enumerate(self._links):   self.setMarginText(i, str(fctx.rev()), self._margin_style)     def _updatemarkers(self):   """Update markers which colorizes each line"""   self._redefinemarkers()   for i, (fctx, _origline) in enumerate(self._links):   m = self._revmarkers.get(fctx.rev())   if m is not None:   self.markerAdd(i, m)     def _redefinemarkers(self):   """Redefine line markers according to the current revs"""   curdate = self.repo[self._rev].date()[0]   + # make sure to colorize at least 1 year + mindate = curdate - 365 * 24 * 60 * 60 +   self._revmarkers.clear()   filectxs = iter(fctx for fctx, _origline in self._links)   palette = colormap.makeannotatepalette(filectxs, curdate,   maxcolors=32, maxhues=8, - maxsaturations=16) + maxsaturations=16, + mindate=mindate)   for i, (color, fctxs) in enumerate(palette.iteritems()):   self.markerDefine(QsciScintilla.Background, i)   self.setMarkerBackgroundColor(QColor(color), i)   for fctx in fctxs:   self._revmarkers[fctx.rev()] = i     @util.propertycache   def _margin_style(self):   """Style for margin area"""   s = QsciStyle()   s.setPaper(QApplication.palette().color(QPalette.Window))   s.setFont(self.font())     # Workaround to set style of the current sci widget.   # QsciStyle sends style data only to the first sci widget.   # See qscintilla2/Qt4/qscistyle.cpp   self.SendScintilla(QsciScintilla.SCI_STYLESETBACK,   s.style(), s.paper())   self.SendScintilla(QsciScintilla.SCI_STYLESETFONT,   s.style(), s.font().family().toAscii().data())   self.SendScintilla(QsciScintilla.SCI_STYLESETSIZE,   s.style(), s.font().pointSize())   return s     @pyqtSlot()   def _updatemarginwidth(self):   def lentext(s):   return 'M' * (len(str(s)) + 2) # 2 for margin   self.setMarginWidth(1, lentext(self.lines()))   if self.isAnnotationEnabled() and self._links:   maxrev = max(fctx.rev() for fctx, _origline in self._links)   self.setMarginWidth(2, lentext(maxrev))   else:   self.setMarginWidth(2, 0)    class _AnnotateThread(QThread):   'Background thread for annotating a file at a revision'   def __init__(self, parent=None):   super(_AnnotateThread, self).__init__(parent)     @pyqtSlot(object)   def start(self, fctx):   self._fctx = fctx   super(_AnnotateThread, self).start()   self.data = None     @pyqtSlot()   def abort(self):   try:   thread2._async_raise(self._threadid, KeyboardInterrupt)   self.wait()   except AttributeError:   pass     def run(self):   assert self.currentThread() != qApp.thread()   self._threadid = self.currentThreadId()   try:   data = []   for (fctx, line), _text in self._fctx.annotate(True, True):   data.append((fctx, line))   self.data = data   except KeyboardInterrupt:   pass   finally:   del self._threadid   del self._fctx    class AnnotateDialog(QMainWindow):   def __init__(self, *pats, **opts):   super(AnnotateDialog,self).__init__(opts.get('parent'), Qt.Window)     root = opts.get('root') or paths.find_root()   repo = thgrepo.repository(ui.ui(), path=root)   # TODO: handle repo not found     av = AnnotateView(repo, self, annotationEnabled=True)   self.setCentralWidget(av)   self.av = av     status = QStatusBar()   self.setStatusBar(status)   av.revisionHint.connect(status.showMessage)   av.editSelected.connect(self.editSelected)   av.grepRequested.connect(self._openSearchWidget)     self._searchbar = qscilib.SearchToolBar()   self.addToolBar(self._searchbar)   self._searchbar.setPattern(hglib.tounicode(opts.get('pattern', '')))   self._searchbar.searchRequested.connect(self.av.find)   self._searchbar.conditionChanged.connect(self.av.highlightText)   av.searchRequested.connect(self._searchbar.search)   QShortcut(QKeySequence.Find, self,   lambda: self._searchbar.setFocus(Qt.OtherFocusReason))     self.av.sourceChanged.connect(   lambda *args: self.setWindowTitle(_('Annotate %s@%d') % args))     self.searchwidget = opts.get('searchwidget')     self.opts = opts   line = opts.get('line')   if line and isinstance(line, str):   line = int(line)     self.repo = repo     self.restoreSettings()     # run heavy operation after the dialog visible   path = hglib.tounicode(pats[0])   rev = opts.get('rev') or '.'   QTimer.singleShot(0, lambda: av.setSource(path, rev, line))     def closeEvent(self, event):   self.storeSettings()   super(AnnotateDialog, self).closeEvent(event)     def editSelected(self, wfile, rev, line):   pattern = hglib.fromunicode(self._searchbar._le.text()) or None   wfile = hglib.fromunicode(wfile)   repo = self.repo   try:   ctx = repo[rev]   fctx = ctx[wfile]   except Exception, e:   self.statusBar().showMessage(hglib.tounicode(str(e)))     base, _ = visdiff.snapshot(repo, [wfile], repo[rev])   files = [os.path.join(base, wfile)]   wctxactions.edit(self, repo.ui, repo, files, line, pattern)     @pyqtSlot(unicode, dict)   def _openSearchWidget(self, pattern, opts):   opts = dict((str(k), str(v)) for k, v in opts.iteritems())   if self.searchwidget is None:   self.searchwidget = SearchWidget([pattern], repo=self.repo,   **opts)   self.searchwidget.show()   else:   self.searchwidget.setSearch(pattern, **opts)   self.searchwidget.show()   self.searchwidget.raise_()     def storeSettings(self):   s = QSettings()   s.setValue('annotate/geom', self.saveGeometry())     def restoreSettings(self):   s = QSettings()   self.restoreGeometry(s.value('annotate/geom').toByteArray())    def run(ui, *pats, **opts):   pats = hglib.canonpaths(pats)   return AnnotateDialog(*pats, **opts)
Change 1 of 2 Show Entire File tortoisehg/​util/​colormap.py Stacked
 
111
112
113
114
 
115
116
117
 
119
120
121
 
 
122
123
124
 
 
 
 
 
 
 
 
 
125
126
127
128
 
 
 
 
 
 
129
130
131
132
133
134
135
 
136
137
138
139
 
 
111
112
113
 
114
115
116
117
 
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
@@ -111,7 +111,7 @@
  return "#%x%x%x" % color    def makeannotatepalette(fctxs, now, maxcolors, maxhues=None, - maxsaturations=None): + maxsaturations=None, mindate=None):   """Assign limited number of colors for annotation     :fctxs: list of filecontexts by lines @@ -119,21 +119,37 @@
  :maxcolors: max number of colors   :maxhues: max number of committer angles (hues)   :maxsaturations: max number of saturations by age + :mindate: reassign palette until it includes fctx of mindate + (requires maxsaturations)     This returns dict of {color: fctxs, ...}.   """ + if mindate is not None and maxsaturations is None: + raise ValueError('mindate must be specified with maxsaturations') + + sortedfctxs = list(sorted(set(fctxs), key=lambda fctx: -fctx.date()[0])) + return _makeannotatepalette(sortedfctxs, now, maxcolors, maxhues, + maxsaturations, mindate)[0] + +def _makeannotatepalette(sortedfctxs, now, maxcolors, maxhues, + maxsaturations, mindate):   cm = AnnotateColorSaturation(maxhues=maxhues,   maxsaturations=maxsaturations)   palette = {}   + def reassignifneeded(fctx): + if mindate is None or fctx.date()[0] <= mindate or maxsaturations <= 1: + return palette, cm + return _makeannotatepalette(sortedfctxs, now, maxcolors, maxhues, + maxsaturations - 1, mindate) +   # assign from the latest for maximum discrimination - sortedfctxs = sorted(set(fctxs), key=lambda fctx: -fctx.date()[0])   for fctx in sortedfctxs:   color = cm.get_color(fctx, now)   if color not in palette:   if len(palette) >= maxcolors: - break + return reassignifneeded(fctx)   palette[color] = []   palette[color].append(fctx)   - return palette + return palette, cm # return cm for debbugging