diff -r a61ee61b1c2c -r 7e55c6268c35 Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Aug 05 13:17:51 2013 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Aug 05 15:58:30 2013 +0200
@@ -27,11 +27,12 @@
"""
Class implementing a dialog to browse the log history.
"""
- def __init__(self, vcs, parent=None):
+ def __init__(self, vcs, isFile=False, parent=None):
"""
Constructor
@param vcs reference to the vcs object
+ @param isFile flag indicating log for a file is to be shown (boolean)
@param parent parent widget (QWidget)
"""
super().__init__(parent)
@@ -44,6 +45,8 @@
self.filesTree.headerItem().setText(self.filesTree.columnCount(), "")
self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder)
+ self.sbsCheckBox.setEnabled(isFile)
+
self.vcs = vcs
self.__maxDate = QDate()
@@ -316,13 +319,16 @@
@param rev2 second revision number (integer)
@param peg_rev revision number to use as a reference (integer)
"""
- if self.diff is None:
- from .SvnDiffDialog import SvnDiffDialog
- self.diff = SvnDiffDialog(self.vcs)
- self.diff.show()
- self.diff.raise_()
- QApplication.processEvents()
- self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev)
+ if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked():
+ self.vcs.svnSbsDiff(self.filename, revisions=(str(rev1), str(rev2)))
+ else:
+ if self.diff is None:
+ from .SvnDiffDialog import SvnDiffDialog
+ self.diff = SvnDiffDialog(self.vcs)
+ self.diff.show()
+ self.diff.raise_()
+ QApplication.processEvents()
+ self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev)
def on_buttonBox_clicked(self, button):
"""
