Commit d497923f authored by Steve Borho's avatar Steve Borho
Browse files

fileview: rename revForDiffChanged to revisionSelected

Do no emit this signal when diffs to a specific revision are requested.  This
fixes the 'show all' toggle when viewing merge changesets.
parent 9ae81c37f706
...@@ -66,6 +66,7 @@ class HgFileListModel(QAbstractTableModel): ...@@ -66,6 +66,7 @@ class HgFileListModel(QAbstractTableModel):
def setContext(self, ctx): def setContext(self, ctx):
if ctx != self._ctx: if ctx != self._ctx:
self._fulllist = False
self._ctx = ctx self._ctx = ctx
self.loadFiles() self.loadFiles()
self.layoutChanged.emit() self.layoutChanged.emit()
......
...@@ -41,7 +41,7 @@ class HgFileView(QFrame): ...@@ -41,7 +41,7 @@ class HgFileView(QFrame):
linkActivated = pyqtSignal(QString) linkActivated = pyqtSignal(QString)
fileDisplayed = pyqtSignal(QString, QString) fileDisplayed = pyqtSignal(QString, QString)
showMessage = pyqtSignal(QString) showMessage = pyqtSignal(QString)
revForDiffChanged = pyqtSignal(int) revisionSelected = pyqtSignal(int)
searchRequested = pyqtSignal(unicode) searchRequested = pyqtSignal(unicode)
"""Emitted (pattern) when user request to search content""" """Emitted (pattern) when user request to search content"""
...@@ -276,7 +276,6 @@ class HgFileView(QFrame): ...@@ -276,7 +276,6 @@ class HgFileView(QFrame):
if rev is not None: if rev is not None:
self._p_rev = rev self._p_rev = rev
self.revForDiffChanged.emit(rev)
self.clearDisplay() self.clearDisplay()
if filename is None: if filename is None:
...@@ -414,7 +413,7 @@ class HgFileView(QFrame): ...@@ -414,7 +413,7 @@ class HgFileView(QFrame):
@pyqtSlot(unicode, object) @pyqtSlot(unicode, object)
@pyqtSlot(unicode, object, int) @pyqtSlot(unicode, object, int)
def sourceChanged(self, path, rev, line=None): def sourceChanged(self, path, rev, line=None):
self.revForDiffChanged.emit(rev) self.revisionSelected.emit(rev)
@pyqtSlot(unicode, object, int) @pyqtSlot(unicode, object, int)
def editSelected(self, path, rev, line): def editSelected(self, path, rev, line):
......
...@@ -154,7 +154,7 @@ class RepoWidget(QWidget): ...@@ -154,7 +154,7 @@ class RepoWidget(QWidget):
self.revDetailsWidget = w = RevDetailsWidget(self.repo) self.revDetailsWidget = w = RevDetailsWidget(self.repo)
w.linkActivated.connect(self._openLink) w.linkActivated.connect(self._openLink)
w.revForDiffChanged.connect(self.repoview.goto) w.revisionSelected.connect(self.repoview.goto)
w.grepRequested.connect(self.grep) w.grepRequested.connect(self.grep)
w.showMessage.connect(self.showMessage) w.showMessage.connect(self.showMessage)
self.logTabIndex = idx = tt.addTab(w, geticon('log'), '') self.logTabIndex = idx = tt.addTab(w, geticon('log'), '')
......
...@@ -22,7 +22,7 @@ class RevDetailsWidget(QWidget): ...@@ -22,7 +22,7 @@ class RevDetailsWidget(QWidget):
showMessage = pyqtSignal(QString) showMessage = pyqtSignal(QString)
linkActivated = pyqtSignal(unicode) linkActivated = pyqtSignal(unicode)
grepRequested = pyqtSignal(unicode, dict) grepRequested = pyqtSignal(unicode, dict)
revForDiffChanged = pyqtSignal(int) revisionSelected = pyqtSignal(int)
def __init__(self, repo): def __init__(self, repo):
QWidget.__init__(self) QWidget.__init__(self)
...@@ -44,7 +44,7 @@ class RevDetailsWidget(QWidget): ...@@ -44,7 +44,7 @@ class RevDetailsWidget(QWidget):
self.fileview.setFont(getfont('fontdiff').font()) self.fileview.setFont(getfont('fontdiff').font())
self.fileview.showMessage.connect(self.showMessage) self.fileview.showMessage.connect(self.showMessage)
self.fileview.grepRequested.connect(self.grepRequested) self.fileview.grepRequested.connect(self.grepRequested)
self.fileview.revForDiffChanged.connect(self.revForDiffChanged) self.fileview.revisionSelected.connect(self.revisionSelected)
self.restoreSettings() self.restoreSettings()
def setRepo(self, repo): def setRepo(self, repo):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment