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

annotate: make AnnotateView handle switching revision by itself

Since it knows the repo, it's simple enough to switch revision by itself.

Changeset 2d9d8c02be86

Parent c4f831a65125

by Yuya Nishihara

Changes to 2 files · Browse files at 2d9d8c02be86 Showing diff from parent c4f831a65125 Diff from another changeset...

 
29
30
31
32
33
34
35
 
119
120
121
122
 
123
124
125
 
132
133
134
135
 
136
137
138
 
478
479
480
481
482
483
484
 
29
30
31
 
32
33
34
 
118
119
120
 
121
122
123
124
 
131
132
133
 
134
135
136
137
 
477
478
479
 
480
481
482
@@ -29,7 +29,6 @@
  searchRequested = pyqtSignal(QString)   """Emitted (pattern) when user request to search content"""   - revSelected = pyqtSignal(object)   editSelected = pyqtSignal(object)     grepRequested = pyqtSignal(QString, dict) @@ -119,7 +118,7 @@
  add(name, func)     def annorig(): - self.revSelected.emit(data) + self.setSource(*data)   def editorig():   self.editSelected.emit(data)   menu.addSeparator() @@ -132,7 +131,7 @@
  for pfctx in fctx.parents():   pdata = [pfctx.path(), pfctx.changectx().rev(), line]   def annparent(data): - self.revSelected.emit(data) + self.setSource(*data)   def editparent(data):   self.editSelected.emit(data)   for name, func in [(_('Annotate parent revision %d') % pdata[1], @@ -478,7 +477,6 @@
  status = QStatusBar()   self.setStatusBar(status)   av.revisionHint.connect(status.showMessage) - av.revSelected.connect(lambda data: self.av.setSource(*data))   av.editSelected.connect(self.editSelected)   av.grepRequested.connect(self._openSearchWidget)  
 
132
133
134
 
135
136
137
138
139
 
189
190
191
 
192
193
194
195
 
 
196
197
198
199
200
201
 
 
202
203
204
 
132
133
134
135
136
 
137
138
139
 
189
190
191
192
193
194
195
 
196
197
198
199
 
200
201
202
203
204
205
206
207
@@ -132,8 +132,8 @@
  self._nullcontent = QWidget()   self._contentview.addWidget(self._nullcontent)   self._fileview = annotate.AnnotateView(self._repo) + self._fileview.sourceChanged.connect(self.setSource)   self._contentview.addWidget(self._fileview) - self._fileview.revSelected.connect(lambda a: self.setSource(*a[:3]))   for name in ('revisionHint', 'searchRequested', 'grepRequested'):   getattr(self._fileview, name).connect(getattr(self, name))   @@ -189,16 +189,19 @@
  """Change revision to show"""   self.setSource(self.path, rev)   + @pyqtSlot(unicode, object)   @pyqtSlot(unicode, object, int)   def setSource(self, path, rev, line=None):   """Change path and revision to show at once""" - if self._rev != rev: + revchanged = self._rev != rev + if revchanged:   self._rev = rev   self._setupmodel() - self.revchanged.emit(rev)   self.setpath(path)   if self.path in self._repo[rev]:   self._fileview.setSource(path, rev, line) + if revchanged: + self.revchanged.emit(rev)     @property   def path(self):