Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3025
- 67064c71df21
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 48 self.typeCombo1.addItems(["trunk/", "tags/", "branches/"]) | 48 self.typeCombo1.addItems(["trunk/", "tags/", "branches/"]) |
| 49 self.typeCombo2.addItems(["trunk/", "tags/", "branches/"]) | 49 self.typeCombo2.addItems(["trunk/", "tags/", "branches/"]) |
| 50 | 50 |
| 51 reposURL = self.vcs.svnGetReposName(path) | 51 reposURL = self.vcs.svnGetReposName(path) |
| 52 if reposURL is None: | 52 if reposURL is None: |
| 53 E5MessageBox.critical(self, | 53 E5MessageBox.critical( |
| 54 self, | |
| 54 self.trUtf8("Subversion Error"), | 55 self.trUtf8("Subversion Error"), |
| 55 self.trUtf8( | 56 self.trUtf8( |
| 56 """The URL of the project repository could not be""" | 57 """The URL of the project repository could not be""" |
| 57 """ retrieved from the working copy. The operation will""" | 58 """ retrieved from the working copy. The operation will""" |
| 58 """ be aborted""")) | 59 """ be aborted""")) |
| 61 | 62 |
| 62 if self.vcs.otherData["standardLayout"]: | 63 if self.vcs.otherData["standardLayout"]: |
| 63 # determine the base path of the project in the repository | 64 # determine the base path of the project in the repository |
| 64 rx_base = QRegExp('(.+/)(trunk|tags|branches).*') | 65 rx_base = QRegExp('(.+/)(trunk|tags|branches).*') |
| 65 if not rx_base.exactMatch(reposURL): | 66 if not rx_base.exactMatch(reposURL): |
| 66 E5MessageBox.critical(self, | 67 E5MessageBox.critical( |
| 68 self, | |
| 67 self.trUtf8("Subversion Error"), | 69 self.trUtf8("Subversion Error"), |
| 68 self.trUtf8("""The URL of the project repository has an""" | 70 self.trUtf8( |
| 71 """The URL of the project repository has an""" | |
| 69 """ invalid format. The list operation will""" | 72 """ invalid format. The list operation will""" |
| 70 """ be aborted""")) | 73 """ be aborted""")) |
| 71 self.reject() | 74 self.reject() |
| 72 return | 75 return |
| 73 | 76 |
