Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
- changeset 537
- 72b32daeb8d6
- parent 248
- f4561c24989a
- child 736
- d2433b433793
equal
deleted
inserted
replaced
| 536:6d8d39753c82 | 537:72b32daeb8d6 |
|---|---|
| 9 | 9 |
| 10 from PyQt4.QtCore import * | 10 from PyQt4.QtCore import * |
| 11 from PyQt4.QtGui import * | 11 from PyQt4.QtGui import * |
| 12 | 12 |
| 13 from E5Gui.E5Application import e5App | 13 from E5Gui.E5Application import e5App |
| 14 from E5Gui import E5MessageBox | |
| 14 | 15 |
| 15 from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog | 16 from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog |
| 16 | 17 |
| 17 | 18 |
| 18 class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog): | 19 class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog): |
| 43 self.typeCombo1.addItems(["trunk/", "tags/", "branches/"]) | 44 self.typeCombo1.addItems(["trunk/", "tags/", "branches/"]) |
| 44 self.typeCombo2.addItems(["trunk/", "tags/", "branches/"]) | 45 self.typeCombo2.addItems(["trunk/", "tags/", "branches/"]) |
| 45 | 46 |
| 46 reposURL = self.vcs.svnGetReposName(path) | 47 reposURL = self.vcs.svnGetReposName(path) |
| 47 if reposURL is None: | 48 if reposURL is None: |
| 48 QMessageBox.critical(None, | 49 E5MessageBox.critical(self, |
| 49 self.trUtf8("Subversion Error"), | 50 self.trUtf8("Subversion Error"), |
| 50 self.trUtf8("""The URL of the project repository could not be""" | 51 self.trUtf8("""The URL of the project repository could not be""" |
| 51 """ retrieved from the working copy. The operation will""" | 52 """ retrieved from the working copy. The operation will""" |
| 52 """ be aborted""")) | 53 """ be aborted""")) |
| 53 self.reject() | 54 self.reject() |
| 55 | 56 |
| 56 if self.vcs.otherData["standardLayout"]: | 57 if self.vcs.otherData["standardLayout"]: |
| 57 # determine the base path of the project in the repository | 58 # determine the base path of the project in the repository |
| 58 rx_base = QRegExp('(.+/)(trunk|tags|branches).*') | 59 rx_base = QRegExp('(.+/)(trunk|tags|branches).*') |
| 59 if not rx_base.exactMatch(reposURL): | 60 if not rx_base.exactMatch(reposURL): |
| 60 QMessageBox.critical(None, | 61 E5MessageBox.critical(self, |
| 61 self.trUtf8("Subversion Error"), | 62 self.trUtf8("Subversion Error"), |
| 62 self.trUtf8("""The URL of the project repository has an""" | 63 self.trUtf8("""The URL of the project repository has an""" |
| 63 """ invalid format. The list operation will""" | 64 """ invalid format. The list operation will""" |
| 64 """ be aborted""")) | 65 """ be aborted""")) |
| 65 self.reject() | 66 self.reject() |
