Mercurial Repositories > eric / file comparison
comparison: eric7/Project/ProjectBrowserModel.py
eric7/Project/ProjectBrowserModel.py
- branch
- eric7-maintenance
- changeset 8788
- 273b69b8d14d
- parent 8522
- 4f263b89a293
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8786:fbd7fbbdc7d6 | 8788:273b69b8d14d |
|---|---|
| 892 for name in list(self.__vcsStatus.keys()): | 892 for name in list(self.__vcsStatus.keys()): |
| 893 statesList.append(" {0}".format(name)) | 893 statesList.append(" {0}".format(name)) |
| 894 | 894 |
| 895 for name in statesList: | 895 for name in statesList: |
| 896 state = name[0] | 896 state = name[0] |
| 897 name = name[1:].strip() | 897 if state in "AMORUZ ": |
| 898 if state == ' ': | 898 name = name[1:].strip() |
| 899 if name in self.__vcsStatus: | 899 if state == ' ': |
| 900 del self.__vcsStatus[name] | 900 if name in self.__vcsStatus: |
| 901 else: | 901 del self.__vcsStatus[name] |
| 902 self.__vcsStatus[name] = state | 902 else: |
| 903 | 903 self.__vcsStatus[name] = state |
| 904 try: | 904 |
| 905 itm = itemCache[name] | 905 try: |
| 906 except KeyError: | 906 itm = itemCache[name] |
| 907 itm = self.findItem(name) | 907 except KeyError: |
| 908 itm = self.findItem(name) | |
| 909 if itm: | |
| 910 itemCache[name] = itm | |
| 908 if itm: | 911 if itm: |
| 909 itemCache[name] = itm | 912 itm.setVcsState(state) |
| 910 if itm: | 913 itm.setVcsStatus(self.project.vcs.vcsName()) |
| 911 itm.setVcsState(state) | 914 index1 = self.createIndex(itm.row(), 0, itm) |
| 912 itm.setVcsStatus(self.project.vcs.vcsName()) | 915 index2 = self.createIndex( |
| 913 index1 = self.createIndex(itm.row(), 0, itm) | 916 itm.row(), self.rootItem.columnCount(), itm) |
| 914 index2 = self.createIndex( | 917 self.dataChanged.emit(index1, index2) |
| 915 itm.row(), self.rootItem.columnCount(), itm) | 918 |
| 916 self.dataChanged.emit(index1, index2) | 919 head, tail = os.path.split(name) |
| 917 | 920 if head != lastHead: |
| 918 head, tail = os.path.split(name) | 921 if lastHead: |
| 919 if head != lastHead: | 922 self.__changeParentsVCSState(lastHead, itemCache) |
| 920 if lastHead: | 923 lastHead = head |
| 921 self.__changeParentsVCSState(lastHead, itemCache) | |
| 922 lastHead = head | |
| 923 if lastHead: | 924 if lastHead: |
| 924 self.__changeParentsVCSState(lastHead, itemCache) | 925 self.__changeParentsVCSState(lastHead, itemCache) |
| 925 try: | 926 try: |
| 926 globalVcsStatus = sorted(self.__vcsStatus.values())[-1] | 927 globalVcsStatus = sorted(self.__vcsStatus.values())[-1] |
| 927 except IndexError: | 928 except IndexError: |
