Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
- changeset 1688
- 389ee9508e35
- parent 1509
- c0b5e693b0eb
- child 1773
- 05265254f212
equal
deleted
inserted
replaced
| 1687:5efcb0cea376 | 1688:389ee9508e35 |
|---|---|
| 45 path relative to the project directory starting with the third column. | 45 path relative to the project directory starting with the third column. |
| 46 The allowed status flags are: | 46 The allowed status flags are: |
| 47 <ul> | 47 <ul> |
| 48 <li>"A" path was added but not yet comitted</li> | 48 <li>"A" path was added but not yet comitted</li> |
| 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>"R" path was deleted and then re-added</li> | 51 <li>"R" path was deleted and then re-added</li> |
| 51 <li>"U" path needs an update</li> | 52 <li>"U" path needs an update</li> |
| 52 <li>"Z" path contains a conflict</li> | 53 <li>"Z" path contains a conflict</li> |
| 53 <li>" " path is back at normal</li> | 54 <li>" " path is back at normal</li> |
| 54 </ul> | 55 </ul> |
| 81 elif self.rx_status2.exactMatch(line): | 82 elif self.rx_status2.exactMatch(line): |
| 82 flags = self.rx_status2.cap(1) | 83 flags = self.rx_status2.cap(1) |
| 83 path = self.rx_status2.cap(5).strip() | 84 path = self.rx_status2.cap(5).strip() |
| 84 else: | 85 else: |
| 85 continue | 86 continue |
| 86 if flags[0] in "ACMR" or \ | 87 if flags[0] in "ACDMR" or \ |
| 87 (flags[0] == " " and flags[7] == "*"): | 88 (flags[0] == " " and flags[7] == "*"): |
| 88 if flags[7] == "*": | 89 if flags[7] == "*": |
| 89 status = "U" | 90 status = "U" |
| 90 else: | 91 else: |
| 91 status = flags[0] | 92 status = flags[0] |
| 92 if status == "C": | 93 if status == "C": |
| 93 status = "Z" # give it highest priority | 94 status = "Z" # give it highest priority |
| 95 elif status == "D": | |
| 96 status = "O" | |
| 94 if status == "U": | 97 if status == "U": |
| 95 self.shouldUpdate = True | 98 self.shouldUpdate = True |
| 96 name = path | 99 name = path |
| 97 states[name] = status | 100 states[name] = status |
| 98 try: | 101 try: |
