Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py
eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py
- branch
- eric7
- changeset 8620
- 84f7f7867b5f
- parent 8618
- 356a2f1b04b0
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8619:2dc55ddafc68 | 8620:84f7f7867b5f |
|---|---|
| 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>"O" path was removed</li> |
| 46 <li>"R" path was deleted and then re-added</li> | 46 <li>"R" path was deleted and then re-added</li> |
| 47 <li>"U" path needs an update</li> | 47 <li>"U" path needs an update</li> |
| 48 <li>"Z" path contains a conflict</li> | 48 <li>"Z" path contains a conflict</li> |
| 49 <li>"?" path is not tracked</li> | |
| 50 <li>"!" path is missing</li> | |
| 49 <li>" " path is back at normal</li> | 51 <li>" " path is back at normal</li> |
| 50 </ul> | 52 </ul> |
| 51 | 53 |
| 52 @return tuple of flag indicating successful operation (boolean) and | 54 @return tuple of flag indicating successful operation (boolean) and |
| 53 a status message in case of non successful operation (string) | 55 a status message in case of non successful operation (string) |
| 108 elif ( | 110 elif ( |
| 109 file.text_status == pysvn.wc_status_kind.replaced or | 111 file.text_status == pysvn.wc_status_kind.replaced or |
| 110 file.prop_status == pysvn.wc_status_kind.replaced | 112 file.prop_status == pysvn.wc_status_kind.replaced |
| 111 ): | 113 ): |
| 112 status = "R" | 114 status = "R" |
| 115 elif ( | |
| 116 file.text_status == pysvn.wc_status_kind.unversioned or | |
| 117 file.prop_status == pysvn.wc_status_kind.unversioned | |
| 118 ): | |
| 119 status = "?" | |
| 120 elif ( | |
| 121 file.text_status == pysvn.wc_status_kind.missing or | |
| 122 file.prop_status == pysvn.wc_status_kind.missing | |
| 123 ): | |
| 124 status = "!" | |
| 113 if status: | 125 if status: |
| 114 states[file.path] = status | 126 states[file.path] = status |
| 115 try: | 127 try: |
| 116 if self.reportedStates[file.path] != status: | 128 if self.reportedStates[file.path] != status: |
| 117 self.statusList.append( | 129 self.statusList.append( |
