Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
- changeset 3020
- 542e97d4ecb3
- parent 3009
- bf5ae5d7477d
- child 3025
- 67064c71df21
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 46 self.typeCombo1.addItems(["trunk/", "tags/", "branches/"]) | 46 self.typeCombo1.addItems(["trunk/", "tags/", "branches/"]) |
| 47 self.typeCombo2.addItems(["trunk/", "tags/", "branches/"]) | 47 self.typeCombo2.addItems(["trunk/", "tags/", "branches/"]) |
| 48 | 48 |
| 49 reposURL = self.vcs.svnGetReposName(path) | 49 reposURL = self.vcs.svnGetReposName(path) |
| 50 if reposURL is None: | 50 if reposURL is None: |
| 51 E5MessageBox.critical(self, | 51 E5MessageBox.critical( |
| 52 self, | |
| 52 self.trUtf8("Subversion Error"), | 53 self.trUtf8("Subversion Error"), |
| 53 self.trUtf8( | 54 self.trUtf8( |
| 54 """The URL of the project repository could not be""" | 55 """The URL of the project repository could not be""" |
| 55 """ retrieved from the working copy. The operation will""" | 56 """ retrieved from the working copy. The operation will""" |
| 56 """ be aborted""")) | 57 """ be aborted""")) |
| 59 | 60 |
| 60 if self.vcs.otherData["standardLayout"]: | 61 if self.vcs.otherData["standardLayout"]: |
| 61 # determine the base path of the project in the repository | 62 # determine the base path of the project in the repository |
| 62 rx_base = QRegExp('(.+/)(trunk|tags|branches).*') | 63 rx_base = QRegExp('(.+/)(trunk|tags|branches).*') |
| 63 if not rx_base.exactMatch(reposURL): | 64 if not rx_base.exactMatch(reposURL): |
| 64 E5MessageBox.critical(self, | 65 E5MessageBox.critical( |
| 66 self, | |
| 65 self.trUtf8("Subversion Error"), | 67 self.trUtf8("Subversion Error"), |
| 66 self.trUtf8("""The URL of the project repository has an""" | 68 self.trUtf8("""The URL of the project repository has an""" |
| 67 """ invalid format. The list operation will""" | 69 """ invalid format. The list operation will""" |
| 68 """ be aborted""")) | 70 """ be aborted""")) |
| 69 self.reject() | 71 self.reject() |
