Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2847
- 1843ef6e2656
- parent 3009
- bf5ae5d7477d
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 328 counter = 0 | 328 counter = 0 |
| 329 for file in allFiles: | 329 for file in allFiles: |
| 330 uptodate = True | 330 uptodate = True |
| 331 if file.repos_text_status != pysvn.wc_status_kind.none: | 331 if file.repos_text_status != pysvn.wc_status_kind.none: |
| 332 uptodate = uptodate and \ | 332 uptodate = uptodate and \ |
| 333 file.repos_text_status != pysvn.wc_status_kind.modified | 333 file.repos_text_status != \ |
| 334 pysvn.wc_status_kind.modified | |
| 334 if file.repos_prop_status != pysvn.wc_status_kind.none: | 335 if file.repos_prop_status != pysvn.wc_status_kind.none: |
| 335 uptodate = uptodate and \ | 336 uptodate = uptodate and \ |
| 336 file.repos_prop_status != pysvn.wc_status_kind.modified | 337 file.repos_prop_status != \ |
| 338 pysvn.wc_status_kind.modified | |
| 337 | 339 |
| 338 lockState = " " | 340 lockState = " " |
| 339 if file.entry is not None and \ | 341 if file.entry is not None and \ |
| 340 hasattr(file.entry, 'lock_token') and \ | 342 hasattr(file.entry, 'lock_token') and \ |
| 341 file.entry.lock_token is not None: | 343 file.entry.lock_token is not None: |
| 348 elif lockState == "L" and \ | 350 elif lockState == "L" and \ |
| 349 file.repos_lock is not None and \ | 351 file.repos_lock is not None and \ |
| 350 file.entry.lock_token != file.repos_lock["token"]: | 352 file.entry.lock_token != file.repos_lock["token"]: |
| 351 lockState = "S" | 353 lockState = "S" |
| 352 | 354 |
| 353 fpath = Utilities.normcasepath(os.path.join(self.dname, file.path)) | 355 fpath = Utilities.normcasepath( |
| 356 os.path.join(self.dname, file.path)) | |
| 354 if fpath in changelistsDict: | 357 if fpath in changelistsDict: |
| 355 changelist = changelistsDict[fpath] | 358 changelist = changelistsDict[fpath] |
| 356 else: | 359 else: |
| 357 changelist = "" | 360 changelist = "" |
| 358 | 361 |
| 884 | 887 |
| 885 def __getLockActionItems(self, indicators): | 888 def __getLockActionItems(self, indicators): |
| 886 """ | 889 """ |
| 887 Private method to retrieve all entries, that have a locked status. | 890 Private method to retrieve all entries, that have a locked status. |
| 888 | 891 |
| 892 @param indicators list of indicators to check against (list of strings) | |
| 889 @return list of all items with a locked status | 893 @return list of all items with a locked status |
| 890 """ | 894 """ |
| 891 lockitems = [] | 895 lockitems = [] |
| 892 for itm in self.statusList.selectedItems(): | 896 for itm in self.statusList.selectedItems(): |
| 893 if itm.text(self.__lockinfoColumn) in indicators: | 897 if itm.text(self.__lockinfoColumn) in indicators: |
