Show More
@@ -4272,23 +4272,26 b' def resolve(ui, repo, *pats, **opts):' | |||||
4272 | fm = ui.formatter('resolve', opts) |
|
4272 | fm = ui.formatter('resolve', opts) | |
4273 | ms = mergemod.mergestate.read(repo) |
|
4273 | ms = mergemod.mergestate.read(repo) | |
4274 | m = scmutil.match(repo[None], pats, opts) |
|
4274 | m = scmutil.match(repo[None], pats, opts) | |
|
4275 | ||||
|
4276 | # Labels and keys based on merge state. Unresolved path conflicts show | |||
|
4277 | # as 'P'. Resolved path conflicts show as 'R', the same as normal | |||
|
4278 | # resolved conflicts. | |||
|
4279 | mergestateinfo = { | |||
|
4280 | 'u': ('resolve.unresolved', 'U'), | |||
|
4281 | 'r': ('resolve.resolved', 'R'), | |||
|
4282 | 'pu': ('resolve.unresolved', 'P'), | |||
|
4283 | 'pr': ('resolve.resolved', 'R'), | |||
|
4284 | 'd': ('resolve.driverresolved', 'D'), | |||
|
4285 | } | |||
|
4286 | ||||
4275 | for f in ms: |
|
4287 | for f in ms: | |
4276 | if not m(f): |
|
4288 | if not m(f): | |
4277 | continue |
|
4289 | continue | |
4278 |
|
4290 | |||
4279 |
|
|
4291 | label, key = mergestateinfo[ms[f]] | |
4280 | l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', |
|
|||
4281 | 'pu': 'unresolved', 'pr': 'resolved', |
|
|||
4282 | 'd': 'driverresolved'}[ms[f]] |
|
|||
4283 |
|
||||
4284 | # Set key based on merge state. Unresolved path conflicts show |
|
|||
4285 | # as 'P'. Resolved path conflicts show as 'R', the same as normal |
|
|||
4286 | # resolved conflicts. |
|
|||
4287 | key = {'pu': 'P', 'pr': 'R'}.get(ms[f], ms[f].upper()) |
|
|||
4288 |
|
||||
4289 | fm.startitem() |
|
4292 | fm.startitem() | |
4290 | fm.condwrite(not nostatus, 'status', '%s ', key, label=l) |
|
4293 | fm.condwrite(not nostatus, 'status', '%s ', key, label=label) | |
4291 | fm.write('path', '%s\n', f, label=l) |
|
4294 | fm.write('path', '%s\n', f, label=label) | |
4292 | fm.end() |
|
4295 | fm.end() | |
4293 | return 0 |
|
4296 | return 0 | |
4294 |
|
4297 |
General Comments 0
You need to be logged in to leave comments.
Login now