Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py
Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 537
- 72b32daeb8d6
- parent 495
- b31b0bffa5b0
- child 564
- b3d966393ba9
equal
deleted
inserted
replaced
| 536:6d8d39753c82 | 537:72b32daeb8d6 |
|---|---|
| 14 | 14 |
| 15 from PyQt4.QtCore import * | 15 from PyQt4.QtCore import * |
| 16 from PyQt4.QtGui import * | 16 from PyQt4.QtGui import * |
| 17 | 17 |
| 18 from E5Gui.E5Application import e5App | 18 from E5Gui.E5Application import e5App |
| 19 from E5Gui import E5MessageBox | |
| 19 | 20 |
| 20 from VCS.VersionControl import VersionControl | 21 from VCS.VersionControl import VersionControl |
| 21 | 22 |
| 22 import pysvn | 23 import pysvn |
| 23 | 24 |
| 209 @param vcsDataDict dictionary of data required for the conversion | 210 @param vcsDataDict dictionary of data required for the conversion |
| 210 @param project reference to the project object | 211 @param project reference to the project object |
| 211 """ | 212 """ |
| 212 success = self.vcsImport(vcsDataDict, project.ppath)[0] | 213 success = self.vcsImport(vcsDataDict, project.ppath)[0] |
| 213 if not success: | 214 if not success: |
| 214 QMessageBox.critical(None, | 215 E5MessageBox.critical(self.__ui, |
| 215 self.trUtf8("Create project in repository"), | 216 self.trUtf8("Create project in repository"), |
| 216 self.trUtf8("""The project could not be created in the repository.""" | 217 self.trUtf8("""The project could not be created in the repository.""" |
| 217 """ Maybe the given repository doesn't exist or the""" | 218 """ Maybe the given repository doesn't exist or the""" |
| 218 """ repository server is down.""")) | 219 """ repository server is down.""")) |
| 219 else: | 220 else: |
| 231 self.vcsCommit(project.ppath, vcsDataDict["message"], True) | 232 self.vcsCommit(project.ppath, vcsDataDict["message"], True) |
| 232 pfn = project.pfile | 233 pfn = project.pfile |
| 233 if not os.path.isfile(pfn): | 234 if not os.path.isfile(pfn): |
| 234 pfn += "z" | 235 pfn += "z" |
| 235 if not os.path.isfile(pfn): | 236 if not os.path.isfile(pfn): |
| 236 QMessageBox.critical(None, | 237 E5MessageBox.critical(self.__ui, |
| 237 self.trUtf8("New project"), | 238 self.trUtf8("New project"), |
| 238 self.trUtf8("""The project could not be checked out of the""" | 239 self.trUtf8("""The project could not be checked out of the""" |
| 239 """ repository.<br />""" | 240 """ repository.<br />""" |
| 240 """Restoring the original contents.""")) | 241 """Restoring the original contents.""")) |
| 241 if os.getcwd() == project.ppath: | 242 if os.getcwd() == project.ppath: |
| 915 """ | 916 """ |
| 916 dname, fname = self.splitPath(name) | 917 dname, fname = self.splitPath(name) |
| 917 | 918 |
| 918 reposURL = self.svnGetReposName(dname) | 919 reposURL = self.svnGetReposName(dname) |
| 919 if reposURL is None: | 920 if reposURL is None: |
| 920 QMessageBox.critical(None, | 921 E5MessageBox.critical(self.__ui, |
| 921 self.trUtf8("Subversion Error"), | 922 self.trUtf8("Subversion Error"), |
| 922 self.trUtf8("""The URL of the project repository could not be""" | 923 self.trUtf8("""The URL of the project repository could not be""" |
| 923 """ retrieved from the working copy. The tag operation will""" | 924 """ retrieved from the working copy. The tag operation will""" |
| 924 """ be aborted""")) | 925 """ be aborted""")) |
| 925 return | 926 return |
| 939 return | 940 return |
| 940 | 941 |
| 941 if self.otherData["standardLayout"]: | 942 if self.otherData["standardLayout"]: |
| 942 rx_base = QRegExp('(.+)/(trunk|tags|branches).*') | 943 rx_base = QRegExp('(.+)/(trunk|tags|branches).*') |
| 943 if not rx_base.exactMatch(reposURL): | 944 if not rx_base.exactMatch(reposURL): |
| 944 QMessageBox.critical(None, | 945 E5MessageBox.critical(self.__ui, |
| 945 self.trUtf8("Subversion Error"), | 946 self.trUtf8("Subversion Error"), |
| 946 self.trUtf8("""The URL of the project repository has an""" | 947 self.trUtf8("""The URL of the project repository has an""" |
| 947 """ invalid format. The tag operation will""" | 948 """ invalid format. The tag operation will""" |
| 948 """ be aborted""")) | 949 """ be aborted""")) |
| 949 return | 950 return |
| 1028 """ | 1029 """ |
| 1029 dname, fname = self.splitPath(name) | 1030 dname, fname = self.splitPath(name) |
| 1030 | 1031 |
| 1031 reposURL = self.svnGetReposName(dname) | 1032 reposURL = self.svnGetReposName(dname) |
| 1032 if reposURL is None: | 1033 if reposURL is None: |
| 1033 QMessageBox.critical(None, | 1034 E5MessageBox.critical(self.__ui, |
| 1034 self.trUtf8("Subversion Error"), | 1035 self.trUtf8("Subversion Error"), |
| 1035 self.trUtf8("""The URL of the project repository could not be""" | 1036 self.trUtf8("""The URL of the project repository could not be""" |
| 1036 """ retrieved from the working copy. The switch operation will""" | 1037 """ retrieved from the working copy. The switch operation will""" |
| 1037 """ be aborted""")) | 1038 """ be aborted""")) |
| 1038 return | 1039 return |
| 1052 return | 1053 return |
| 1053 | 1054 |
| 1054 if self.otherData["standardLayout"]: | 1055 if self.otherData["standardLayout"]: |
| 1055 rx_base = QRegExp('(.+)/(trunk|tags|branches).*') | 1056 rx_base = QRegExp('(.+)/(trunk|tags|branches).*') |
| 1056 if not rx_base.exactMatch(reposURL): | 1057 if not rx_base.exactMatch(reposURL): |
| 1057 QMessageBox.critical(None, | 1058 E5MessageBox.critical(self.__ui, |
| 1058 self.trUtf8("Subversion Error"), | 1059 self.trUtf8("Subversion Error"), |
| 1059 self.trUtf8("""The URL of the project repository has an""" | 1060 self.trUtf8("""The URL of the project repository has an""" |
| 1060 """ invalid format. The switch operation will""" | 1061 """ invalid format. The switch operation will""" |
| 1061 """ be aborted""")) | 1062 """ be aborted""")) |
| 1062 return | 1063 return |
| 1524 """ | 1525 """ |
| 1525 dlg = SvnPropSetDialog(recursive) | 1526 dlg = SvnPropSetDialog(recursive) |
| 1526 if dlg.exec_() == QDialog.Accepted: | 1527 if dlg.exec_() == QDialog.Accepted: |
| 1527 propName, propValue, recurse = dlg.getData() | 1528 propName, propValue, recurse = dlg.getData() |
| 1528 if not propName: | 1529 if not propName: |
| 1529 QMessageBox.critical(None, | 1530 E5MessageBox.critical(self.__ui, |
| 1530 self.trUtf8("Subversion Set Property"), | 1531 self.trUtf8("Subversion Set Property"), |
| 1531 self.trUtf8("""You have to supply a property name. Aborting.""")) | 1532 self.trUtf8("""You have to supply a property name. Aborting.""")) |
| 1532 return | 1533 return |
| 1533 | 1534 |
| 1534 if isinstance(name, list): | 1535 if isinstance(name, list): |
| 1575 dlg = SvnPropDelDialog(recursive) | 1576 dlg = SvnPropDelDialog(recursive) |
| 1576 if dlg.exec_() == QDialog.Accepted: | 1577 if dlg.exec_() == QDialog.Accepted: |
| 1577 propName, recurse = dlg.getData() | 1578 propName, recurse = dlg.getData() |
| 1578 | 1579 |
| 1579 if not propName: | 1580 if not propName: |
| 1580 QMessageBox.critical(None, | 1581 E5MessageBox.critical(self.__ui, |
| 1581 self.trUtf8("Subversion Delete Property"), | 1582 self.trUtf8("Subversion Delete Property"), |
| 1582 self.trUtf8("""You have to supply a property name. Aborting.""")) | 1583 self.trUtf8("""You have to supply a property name. Aborting.""")) |
| 1583 return | 1584 return |
| 1584 | 1585 |
| 1585 if isinstance(name, list): | 1586 if isinstance(name, list): |
