Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
- changeset 3218
- c33689d92b14
- parent 3190
- a9a94491c4fd
- child 3302
- e92f0dd51979
equal
deleted
inserted
replaced
| 3217:87b8a0745edd | 3218:c33689d92b14 |
|---|---|
| 267 value = (stateDict, remark) | 267 value = (stateDict, remark) |
| 268 elif name == "update": | 268 elif name == "update": |
| 269 if value.endswith("(current)"): | 269 if value.endswith("(current)"): |
| 270 value = ("@CURRENT@", 0, 0) | 270 value = ("@CURRENT@", 0, 0) |
| 271 elif value.endswith("(update)"): | 271 elif value.endswith("(update)"): |
| 272 value = ("@UPDATE@", value.split(" ", 1)[0], 0) | 272 value = ("@UPDATE@", int(value.split(" ", 1)[0]), 0) |
| 273 elif value.endswith("(merge)"): | 273 elif value.endswith("(merge)"): |
| 274 parts = value.split(", ") | 274 parts = value.split(", ") |
| 275 value = ("@MERGE@", parts[0].split(" ", 1)[0], | 275 value = ("@MERGE@", int(parts[0].split(" ", 1)[0]), |
| 276 parts[1].split(" ", 1)[0]) | 276 int(parts[1].split(" ", 1)[0])) |
| 277 else: | 277 else: |
| 278 value = ("@UNKNOWN@", 0, 0) | 278 value = ("@UNKNOWN@", 0, 0) |
| 279 elif name == "remote": | 279 elif name == "remote": |
| 280 if value == "(synced)": | 280 if value == "(synced)": |
| 281 value = (0, 0, 0, 0) | 281 value = (0, 0, 0, 0) |
