This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Abandoned	durin42	D8565 mergestate: optimize unresolvedcount() a little bit
Abandoned	durin42	D8564 fakemergerecord: get mergestate via context
Abandoned	durin42	D8563 localrepo: get mergestate via context
Abandoned	durin42	D8626 memctx: add mergestate method
Abandoned	durin42	D8562 shelve: get mergestate via context
Abandoned	durin42	D8561 hg: get mergestate via context
Abandoned	durin42	D8554 strip: get mergestate via context
Abandoned	durin42	D8560 templatekw: get mergestate via context
Abandoned	durin42	D8559 revset: get mergestate via context
Abandoned	durin42	D8558 fileset: get mergestate via context
Abandoned	durin42	D8557 debugcommands: get mergestate via context
Abandoned	durin42	D8556 commands: get mergestate via context
Abandoned	durin42	D8555 cmdutil: get mergestate via context
Abandoned	durin42	D8553 histedit: use context to load mergestate instead of loading it directly
Abandoned	durin42	D8552 fix: use context to fetch mergestate instead of loading it directly

Diff 23021

	b' rename side: {rename_side}\n'			b' rename side: {rename_side}\n'
	b' renamed path: {renamed_path}\n'			b' renamed path: {renamed_path}\n'
	b'")}'			b'")}'
	b'{extras % " extra: {key} = {value}\n"}'			b'{extras % " extra: {key} = {value}\n"}'
	b'"}'			b'"}'
	b'{extras % "extra: {file} ({key} = {value})\n"}'			b'{extras % "extra: {file} ({key} = {value})\n"}'
	)			)

	ms = mergestatemod.mergestate.read(repo)			ms = repo[None].mergestate()

	fm = ui.formatter(b'debugmergestate', opts)			fm = ui.formatter(b'debugmergestate', opts)
	fm.startitem()			fm.startitem()

	fm_commits = fm.nested(b'commits')			fm_commits = fm.nested(b'commits')
	if ms.active():			if ms.active():
	for name, node, label_index in (			for name, node, label_index in (
	(b'local', ms.local, 0),			(b'local', ms.local, 0),