Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9653
- e67609152c5e
- child 10439
- 21c28b0f9e41
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 21 | 21 |
| 22 def __init__(self, log=""): | 22 def __init__(self, log=""): |
| 23 """ | 23 """ |
| 24 Constructor | 24 Constructor |
| 25 | 25 |
| 26 @param log optional log message (string) | 26 @param log optional log message |
| 27 @type str | |
| 27 """ | 28 """ |
| 28 self.shouldCancel = False | 29 self.shouldCancel = False |
| 29 self.logMessage = log | 30 self.logMessage = log |
| 30 | 31 |
| 31 def _cancel(self): | 32 def _cancel(self): |
| 43 def _clientCancelCallback(self): | 44 def _clientCancelCallback(self): |
| 44 """ | 45 """ |
| 45 Protected method called by the client to check for cancellation. | 46 Protected method called by the client to check for cancellation. |
| 46 | 47 |
| 47 @return flag indicating a cancellation | 48 @return flag indicating a cancellation |
| 49 @rtype bool | |
| 48 """ | 50 """ |
| 49 QApplication.processEvents() | 51 QApplication.processEvents() |
| 50 return self.shouldCancel | 52 return self.shouldCancel |
| 51 | 53 |
| 52 def _clientLoginCallback(self, realm, username, may_save): | 54 def _clientLoginCallback(self, realm, username, may_save): |
| 53 """ | 55 """ |
| 54 Protected method called by the client to get login information. | 56 Protected method called by the client to get login information. |
| 55 | 57 |
| 56 @param realm name of the realm of the requested credentials (string) | 58 @param realm name of the realm of the requested credentials |
| 57 @param username username as supplied by subversion (string) | 59 @type str |
| 60 @param username username as supplied by subversion | |
| 61 @type str | |
| 58 @param may_save flag indicating, that subversion is willing to save | 62 @param may_save flag indicating, that subversion is willing to save |
| 59 the answers returned (boolean) | 63 the answers returned |
| 64 @type bool | |
| 60 @return tuple of four values (retcode, username, password, save). | 65 @return tuple of four values (retcode, username, password, save). |
| 61 Retcode should be True, if username and password should be used | 66 Retcode should be True, if username and password should be used |
| 62 by subversion, username and password contain the relevant data | 67 by subversion, username and password contain the relevant data |
| 63 as strings and save is a flag indicating, that username and | 68 as strings and save is a flag indicating, that username and |
| 64 password should be saved. | 69 password should be saved. |
| 70 @rtype tuple of (bool, str, str, bool) | |
| 65 """ | 71 """ |
| 66 from .SvnLoginDialog import SvnLoginDialog | 72 from .SvnLoginDialog import SvnLoginDialog |
| 67 | 73 |
| 68 with EricOverridenCursor(): | 74 with EricOverridenCursor(): |
| 69 parent = isinstance(self, QWidget) and self or None | 75 parent = isinstance(self, QWidget) and self or None |
| 80 """ | 86 """ |
| 81 Protected method called by the client to request acceptance for a | 87 Protected method called by the client to request acceptance for a |
| 82 ssl server certificate. | 88 ssl server certificate. |
| 83 | 89 |
| 84 @param trust_dict dictionary containing the trust data | 90 @param trust_dict dictionary containing the trust data |
| 91 @type dict | |
| 85 @return tuple of three values (retcode, acceptedFailures, save). | 92 @return tuple of three values (retcode, acceptedFailures, save). |
| 86 Retcode should be true, if the certificate should be accepted, | 93 Retcode should be True, if the certificate should be accepted, |
| 87 acceptedFailures should indicate the accepted certificate failures | 94 acceptedFailures should indicate the accepted certificate failures |
| 88 and save should be True, if subversion should save the certificate. | 95 and save should be True, if subversion should save the certificate. |
| 96 @rtype tuple of (bool, list of str, bool) | |
| 89 """ | 97 """ |
| 90 from eric7.EricWidgets import EricMessageBox | 98 from eric7.EricWidgets import EricMessageBox |
| 91 | 99 |
| 92 with EricOverridenCursor(): | 100 with EricOverridenCursor(): |
| 93 parent = isinstance(self, QWidget) and self or None | 101 parent = isinstance(self, QWidget) and self or None |
| 133 | 141 |
| 134 def _clientLogCallback(self): | 142 def _clientLogCallback(self): |
| 135 """ | 143 """ |
| 136 Protected method called by the client to request a log message. | 144 Protected method called by the client to request a log message. |
| 137 | 145 |
| 138 @return a flag indicating success and the log message (string) | 146 @return a flag indicating success and the log message |
| 147 @rtype str | |
| 139 """ | 148 """ |
| 140 from .SvnCommitDialog import SvnCommitDialog | 149 from .SvnCommitDialog import SvnCommitDialog |
| 141 | 150 |
| 142 if self.logMessage: | 151 if self.logMessage: |
| 143 return True, self.logMessage | 152 return True, self.logMessage |
