Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

fileview: show diff markers for annotate mode, do not use setSource

The AnnotateView widget is still doing too much work reverifying the fctx
contents.

Changeset 5786f725b649…

Parent 935e35c54094…

by Steve Borho

Changes to one file · Browse files at 5786f725b649 Showing diff from parent 935e35c54094 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
233
234
235
236
 
237
238
239
 
264
265
266
267
 
268
269
270
 
361
362
363
364
 
365
366
367
 
383
384
385
386
387
388
389
390
 
392
393
394
 
 
 
 
395
396
397
 
400
401
402
403
 
404
405
406
 
407
408
409
 
233
234
235
 
236
237
238
239
 
264
265
266
 
267
268
269
270
 
361
362
363
 
364
365
366
367
 
383
384
385
 
 
386
387
388
 
390
391
392
393
394
395
396
397
398
399
 
402
403
404
 
405
406
407
 
408
409
410
411
@@ -233,7 +233,7 @@
  self._mode = mode   self.actionNextDiff.setEnabled(False)   self.actionPrevDiff.setEnabled(False) - self.blk.setVisible(mode == FileMode) + self.blk.setVisible(mode != DiffMode)   self.sci.setAnnotationEnabled(mode == AnnMode)   self.displayFile(self._filename, self._status)   @@ -264,7 +264,7 @@
  if self._mode != mode:   self.actionNextDiff.setEnabled(False)   self.actionPrevDiff.setEnabled(False) - self.blk.setVisible(mode == FileMode) + self.blk.setVisible(mode != DiffMode)   self.sci.setAnnotationEnabled(mode == AnnMode)   self._mode = mode   @@ -361,7 +361,7 @@
  elif self._lostMode == AnnMode:   self.actionAnnMode.trigger()   self._lostMode = None - self.blk.setVisible(self._mode == FileMode) + self.blk.setVisible(self._mode != DiffMode)   self.sci.setAnnotationEnabled(self._mode == AnnMode)     if self._mode == DiffMode: @@ -383,8 +383,6 @@
  self.sci.setText(hglib.tounicode(fd.diff))   elif fd.contents is None:   return - elif self._mode == AnnMode: - self.sci.setSource(filename, self._ctx.rev())   else:   lexer = lexers.get_lexer(filename, fd.contents, self)   self.sci.setLexer(lexer) @@ -392,6 +390,10 @@
  self.setFont(qtlib.getfont('fontlog').font())   self.sci.setText(fd.contents)   self.sci._updatemarginwidth() + if self._mode == AnnMode: + self.sci.annfile = filename + self.sci._rev = self._ctx.rev() + self.sci._updateannotation()     # Recover the last scroll position   # Make sure that lastScrollPosition never exceeds the amount of @@ -400,10 +402,10 @@
  self.sci.verticalScrollBar().setValue(lastScrollPosition)     self.highlightText(*self._lastSearch) - uf = hglib.tounicode(self._filename) + uf = hglib.tounicode(filename)   self.fileDisplayed.emit(uf, fd.contents or QString())   - if self._mode == FileMode and fd.contents and fd.olddata: + if self._mode != DiffMode and fd.contents and fd.olddata:   # Update blk margin   if self.timer.isActive():   self.timer.stop()