Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py
eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 8259
- 2bbec88047dd
- parent 8243
- cc717c2ae956
- child 8273
- 698ae46f40a4
equal
deleted
inserted
replaced
| 8258:82b608e352ec | 8259:2bbec88047dd |
|---|---|
| 583 msg, " ".join(fnames)), | 583 msg, " ".join(fnames)), |
| 584 client) | 584 client) |
| 585 QApplication.processEvents() | 585 QApplication.processEvents() |
| 586 try: | 586 try: |
| 587 with E5MutexLocker(self.vcsExecutionMutex): | 587 with E5MutexLocker(self.vcsExecutionMutex): |
| 588 if changelists: | 588 rev = ( |
| 589 rev = client.checkin(fnames, msg, | 589 client.checkin( |
| 590 recurse=recurse, keep_locks=keeplocks, | 590 fnames, msg, recurse=recurse, keep_locks=keeplocks, |
| 591 keep_changelist=keepChangelists, | 591 keep_changelist=keepChangelists, |
| 592 changelists=changelists) | 592 changelists=changelists) |
| 593 else: | 593 if changelists else |
| 594 rev = client.checkin(fnames, msg, | 594 client.checkin( |
| 595 recurse=recurse, keep_locks=keeplocks) | 595 fnames, msg, recurse=recurse, keep_locks=keeplocks) |
| 596 ) | |
| 596 except pysvn.ClientError as e: | 597 except pysvn.ClientError as e: |
| 597 rev = None | 598 rev = None |
| 598 if not noDialog: | 599 if not noDialog: |
| 599 dlg.showError(e.args[0]) | 600 dlg.showError(e.args[0]) |
| 600 if not noDialog: | 601 if not noDialog: |
| 1043 """The URL of the project repository could not be""" | 1044 """The URL of the project repository could not be""" |
| 1044 """ retrieved from the working copy. The tag operation""" | 1045 """ retrieved from the working copy. The tag operation""" |
| 1045 """ will be aborted""")) | 1046 """ will be aborted""")) |
| 1046 return | 1047 return |
| 1047 | 1048 |
| 1048 if self.otherData["standardLayout"]: | 1049 url = ( |
| 1049 url = None | 1050 None |
| 1050 else: | 1051 if self.otherData["standardLayout"] else |
| 1051 url = self.svnNormalizeURL(reposURL) | 1052 self.svnNormalizeURL(reposURL) |
| 1053 ) | |
| 1052 from .SvnTagDialog import SvnTagDialog | 1054 from .SvnTagDialog import SvnTagDialog |
| 1053 dlg = SvnTagDialog(self.allTagsBranchesList, url, | 1055 dlg = SvnTagDialog(self.allTagsBranchesList, url, |
| 1054 self.otherData["standardLayout"]) | 1056 self.otherData["standardLayout"]) |
| 1055 if dlg.exec() == QDialog.DialogCode.Accepted: | 1057 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 1056 tag, tagOp = dlg.getParameters() | 1058 tag, tagOp = dlg.getParameters() |
| 1185 """The URL of the project repository could not be""" | 1187 """The URL of the project repository could not be""" |
| 1186 """ retrieved from the working copy. The switch""" | 1188 """ retrieved from the working copy. The switch""" |
| 1187 """ operation will be aborted""")) | 1189 """ operation will be aborted""")) |
| 1188 return False | 1190 return False |
| 1189 | 1191 |
| 1190 if self.otherData["standardLayout"]: | 1192 url = ( |
| 1191 url = None | 1193 None |
| 1192 else: | 1194 if self.otherData["standardLayout"] else |
| 1193 url = self.svnNormalizeURL(reposURL) | 1195 self.svnNormalizeURL(reposURL) |
| 1196 ) | |
| 1194 from .SvnSwitchDialog import SvnSwitchDialog | 1197 from .SvnSwitchDialog import SvnSwitchDialog |
| 1195 dlg = SvnSwitchDialog(self.allTagsBranchesList, url, | 1198 dlg = SvnSwitchDialog(self.allTagsBranchesList, url, |
| 1196 self.otherData["standardLayout"]) | 1199 self.otherData["standardLayout"]) |
| 1197 if dlg.exec() == QDialog.DialogCode.Accepted: | 1200 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 1198 tag, tagType = dlg.getParameters() | 1201 tag, tagType = dlg.getParameters() |
| 1707 try: | 1710 try: |
| 1708 entry = self.getClient().info(ppath) | 1711 entry = self.getClient().info(ppath) |
| 1709 except pysvn.ClientError as e: | 1712 except pysvn.ClientError as e: |
| 1710 return e.args[0] | 1713 return e.args[0] |
| 1711 | 1714 |
| 1712 if hasattr(pysvn, 'svn_api_version'): | 1715 apiVersion = ( |
| 1713 apiVersion = "{0} {1}".format( | 1716 "{0} {1}".format( |
| 1714 ".".join([str(v) for v in pysvn.svn_api_version[:3]]), | 1717 ".".join([str(v) for v in pysvn.svn_api_version[:3]]), |
| 1715 pysvn.svn_api_version[3]) | 1718 pysvn.svn_api_version[3]) |
| 1716 else: | 1719 if hasattr(pysvn, 'svn_api_version') else |
| 1717 apiVersion = QCoreApplication.translate('subversion', "unknown") | 1720 QCoreApplication.translate('subversion', "unknown") |
| 1721 ) | |
| 1718 | 1722 |
| 1719 hmsz = time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)) | 1723 hmsz = time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)) |
| 1720 return QCoreApplication.translate( | 1724 return QCoreApplication.translate( |
| 1721 'subversion', | 1725 'subversion', |
| 1722 """<h3>Repository information</h3>""" | 1726 """<h3>Repository information</h3>""" |
