Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
- changeset 8143
- 2c730d5fd177
- parent 7923
- 91e843545d9a
- child 8207
- d359172d11be
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 67 with E5OverridenCursor(): | 67 with E5OverridenCursor(): |
| 68 parent = isinstance(self, QWidget) and self or None | 68 parent = isinstance(self, QWidget) and self or None |
| 69 dlg = SvnLoginDialog(realm, username, may_save, parent) | 69 dlg = SvnLoginDialog(realm, username, may_save, parent) |
| 70 res = dlg.exec() | 70 res = dlg.exec() |
| 71 | 71 |
| 72 if res == QDialog.Accepted: | 72 if res == QDialog.DialogCode.Accepted: |
| 73 loginData = dlg.getData() | 73 loginData = dlg.getData() |
| 74 return (True, loginData[0], loginData[1], loginData[2]) | 74 return (True, loginData[0], loginData[1], loginData[2]) |
| 75 else: | 75 else: |
| 76 return (False, "", "", False) | 76 return (False, "", "", False) |
| 77 | 77 |
| 133 if self.logMessage: | 133 if self.logMessage: |
| 134 return True, self.logMessage | 134 return True, self.logMessage |
| 135 else: | 135 else: |
| 136 # call CommitDialog and get message from there | 136 # call CommitDialog and get message from there |
| 137 dlg = SvnCommitDialog(self) | 137 dlg = SvnCommitDialog(self) |
| 138 if dlg.exec() == QDialog.Accepted: | 138 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 139 msg = dlg.logMessage() | 139 msg = dlg.logMessage() |
| 140 if msg: | 140 if msg: |
| 141 return True, msg | 141 return True, msg |
| 142 else: | 142 else: |
| 143 return True, "***" # always supply a valid log message | 143 return True, "***" # always supply a valid log message |
