This PR is doing more than one thing. I can see following independent things:
- rename of inmergestate to activemerge
- introduction of _formattedpaths which is used in next patch and not related to this one
- what the commit message says
Can we split them up?
Amended the following in flight to make black happy:
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -879,11 +879,8 @@ def readmorestatus(repo): if activemerge: unresolved = sorted(mergestate.unresolved()) return morestatus( - repo.root, - unfinishedop, - unfinishedmsg, - activemerge, - unresolved) + repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved + ) def findpossible(cmd, table, strict=False):