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

fileview: connect some manifest signals, disable next/prev in ann mode

Remove showDescSignal, which was no longer applicable

Changeset 1853af848454…

Parent 554e81e94c06…

by Steve Borho

Changes to 3 files · Browse files at 1853af848454 Showing diff from parent 554e81e94c06 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
37
38
39
40
41
42
43
 
44
45
46
 
138
139
140
 
141
142
143
144
145
146
 
230
231
232
233
 
234
235
 
236
237
238
 
279
280
281
 
282
283
284
 
369
370
371
372
373
374
375
 
426
427
428
 
 
 
 
429
430
431
 
37
38
39
 
40
41
 
42
43
44
45
 
137
138
139
140
141
142
 
143
144
145
 
229
230
231
 
232
233
 
234
235
236
237
 
278
279
280
281
282
283
284
 
369
370
371
 
372
373
374
 
425
426
427
428
429
430
431
432
433
434
@@ -37,10 +37,9 @@
 class HgFileView(QFrame):   """file diff and content viewer"""   - showDescSignal = pyqtSignal(QString)   linkActivated = pyqtSignal(QString)   fileDisplayed = pyqtSignal(QString, QString) - showMessage = pyqtSignal(unicode) + showMessage = pyqtSignal(QString)   revForDiffChanged = pyqtSignal(int)   filled = pyqtSignal()   @@ -138,9 +137,9 @@
  for name in ('searchRequested', 'editSelected', 'grepRequested'):   getattr(self._annotate, name).connect(getattr(self, name))   self._annotate.revisionHint.connect(self.showMessage) + self._annotate.sourceChanged.connect(self.sourceChanged)   self._annotate.setAnnotationEnabled(True)   self._stacked.addWidget(self._annotate) - # self._annotate.sourceChanged.connect( ?? )     ll = QVBoxLayout()   ll.setContentsMargins(0, 0, 0, 0) @@ -230,9 +229,9 @@
  def setMode(self, action):   'One of the mode toolbar buttons has been toggled'   mode = {'Diff':'diff', 'File':'file', 'Ann':'ann'}[str(action.text())] - self.actionNextDiff.setEnabled(mode != 'diff') + self.actionNextDiff.setEnabled(mode == 'file')   self.actionPrevDiff.setEnabled(False) - self.blk.setVisible(mode != 'diff') + self.blk.setVisible(mode == 'file')   if mode == 'ann':   self._stacked.setCurrentWidget(self._annotate)   else: @@ -279,6 +278,7 @@
  self.extralabel.hide()   self.sci.setMarginLineNumbers(1, False)   self.sci.setMarginWidth(1, '') + self._diffs = []     def displayFile(self, filename=None, rev=None, status=None):   if filename is None: @@ -369,7 +369,6 @@
  olddata = fd.olddata.splitlines()   newdata = fd.contents.splitlines()   self._diff = difflib.SequenceMatcher(None, olddata, newdata) - self._diffs = []   self.blk.syncPageStep()   self.timer.start()   @@ -426,6 +425,10 @@
  def nDiffs(self):   return len(self._diffs)   + @pyqtSlot(unicode, object, int) + def sourceChanged(self, path, rev, line=None): + self.revForDiffChanged.emit(rev) +   def searchString(self, text):   self._find_text = text   self.clearHighlights()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
154
155
156
157
 
 
158
159
160
 
154
155
156
 
157
158
159
160
161
@@ -154,7 +154,8 @@
    self.revDetailsWidget = w = RevDetailsWidget(self.repo)   w.linkActivated.connect(self._openLink) - w.fileview.showDescSignal.connect(self.showMessage) + w.revForDiffChanged.connect(self.repoview.goto) + w.grepRequested.connect(self.grep)   self.logTabIndex = idx = tt.addTab(w, geticon('log'), '')   tt.setTabToolTip(idx, _("Revision details"))  
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
 
21
22
23
 
 
24
25
26
 
41
42
43
 
 
44
45
46
 
21
22
23
24
25
26
27
28
 
43
44
45
46
47
48
49
50
@@ -21,6 +21,8 @@
    showMessage = pyqtSignal(str)   linkActivated = pyqtSignal(unicode) + grepRequested = pyqtSignal(unicode, dict) + revForDiffChanged = pyqtSignal(int)     def __init__(self, repo):   QWidget.__init__(self) @@ -41,6 +43,8 @@
    self.fileview.setFont(getfont('fontdiff').font())   self.fileview.showMessage.connect(self.showMessage) + self.fileview.grepRequested.connect(self.grepRequested) + self.fileview.revForDiffChanged.connect(self.revForDiffChanged)   self.restoreSettings()     def setRepo(self, repo):