Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py
Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py
- changeset 1688
- 389ee9508e35
- parent 1509
- c0b5e693b0eb
- child 1773
- 05265254f212
equal
deleted
inserted
replaced
| 1687:5efcb0cea376 | 1688:389ee9508e35 |
|---|---|
| 40 path relative to the project directory starting with the third column. | 40 path relative to the project directory starting with the third column. |
| 41 The allowed status flags are: | 41 The allowed status flags are: |
| 42 <ul> | 42 <ul> |
| 43 <li>"A" path was added but not yet comitted</li> | 43 <li>"A" path was added but not yet comitted</li> |
| 44 <li>"M" path has local changes</li> | 44 <li>"M" path has local changes</li> |
| 45 <li>"O" path was removed</li> | |
| 45 <li>"R" path was deleted and then re-added</li> | 46 <li>"R" path was deleted and then re-added</li> |
| 46 <li>"U" path needs an update</li> | 47 <li>"U" path needs an update</li> |
| 47 <li>"Z" path contains a conflict</li> | 48 <li>"Z" path contains a conflict</li> |
| 48 <li>" " path is back at normal</li> | 49 <li>" " path is back at normal</li> |
| 49 </ul> | 50 </ul> |
| 81 status = "U" | 82 status = "U" |
| 82 self.shouldUpdate = True | 83 self.shouldUpdate = True |
| 83 elif file.text_status == pysvn.wc_status_kind.conflicted or \ | 84 elif file.text_status == pysvn.wc_status_kind.conflicted or \ |
| 84 file.prop_status == pysvn.wc_status_kind.conflicted: | 85 file.prop_status == pysvn.wc_status_kind.conflicted: |
| 85 status = "Z" | 86 status = "Z" |
| 87 elif file.text_status == pysvn.wc_status_kind.deleted or \ | |
| 88 file.prop_status == pysvn.wc_status_kind.deleted: | |
| 89 status = "O" | |
| 86 elif file.text_status == pysvn.wc_status_kind.modified or \ | 90 elif file.text_status == pysvn.wc_status_kind.modified or \ |
| 87 file.prop_status == pysvn.wc_status_kind.modified: | 91 file.prop_status == pysvn.wc_status_kind.modified: |
| 88 status = "M" | 92 status = "M" |
| 89 elif file.text_status == pysvn.wc_status_kind.added or \ | 93 elif file.text_status == pysvn.wc_status_kind.added or \ |
| 90 file.prop_status == pysvn.wc_status_kind.added: | 94 file.prop_status == pysvn.wc_status_kind.added: |
