Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
- changeset 216
- 6f9713e8d570
- parent 197
- 0e12ee787967
- child 248
- f4561c24989a
equal
deleted
inserted
replaced
| 215:e8978dca44af | 216:6f9713e8d570 |
|---|---|
| 39 path relative to the project directory starting with the third column. | 39 path relative to the project directory starting with the third column. |
| 40 The allowed status flags are: | 40 The allowed status flags are: |
| 41 <ul> | 41 <ul> |
| 42 <li>"A" path was added but not yet comitted</li> | 42 <li>"A" path was added but not yet comitted</li> |
| 43 <li>"M" path has local changes</li> | 43 <li>"M" path has local changes</li> |
| 44 <li>"O" path was removed</li> | |
| 44 <li>"R" path was deleted and then re-added</li> | 45 <li>"R" path was deleted and then re-added</li> |
| 45 <li>"U" path needs an update</li> | 46 <li>"U" path needs an update</li> |
| 46 <li>"Z" path contains a conflict</li> | 47 <li>"Z" path contains a conflict</li> |
| 47 <li>" " path is back at normal</li> | 48 <li>" " path is back at normal</li> |
| 48 </ul> | 49 </ul> |
| 67 str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') | 68 str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') |
| 68 states = {} | 69 states = {} |
| 69 for line in output.splitlines(): | 70 for line in output.splitlines(): |
| 70 if not line.startswith(" "): | 71 if not line.startswith(" "): |
| 71 flag, name = line.split(" ", 1) | 72 flag, name = line.split(" ", 1) |
| 72 if flag in "AM": | 73 if flag in "AMR": |
| 73 status = flag | 74 if flag == "R": |
| 75 status = "O" | |
| 76 else: | |
| 77 status = flag | |
| 74 states[name] = status | 78 states[name] = status |
| 75 | 79 |
| 76 args = [] | 80 args = [] |
| 77 args.append('resolve') | 81 args.append('resolve') |
| 78 args.append('--list') | 82 args.append('--list') |
