Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- changeset 3009
- bf5ae5d7477d
- parent 2963
- 745d38097b7f
- child 3020
- 542e97d4ecb3
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 3008:7848489bcb92 | 3009:bf5ae5d7477d |
|---|---|
| 326 counter = 0 | 326 counter = 0 |
| 327 for file in allFiles: | 327 for file in allFiles: |
| 328 uptodate = True | 328 uptodate = True |
| 329 if file.repos_text_status != pysvn.wc_status_kind.none: | 329 if file.repos_text_status != pysvn.wc_status_kind.none: |
| 330 uptodate = uptodate and \ | 330 uptodate = uptodate and \ |
| 331 file.repos_text_status != pysvn.wc_status_kind.modified | 331 file.repos_text_status != \ |
| 332 pysvn.wc_status_kind.modified | |
| 332 if file.repos_prop_status != pysvn.wc_status_kind.none: | 333 if file.repos_prop_status != pysvn.wc_status_kind.none: |
| 333 uptodate = uptodate and \ | 334 uptodate = uptodate and \ |
| 334 file.repos_prop_status != pysvn.wc_status_kind.modified | 335 file.repos_prop_status != \ |
| 336 pysvn.wc_status_kind.modified | |
| 335 | 337 |
| 336 lockState = " " | 338 lockState = " " |
| 337 if file.entry is not None and \ | 339 if file.entry is not None and \ |
| 338 hasattr(file.entry, 'lock_token') and \ | 340 hasattr(file.entry, 'lock_token') and \ |
| 339 file.entry.lock_token is not None: | 341 file.entry.lock_token is not None: |
| 346 elif lockState == "L" and \ | 348 elif lockState == "L" and \ |
| 347 file.repos_lock is not None and \ | 349 file.repos_lock is not None and \ |
| 348 file.entry.lock_token != file.repos_lock["token"]: | 350 file.entry.lock_token != file.repos_lock["token"]: |
| 349 lockState = "S" | 351 lockState = "S" |
| 350 | 352 |
| 351 fpath = Utilities.normcasepath(os.path.join(self.dname, file.path)) | 353 fpath = Utilities.normcasepath( |
| 354 os.path.join(self.dname, file.path)) | |
| 352 if fpath in changelistsDict: | 355 if fpath in changelistsDict: |
| 353 changelist = changelistsDict[fpath] | 356 changelist = changelistsDict[fpath] |
| 354 else: | 357 else: |
| 355 changelist = "" | 358 changelist = "" |
| 356 | 359 |
