Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- branch
- maintenance
- changeset 8176
- 31965986ecd1
- parent 8143
- 2c730d5fd177
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8153:e01ae92db699 | 8176:31965986ecd1 |
|---|---|
| 34 super(SvnMergeDialog, self).__init__(parent) | 34 super(SvnMergeDialog, self).__init__(parent) |
| 35 self.setupUi(self) | 35 self.setupUi(self) |
| 36 | 36 |
| 37 self.forceCheckBox.setChecked(force) | 37 self.forceCheckBox.setChecked(force) |
| 38 | 38 |
| 39 self.okButton = self.buttonBox.button(QDialogButtonBox.Ok) | 39 self.okButton = self.buttonBox.button( |
| 40 QDialogButtonBox.StandardButton.Ok) | |
| 40 self.okButton.setEnabled(False) | 41 self.okButton.setEnabled(False) |
| 41 | 42 |
| 42 self.rx_url = re.compile('(?:file:|svn:|svn+ssh:|http:|https:)//.+') | 43 self.rx_url = re.compile('(?:file:|svn:|svn+ssh:|http:|https:)//.+') |
| 43 self.rx_rev = re.compile('\\d+') | 44 self.rx_rev = re.compile('\\d+') |
| 44 | 45 |
