Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- changeset 1131
- 7781e396c903
- parent 1112
- 8a7d1b9d18db
- child 1509
- c0b5e693b0eb
equal
deleted
inserted
replaced
| 1130:3e9f0330f833 | 1131:7781e396c903 |
|---|---|
| 25 @param mergelist2 list of previously entered URLs/revisions (list of strings) | 25 @param mergelist2 list of previously entered URLs/revisions (list of strings) |
| 26 @param targetlist list of previously entered targets (list of strings) | 26 @param targetlist list of previously entered targets (list of strings) |
| 27 @param force flag indicating a forced merge (boolean) | 27 @param force flag indicating a forced merge (boolean) |
| 28 @param parent parent widget (QWidget) | 28 @param parent parent widget (QWidget) |
| 29 """ | 29 """ |
| 30 QDialog.__init__(self, parent) | 30 super().__init__(parent) |
| 31 self.setupUi(self) | 31 self.setupUi(self) |
| 32 | 32 |
| 33 self.forceCheckBox.setChecked(force) | 33 self.forceCheckBox.setChecked(force) |
| 34 | 34 |
| 35 self.rx_url = QRegExp('(?:file:|svn:|svn+ssh:|http:|https:)//.+') | 35 self.rx_url = QRegExp('(?:file:|svn:|svn+ssh:|http:|https:)//.+') |
