D7668: status: make unresolved files always be in the morestatus structured output
rdamazio (Rodrigo Damazio Bovendorp)
phabricator at mercurial-scm.org
Wed Dec 18 00:18:29 EST 2019
rdamazio updated this revision to Diff 18846.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7668?vs=18725&id=18846
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7668/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7668
AFFECTED FILES
mercurial/cmdutil.py
tests/test-update-branches.t
CHANGE DETAILS
diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -591,6 +591,11 @@
"itemtype": "file",
"path": "foo",
"status": "M"
+ },
+ {
+ "itemtype": "file",
+ "path": "a",
+ "unresolved": true
}
]
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -833,6 +833,7 @@
if self.unfinishedmsg:
fm.data(unfinishedmsg=self.unfinishedmsg)
+ # May also start new data items.
self._formatconflicts(fm)
if self.unfinishedmsg:
@@ -862,6 +863,19 @@
)
% mergeliststr
)
+
+ # If any paths with unresolved conflicts were not previously
+ # formatted, output them now.
+ for f in self.unresolvedpaths:
+ if f in self._formattedpaths:
+ # Already output.
+ continue
+ fm.startitem()
+ # We can't claim to know the status of the file - it may just
+ # have been in one of the states that were not requested for
+ # display, so it could be anything.
+ fm.data(itemtype=b'file', path=f, unresolved=True)
+
else:
msg = _(b'No unresolved merge conflicts.')
To: rdamazio, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list