Changeset 2d9d8c02be86…
Parent c4f831a65125…
by
Changes to 2 files · Browse files at 2d9d8c02be86 Showing diff from parent c4f831a65125 Diff from another changeset...
@@ -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,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):
|
Loading...