Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- branch
- Py2 comp.
- changeset 2525
- 8b507a9a2d40
- parent 2302
- f29e9405c851
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 2523:139f182b72f6 | 2525:8b507a9a2d40 |
|---|---|
| 4 # | 4 # |
| 5 | 5 |
| 6 """ | 6 """ |
| 7 Module implementing a dialog to enter the data for a merge operation. | 7 Module implementing a dialog to enter the data for a merge operation. |
| 8 """ | 8 """ |
| 9 | |
| 10 from __future__ import unicode_literals # __IGNORE_WARNING__ | |
| 9 | 11 |
| 10 from PyQt4.QtCore import QRegExp | 12 from PyQt4.QtCore import QRegExp |
| 11 from PyQt4.QtGui import QDialog, QDialogButtonBox | 13 from PyQt4.QtGui import QDialog, QDialogButtonBox |
| 12 | 14 |
| 13 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog | 15 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog |
| 25 @param mergelist2 list of previously entered URLs/revisions (list of strings) | 27 @param mergelist2 list of previously entered URLs/revisions (list of strings) |
| 26 @param targetlist list of previously entered targets (list of strings) | 28 @param targetlist list of previously entered targets (list of strings) |
| 27 @param force flag indicating a forced merge (boolean) | 29 @param force flag indicating a forced merge (boolean) |
| 28 @param parent parent widget (QWidget) | 30 @param parent parent widget (QWidget) |
| 29 """ | 31 """ |
| 30 super().__init__(parent) | 32 super(SvnMergeDialog, self).__init__(parent) |
| 31 self.setupUi(self) | 33 self.setupUi(self) |
| 32 | 34 |
| 33 self.forceCheckBox.setChecked(force) | 35 self.forceCheckBox.setChecked(force) |
| 34 | 36 |
| 35 self.rx_url = QRegExp('(?:file:|svn:|svn+ssh:|http:|https:)//.+') | 37 self.rx_url = QRegExp('(?:file:|svn:|svn+ssh:|http:|https:)//.+') |
