Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
- changeset 2406
- 975af671146d
- parent 2302
- f29e9405c851
- child 2525
- 8b507a9a2d40
- child 2730
- b376a38ba1c1
equal
deleted
inserted
replaced
| 2405:d4b5f3bd4720 | 2406:975af671146d |
|---|---|
| 17 | 17 |
| 18 from E5Gui import E5MessageBox | 18 from E5Gui import E5MessageBox |
| 19 | 19 |
| 20 from .SvnUtilities import formatTime, dateFromTime_t | 20 from .SvnUtilities import formatTime, dateFromTime_t |
| 21 from .SvnDialogMixin import SvnDialogMixin | 21 from .SvnDialogMixin import SvnDialogMixin |
| 22 from .SvnDiffDialog import SvnDiffDialog | |
| 23 | 22 |
| 24 from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog | 23 from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog |
| 25 | 24 |
| 26 | 25 |
| 27 class SvnLogBrowserDialog(QDialog, SvnDialogMixin, Ui_SvnLogBrowserDialog): | 26 class SvnLogBrowserDialog(QDialog, SvnDialogMixin, Ui_SvnLogBrowserDialog): |
| 316 @param rev1 first revision number (integer) | 315 @param rev1 first revision number (integer) |
| 317 @param rev2 second revision number (integer) | 316 @param rev2 second revision number (integer) |
| 318 @param peg_rev revision number to use as a reference (integer) | 317 @param peg_rev revision number to use as a reference (integer) |
| 319 """ | 318 """ |
| 320 if self.diff is None: | 319 if self.diff is None: |
| 320 from .SvnDiffDialog import SvnDiffDialog | |
| 321 self.diff = SvnDiffDialog(self.vcs) | 321 self.diff = SvnDiffDialog(self.vcs) |
| 322 self.diff.show() | 322 self.diff.show() |
| 323 QApplication.processEvents() | 323 QApplication.processEvents() |
| 324 self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev) | 324 self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev) |
| 325 | 325 |
