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