Mercurial Repositories > eric / file comparison
comparison: src/eric7/Project/ProjectBrowserModel.py
src/eric7/Project/ProjectBrowserModel.py
- branch
- eric7
- changeset 10491
- acabc60b19a2
- parent 10470
- cd7bfd539ac9
- child 10517
- aecd5a8c958c
equal
deleted
inserted
replaced
| 10490:527d47826e97 | 10491:acabc60b19a2 |
|---|---|
| 23 BrowserItemType, | 23 BrowserItemType, |
| 24 BrowserModel, | 24 BrowserModel, |
| 25 BrowserSimpleDirectoryItem, | 25 BrowserSimpleDirectoryItem, |
| 26 ) | 26 ) |
| 27 from eric7.Utilities import ModuleParser | 27 from eric7.Utilities import ModuleParser |
| 28 from eric7.VCS.VersionControl import VersionControlState | |
| 28 | 29 |
| 29 | 30 |
| 30 class ProjectBrowserItemMixin: | 31 class ProjectBrowserItemMixin: |
| 31 """ | 32 """ |
| 32 Class implementing common methods of project browser items. | 33 Class implementing common methods of project browser items. |
| 358 ) | 359 ) |
| 359 if self.project.vcs is not None: | 360 if self.project.vcs is not None: |
| 360 fname = f.absoluteFilePath() | 361 fname = f.absoluteFilePath() |
| 361 if ( | 362 if ( |
| 362 states[os.path.normcase(fname)] | 363 states[os.path.normcase(fname)] |
| 363 == self.project.vcs.canBeCommitted | 364 == VersionControlState.Controlled |
| 364 ): | 365 ): |
| 365 node.addVcsStatus(self.project.vcs.vcsName()) | 366 node.addVcsStatus(self.project.vcs.vcsName()) |
| 366 self.project.clearStatusMonitorCachedState(f.absoluteFilePath()) | 367 self.project.clearStatusMonitorCachedState(f.absoluteFilePath()) |
| 367 else: | 368 else: |
| 368 node.addVcsStatus(self.tr("local")) | 369 node.addVcsStatus(self.tr("local")) |
| 441 ) | 442 ) |
| 442 self._addItem(itm, parentItem) | 443 self._addItem(itm, parentItem) |
| 443 if self.project.vcs is not None: | 444 if self.project.vcs is not None: |
| 444 if ( | 445 if ( |
| 445 states[os.path.normcase(fname)] | 446 states[os.path.normcase(fname)] |
| 446 == self.project.vcs.canBeCommitted | 447 == VersionControlState.Controlled |
| 447 ): | 448 ): |
| 448 itm.addVcsStatus(self.project.vcs.vcsName()) | 449 itm.addVcsStatus(self.project.vcs.vcsName()) |
| 449 else: | 450 else: |
| 450 itm.addVcsStatus(self.tr("local")) | 451 itm.addVcsStatus(self.tr("local")) |
| 451 else: | 452 else: |
| 740 ) | 741 ) |
| 741 self._addItem(node, itm) | 742 self._addItem(node, itm) |
| 742 if self.project.vcs is not None: | 743 if self.project.vcs is not None: |
| 743 self.project.vcs.clearStatusCache() | 744 self.project.vcs.clearStatusCache() |
| 744 state = self.project.vcs.vcsRegisteredState(node.name()) | 745 state = self.project.vcs.vcsRegisteredState(node.name()) |
| 745 if state == self.project.vcs.canBeCommitted: | 746 if state == VersionControlState.Controlled: |
| 746 node.addVcsStatus(self.project.vcs.vcsName()) | 747 node.addVcsStatus(self.project.vcs.vcsName()) |
| 747 else: | 748 else: |
| 748 node.addVcsStatus(self.tr("local")) | 749 node.addVcsStatus(self.tr("local")) |
| 749 self.endInsertRows() | 750 self.endInsertRows() |
| 750 | 751 |
| 777 @type str | 778 @type str |
| 778 """ | 779 """ |
| 779 vcs = self.project.vcs | 780 vcs = self.project.vcs |
| 780 if vcs is not None: | 781 if vcs is not None: |
| 781 state = vcs.vcsRegisteredState(name) | 782 state = vcs.vcsRegisteredState(name) |
| 782 if state == vcs.canBeCommitted: | 783 if state == VersionControlState.Controlled: |
| 783 item.addVcsStatus(vcs.vcsName()) | 784 item.addVcsStatus(vcs.vcsName()) |
| 784 else: | 785 else: |
| 785 item.addVcsStatus(self.tr("local")) | 786 item.addVcsStatus(self.tr("local")) |
| 786 else: | 787 else: |
| 787 item.addVcsStatus("") | 788 item.addVcsStatus("") |
| 799 """ | 800 """ |
| 800 vcs = self.project.vcs | 801 vcs = self.project.vcs |
| 801 if vcs is not None: | 802 if vcs is not None: |
| 802 vcs.clearStatusCache() | 803 vcs.clearStatusCache() |
| 803 state = vcs.vcsRegisteredState(name) | 804 state = vcs.vcsRegisteredState(name) |
| 804 if state == vcs.canBeCommitted: | 805 if state == VersionControlState.Controlled: |
| 805 item.setVcsStatus(vcs.vcsName()) | 806 item.setVcsStatus(vcs.vcsName()) |
| 806 else: | 807 else: |
| 807 item.setVcsStatus(self.tr("local")) | 808 item.setVcsStatus(self.tr("local")) |
| 808 if recursive: | 809 if recursive: |
| 809 name = os.path.dirname(name) | 810 name = os.path.dirname(name) |
