Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py
- changeset 7260
- 4cc6f121119a
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7259:7c017076c12e | 7260:4cc6f121119a |
|---|---|
| 45 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) | 45 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
| 46 | 46 |
| 47 self.outputGroup.setTitle(text) | 47 self.outputGroup.setTitle(text) |
| 48 self.errorGroup.hide() | 48 self.errorGroup.hide() |
| 49 | 49 |
| 50 pysvnClient.callback_cancel = \ | 50 pysvnClient.callback_cancel = self._clientCancelCallback |
| 51 self._clientCancelCallback | |
| 52 | 51 |
| 53 pysvnClient.callback_notify = \ | 52 pysvnClient.callback_notify = self._clientNotifyCallback |
| 54 self._clientNotifyCallback | 53 pysvnClient.callback_get_login = self._clientLoginCallback |
| 55 pysvnClient.callback_get_login = \ | 54 pysvnClient.callback_ssl_server_trust_prompt = ( |
| 56 self._clientLoginCallback | |
| 57 pysvnClient.callback_ssl_server_trust_prompt = \ | |
| 58 self._clientSslServerTrustPromptCallback | 55 self._clientSslServerTrustPromptCallback |
| 59 pysvnClient.callback_get_log_message = \ | 56 ) |
| 60 self._clientLogCallback | 57 pysvnClient.callback_get_log_message = self._clientLogCallback |
| 61 | 58 |
| 62 self.__hasAddOrDelete = False | 59 self.__hasAddOrDelete = False |
| 63 | 60 |
| 64 if command: | 61 if command: |
| 65 self.resultbox.append(command) | 62 self.resultbox.append(command) |
| 76 """ | 73 """ |
| 77 msg = "" | 74 msg = "" |
| 78 if eventDict["action"] == pysvn.wc_notify_action.update_completed: | 75 if eventDict["action"] == pysvn.wc_notify_action.update_completed: |
| 79 msg = self.tr("Revision {0}.\n").format( | 76 msg = self.tr("Revision {0}.\n").format( |
| 80 eventDict["revision"].number) | 77 eventDict["revision"].number) |
| 81 elif eventDict["path"] != "" and \ | 78 elif ( |
| 82 eventDict["action"] in svnNotifyActionMap and \ | 79 eventDict["path"] != "" and |
| 83 svnNotifyActionMap[eventDict["action"]] is not None: | 80 eventDict["action"] in svnNotifyActionMap and |
| 84 mime = eventDict["mime_type"] == "application/octet-stream" and \ | 81 svnNotifyActionMap[eventDict["action"]] is not None |
| 82 ): | |
| 83 mime = ( | |
| 84 eventDict["mime_type"] == "application/octet-stream" and | |
| 85 self.tr(" (binary)") or "" | 85 self.tr(" (binary)") or "" |
| 86 msg = self.tr("{0} {1}{2}\n")\ | 86 ) |
| 87 .format(self.tr(svnNotifyActionMap[eventDict["action"]]), | 87 msg = self.tr("{0} {1}{2}\n").format( |
| 88 eventDict["path"], | 88 self.tr(svnNotifyActionMap[eventDict["action"]]), |
| 89 mime) | 89 eventDict["path"], |
| 90 mime) | |
| 90 if '.e4p' in eventDict["path"]: | 91 if '.e4p' in eventDict["path"]: |
| 91 self.__hasAddOrDelete = True | 92 self.__hasAddOrDelete = True |
| 92 if eventDict["action"] in [pysvn.wc_notify_action.add, | 93 if eventDict["action"] in [pysvn.wc_notify_action.add, |
| 93 pysvn.wc_notify_action.commit_added, | 94 pysvn.wc_notify_action.commit_added, |
| 94 pysvn.wc_notify_action.commit_deleted, | 95 pysvn.wc_notify_action.commit_deleted, |
