Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py
- changeset 2406
- 975af671146d
- parent 2302
- f29e9405c851
- child 2525
- 8b507a9a2d40
- child 2730
- b376a38ba1c1
equal
deleted
inserted
replaced
| 2405:d4b5f3bd4720 | 2406:975af671146d |
|---|---|
| 12 from PyQt4.QtCore import QTimer, QDate, QProcess, QRegExp, Qt, pyqtSlot | 12 from PyQt4.QtCore import QTimer, QDate, QProcess, QRegExp, Qt, pyqtSlot |
| 13 from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, \ | 13 from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, \ |
| 14 QApplication, QDialogButtonBox, QTreeWidgetItem | 14 QApplication, QDialogButtonBox, QTreeWidgetItem |
| 15 | 15 |
| 16 from E5Gui import E5MessageBox | 16 from E5Gui import E5MessageBox |
| 17 | |
| 18 from .SvnDiffDialog import SvnDiffDialog | |
| 19 | 17 |
| 20 from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog | 18 from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog |
| 21 | 19 |
| 22 import Preferences | 20 import Preferences |
| 23 | 21 |
| 412 | 410 |
| 413 @param rev1 first revision number (integer) | 411 @param rev1 first revision number (integer) |
| 414 @param rev2 second revision number (integer) | 412 @param rev2 second revision number (integer) |
| 415 """ | 413 """ |
| 416 if self.diff is None: | 414 if self.diff is None: |
| 415 from .SvnDiffDialog import SvnDiffDialog | |
| 417 self.diff = SvnDiffDialog(self.vcs) | 416 self.diff = SvnDiffDialog(self.vcs) |
| 418 self.diff.show() | 417 self.diff.show() |
| 419 self.diff.start(self.filename, [rev1, rev2]) | 418 self.diff.start(self.filename, [rev1, rev2]) |
| 420 | 419 |
| 421 def on_buttonBox_clicked(self, button): | 420 def on_buttonBox_clicked(self, button): |
