Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- branch
- eric7
- changeset 9624
- b47dfa7a137d
- parent 9576
- be9f8e7e42e0
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9623:9c1f429cb56b | 9624:b47dfa7a137d |
|---|---|
| 20 QMenu, | 20 QMenu, |
| 21 QTreeWidgetItem, | 21 QTreeWidgetItem, |
| 22 QWidget, | 22 QWidget, |
| 23 ) | 23 ) |
| 24 | 24 |
| 25 from eric7 import Preferences, Utilities | 25 from eric7 import Preferences |
| 26 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor | 26 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor |
| 27 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker | 27 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker |
| 28 from eric7.EricWidgets import EricMessageBox | 28 from eric7.EricWidgets import EricMessageBox |
| 29 from eric7.EricWidgets.EricApplication import ericApp | 29 from eric7.EricWidgets.EricApplication import ericApp |
| 30 from eric7.SystemUtilities import FileSystemUtilities | |
| 30 | 31 |
| 31 from .SvnConst import svnStatusMap | 32 from .SvnConst import svnStatusMap |
| 32 from .SvnDialogMixin import SvnDialogMixin | 33 from .SvnDialogMixin import SvnDialogMixin |
| 33 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog | 34 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog |
| 34 | 35 |
| 358 depth = pysvn.depth.infinity | 359 depth = pysvn.depth.infinity |
| 359 else: | 360 else: |
| 360 depth = pysvn.depth.immediate | 361 depth = pysvn.depth.immediate |
| 361 changelists = self.client.get_changelist(name, depth=depth) | 362 changelists = self.client.get_changelist(name, depth=depth) |
| 362 for fpath, changelist in changelists: | 363 for fpath, changelist in changelists: |
| 363 fpath = Utilities.normcasepath(fpath) | 364 fpath = FileSystemUtilities.normcasepath(fpath) |
| 364 changelistsDict[fpath] = changelist | 365 changelistsDict[fpath] = changelist |
| 365 hideChangelistColumn = ( | 366 hideChangelistColumn = ( |
| 366 hideChangelistColumn and len(changelistsDict) == 0 | 367 hideChangelistColumn and len(changelistsDict) == 0 |
| 367 ) | 368 ) |
| 368 | 369 |
| 407 and file.entry.lock_token | 408 and file.entry.lock_token |
| 408 != file.repos_lock["token"] | 409 != file.repos_lock["token"] |
| 409 ): | 410 ): |
| 410 lockState = "S" | 411 lockState = "S" |
| 411 | 412 |
| 412 fpath = Utilities.normcasepath( | 413 fpath = FileSystemUtilities.normcasepath( |
| 413 os.path.join(self.dname, file.path) | 414 os.path.join(self.dname, file.path) |
| 414 ) | 415 ) |
| 415 changelist = ( | 416 changelist = ( |
| 416 changelistsDict[fpath] | 417 changelistsDict[fpath] |
| 417 if fpath in changelistsDict | 418 if fpath in changelistsDict |
