D7667: status: extract active-merge state for reuse
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Dec 19 12:52:23 EST 2019
pulkit added a comment.
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):
REPOSITORY
rHG Mercurial
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7667/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7667
To: rdamazio, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel
mailing list