Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py
eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py
- branch
- eric7
- changeset 8620
- 84f7f7867b5f
- parent 8618
- 356a2f1b04b0
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8619:2dc55ddafc68 | 8620:84f7f7867b5f |
|---|---|
| 49 <li>"M" path has local changes</li> | 49 <li>"M" path has local changes</li> |
| 50 <li>"O" path was removed</li> | 50 <li>"O" path was removed</li> |
| 51 <li>"R" path was deleted and then re-added</li> | 51 <li>"R" path was deleted and then re-added</li> |
| 52 <li>"U" path needs an update</li> | 52 <li>"U" path needs an update</li> |
| 53 <li>"Z" path contains a conflict</li> | 53 <li>"Z" path contains a conflict</li> |
| 54 <li>"?" path is not tracked</li> | |
| 55 <li>"!" path is missing</li> | |
| 54 <li>" " path is back at normal</li> | 56 <li>" " path is back at normal</li> |
| 55 </ul> | 57 </ul> |
| 56 | 58 |
| 57 @return tuple of flag indicating successful operation (boolean) and | 59 @return tuple of flag indicating successful operation (boolean) and |
| 58 a status message in case of non successful operation (string) | 60 a status message in case of non successful operation (string) |
| 105 if flags[1] == "D": | 107 if flags[1] == "D": |
| 106 status = "O" | 108 status = "O" |
| 107 else: | 109 else: |
| 108 status = flags[1] | 110 status = flags[1] |
| 109 states[name] = status | 111 states[name] = status |
| 112 elif flags == "??": | |
| 113 states[name] = "?" | |
| 110 | 114 |
| 111 # step 2: collect the status to be reported back | 115 # step 2: collect the status to be reported back |
| 112 for name in states: | 116 for name in states: |
| 113 try: | 117 try: |
| 114 if self.reportedStates[name] != states[name]: | 118 if self.reportedStates[name] != states[name]: |
