Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- branch
- Py2 comp.
- changeset 3141
- 72f3bde98c58
- parent 3060
- 5883ce99ee12
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3127:e47a9d5954e8 | 3141:72f3bde98c58 |
|---|---|
| 9 """ | 9 """ |
| 10 | 10 |
| 11 from __future__ import unicode_literals # __IGNORE_WARNING__ | 11 from __future__ import unicode_literals # __IGNORE_WARNING__ |
| 12 | 12 |
| 13 import os | 13 import os |
| 14 import sys | |
| 14 | 15 |
| 15 import pysvn | 16 import pysvn |
| 16 | 17 |
| 17 from PyQt4.QtCore import QMutexLocker, Qt, pyqtSlot | 18 from PyQt4.QtCore import QMutexLocker, Qt, pyqtSlot |
| 18 from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QApplication, QMenu, \ | 19 from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QApplication, QMenu, \ |
| 315 depth = pysvn.depth.infinity | 316 depth = pysvn.depth.infinity |
| 316 else: | 317 else: |
| 317 depth = pysvn.depth.immediate | 318 depth = pysvn.depth.immediate |
| 318 changelists = self.client.get_changelist(name, depth=depth) | 319 changelists = self.client.get_changelist(name, depth=depth) |
| 319 for fpath, changelist in changelists: | 320 for fpath, changelist in changelists: |
| 321 if sys.version_info[0] == 2: | |
| 322 fpath = fpath.decode('utf-8') | |
| 323 changelist = changelist.decode('utf-8') | |
| 320 fpath = Utilities.normcasepath(fpath) | 324 fpath = Utilities.normcasepath(fpath) |
| 321 changelistsDict[fpath] = changelist | 325 changelistsDict[fpath] = changelist |
| 322 hideChangelistColumn = hideChangelistColumn and \ | 326 hideChangelistColumn = hideChangelistColumn and \ |
| 323 len(changelistsDict) == 0 | 327 len(changelistsDict) == 0 |
| 324 | 328 |
