Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
- changeset 417
- 459855d3066e
- parent 248
- f4561c24989a
- child 791
- 9ec2ac20e54e
equal
deleted
inserted
replaced
| 416:9ca4a5979826 | 417:459855d3066e |
|---|---|
| 94 states[name] = "Z" # conflict | 94 states[name] = "Z" # conflict |
| 95 | 95 |
| 96 for name in states: | 96 for name in states: |
| 97 try: | 97 try: |
| 98 if self.reportedStates[name] != states[name]: | 98 if self.reportedStates[name] != states[name]: |
| 99 self.statusList.append("%s %s" % (states[name], name)) | 99 self.statusList.append("{0} {1}".format(states[name], name)) |
| 100 except KeyError: | 100 except KeyError: |
| 101 self.statusList.append("%s %s" % (states[name], name)) | 101 self.statusList.append("{0} {1}".format(states[name], name)) |
| 102 for name in self.reportedStates.keys(): | 102 for name in self.reportedStates.keys(): |
| 103 if name not in states: | 103 if name not in states: |
| 104 self.statusList.append(" %s" % name) | 104 self.statusList.append(" {0}".format(name)) |
| 105 self.reportedStates = states | 105 self.reportedStates = states |
| 106 return True, \ | 106 return True, \ |
| 107 self.trUtf8("Mercurial status checked successfully") | 107 self.trUtf8("Mercurial status checked successfully") |
| 108 else: | 108 else: |
| 109 process.kill() | 109 process.kill() |
