##// END OF EJS Templates
debugmergestate: migrate `opts` to native kwargs
Matt Harbison -
r51850:81801dc5 default
parent child Browse files
Show More
@@ -2490,9 +2490,8 b' def debugmergestate(ui, repo, *args, **o'
2490 else:
2490 else:
2491 ui.writenoi18n(b'v1 and v2 states mismatch: using v1\n')
2491 ui.writenoi18n(b'v1 and v2 states mismatch: using v1\n')
2492
2492
2493 opts = pycompat.byteskwargs(opts)
2493 if not opts['template']:
2494 if not opts[b'template']:
2494 opts['template'] = (
2495 opts[b'template'] = (
2496 b'{if(commits, "", "no merge state found\n")}'
2495 b'{if(commits, "", "no merge state found\n")}'
2497 b'{commits % "{name}{if(label, " ({label})")}: {node}\n"}'
2496 b'{commits % "{name}{if(label, " ({label})")}: {node}\n"}'
2498 b'{files % "file: {path} (state \\"{state}\\")\n'
2497 b'{files % "file: {path} (state \\"{state}\\")\n'
@@ -2512,7 +2511,7 b' def debugmergestate(ui, repo, *args, **o'
2512
2511
2513 ms = mergestatemod.mergestate.read(repo)
2512 ms = mergestatemod.mergestate.read(repo)
2514
2513
2515 fm = ui.formatter(b'debugmergestate', opts)
2514 fm = ui.formatter(b'debugmergestate', pycompat.byteskwargs(opts))
2516 fm.startitem()
2515 fm.startitem()
2517
2516
2518 fm_commits = fm.nested(b'commits')
2517 fm_commits = fm.nested(b'commits')
General Comments 0
You need to be logged in to leave comments. Login now