Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py
- changeset 4013
- e3c30bae0d15
- parent 3702
- dabc69b82c7c
- child 4021
- 195a471c327b
equal
deleted
inserted
replaced
| 4011:0411fc21e40c | 4013:e3c30bae0d15 |
|---|---|
| 13 except NameError: | 13 except NameError: |
| 14 pass | 14 pass |
| 15 | 15 |
| 16 import os | 16 import os |
| 17 | 17 |
| 18 from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot | 18 from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot, qVersion, \ |
| 19 QByteArray | |
| 19 from PyQt5.QtGui import QTextCursor | 20 from PyQt5.QtGui import QTextCursor |
| 20 from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox | 21 from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox |
| 21 | 22 |
| 22 from E5Gui import E5MessageBox | 23 from E5Gui import E5MessageBox |
| 23 | 24 |
| 180 lv = self.revisions[lvers] | 181 lv = self.revisions[lvers] |
| 181 lvers += 1 | 182 lvers += 1 |
| 182 url = QUrl() | 183 url = QUrl() |
| 183 url.setScheme("file") | 184 url.setScheme("file") |
| 184 url.setPath(self.filename) | 185 url.setPath(self.filename) |
| 185 query = lv + '_' + ver | 186 if qVersion() >= "5.0.0": |
| 186 url.setQuery(query) | 187 query = lv + '_' + ver |
| 188 url.setQuery(query) | |
| 189 else: | |
| 190 query = QByteArray() | |
| 191 query.append(lv).append('_').append(ver) | |
| 192 url.setEncodedQuery(query) | |
| 187 dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( | 193 dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( |
| 188 url.toString(), query, | 194 url.toString(), query, |
| 189 self.tr('diff to {0}').format(lv), | 195 self.tr('diff to {0}').format(lv), |
| 190 ) | 196 ) |
| 191 except IndexError: | 197 except IndexError: |
| 270 self.contents.setSource(QUrl('')) | 276 self.contents.setSource(QUrl('')) |
| 271 filename = url.path() | 277 filename = url.path() |
| 272 if Utilities.isWindowsPlatform(): | 278 if Utilities.isWindowsPlatform(): |
| 273 if filename.startswith("/"): | 279 if filename.startswith("/"): |
| 274 filename = filename[1:] | 280 filename = filename[1:] |
| 275 ver = url.query() | 281 if qVersion() >= "5.0.0": |
| 282 ver = url.query() | |
| 283 else: | |
| 284 ver = bytes(url.encodedQuery()).decode() | |
| 276 v1 = ver.split('_')[0] | 285 v1 = ver.split('_')[0] |
| 277 v2 = ver.split('_')[1] | 286 v2 = ver.split('_')[1] |
| 278 if v1 == "" or v2 == "": | 287 if v1 == "" or v2 == "": |
| 279 return | 288 return |
| 280 self.contents.scrollToAnchor(ver) | 289 self.contents.scrollToAnchor(ver) |
