Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py
- changeset 3190
- a9a94491c4fd
- parent 3160
- 209a07d7e401
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3189:9a21c547de5f | 3190:a9a94491c4fd |
|---|---|
| 44 | 44 |
| 45 self.process = QProcess() | 45 self.process = QProcess() |
| 46 self.vcs = vcs | 46 self.vcs = vcs |
| 47 | 47 |
| 48 self.contents.setHtml( | 48 self.contents.setHtml( |
| 49 self.trUtf8('<b>Processing your request, please wait...</b>')) | 49 self.tr('<b>Processing your request, please wait...</b>')) |
| 50 | 50 |
| 51 self.process.finished.connect(self.__procFinished) | 51 self.process.finished.connect(self.__procFinished) |
| 52 self.process.readyReadStandardOutput.connect(self.__readStdout) | 52 self.process.readyReadStandardOutput.connect(self.__readStdout) |
| 53 self.process.readyReadStandardError.connect(self.__readStderr) | 53 self.process.readyReadStandardError.connect(self.__readStderr) |
| 54 | 54 |
| 69 self.rx_flags = QRegExp(' ([ADM])( .*)\\s*') | 69 self.rx_flags = QRegExp(' ([ADM])( .*)\\s*') |
| 70 # three blanks followed by A or D or M | 70 # three blanks followed by A or D or M |
| 71 self.rx_changed = QRegExp('Changed .*\\s*') | 71 self.rx_changed = QRegExp('Changed .*\\s*') |
| 72 | 72 |
| 73 self.flags = { | 73 self.flags = { |
| 74 'A': self.trUtf8('Added'), | 74 'A': self.tr('Added'), |
| 75 'D': self.trUtf8('Deleted'), | 75 'D': self.tr('Deleted'), |
| 76 'M': self.trUtf8('Modified') | 76 'M': self.tr('Modified') |
| 77 } | 77 } |
| 78 | 78 |
| 79 self.revisions = [] # stack of remembered revisions | 79 self.revisions = [] # stack of remembered revisions |
| 80 self.revString = self.trUtf8('revision') | 80 self.revString = self.tr('revision') |
| 81 | 81 |
| 82 self.buf = [] # buffer for stdout | 82 self.buf = [] # buffer for stdout |
| 83 self.diff = None | 83 self.diff = None |
| 84 | 84 |
| 85 self.sbsCheckBox.setEnabled(isFile) | 85 self.sbsCheckBox.setEnabled(isFile) |
| 132 procStarted = self.process.waitForStarted(5000) | 132 procStarted = self.process.waitForStarted(5000) |
| 133 if not procStarted: | 133 if not procStarted: |
| 134 self.inputGroup.setEnabled(False) | 134 self.inputGroup.setEnabled(False) |
| 135 E5MessageBox.critical( | 135 E5MessageBox.critical( |
| 136 self, | 136 self, |
| 137 self.trUtf8('Process Generation Error'), | 137 self.tr('Process Generation Error'), |
| 138 self.trUtf8( | 138 self.tr( |
| 139 'The process {0} could not be started. ' | 139 'The process {0} could not be started. ' |
| 140 'Ensure, that it is in the search path.' | 140 'Ensure, that it is in the search path.' |
| 141 ).format('svn')) | 141 ).format('svn')) |
| 142 | 142 |
| 143 def __procFinished(self, exitCode, exitStatus): | 143 def __procFinished(self, exitCode, exitStatus): |
| 180 query.append(lv).append('_').append(ver) | 180 query.append(lv).append('_').append(ver) |
| 181 url.setEncodedQuery(query) | 181 url.setEncodedQuery(query) |
| 182 dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( | 182 dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( |
| 183 url.toString(), | 183 url.toString(), |
| 184 query, | 184 query, |
| 185 self.trUtf8('diff to {0}').format(lv), | 185 self.tr('diff to {0}').format(lv), |
| 186 ) | 186 ) |
| 187 except IndexError: | 187 except IndexError: |
| 188 pass | 188 pass |
| 189 dstr += '<br />\n' | 189 dstr += '<br />\n' |
| 190 self.contents.insertHtml(dstr) | 190 self.contents.insertHtml(dstr) |
| 191 | 191 |
| 192 dstr = self.trUtf8('<i>author: {0}</i><br />\n').format(author) | 192 dstr = self.tr('<i>author: {0}</i><br />\n').format(author) |
| 193 self.contents.insertHtml(dstr) | 193 self.contents.insertHtml(dstr) |
| 194 | 194 |
| 195 dstr = self.trUtf8('<i>date: {0}</i><br />\n').format(date) | 195 dstr = self.tr('<i>date: {0}</i><br />\n').format(date) |
| 196 self.contents.insertHtml(dstr) | 196 self.contents.insertHtml(dstr) |
| 197 | 197 |
| 198 elif self.rx_sep.exactMatch(s) or self.rx_sep2.exactMatch(s): | 198 elif self.rx_sep.exactMatch(s) or self.rx_sep2.exactMatch(s): |
| 199 self.contents.insertHtml('<hr />\n') | 199 self.contents.insertHtml('<hr />\n') |
| 200 | 200 |
