This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7668

status: make unresolved files always be in the morestatus structured output
ClosedPublic

Authored by rdamazio on Dec 14 2019, 12:49 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG07ebb567e8bb: status: make unresolved files always be in the morestatus structured output
Summary

We don't know the status of those files, only that they're unresolved, so
we don't output the status for those - any code parsing this will have to be
tolerant to that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

rdamazio created this revision.Dec 14 2019, 12:49 AM
rdamazio updated this revision to Diff 18846.Dec 18 2019, 12:17 AM
pulkit added a subscriber: pulkit.Dec 18 2019, 2:21 AM
pulkit added inline comments.
mercurial/cmdutil.py
877

IIUC, if it's in one of the states that were not requested for display, then we should not display the file, right?

rdamazio marked an inline comment as done.Dec 19 2019, 2:46 AM
rdamazio added inline comments.
mercurial/cmdutil.py
877

We don't display its status indeed.
They did request morestatus / verbose output, so plain old hg status still won't output it.

pulkit accepted this revision.Dec 19 2019, 12:09 PM
This revision is now accepted and ready to land.Dec 19 2019, 12:09 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (16 lines)
Mtests/test-update-branches.t (5 lines)

Diff 18881

mercurial/cmdutil.py

@attr.s(frozen=True) @attr.s(frozen=True)
class morestatus(object): class morestatus(object):
reporoot = attr.ib() reporoot = attr.ib()
unfinishedop = attr.ib() unfinishedop = attr.ib()
unfinishedmsg = attr.ib() unfinishedmsg = attr.ib()
activemerge = attr.ib() activemerge = attr.ib()
unresolvedpaths = attr.ib() unresolvedpaths = attr.ib()
_formattedpaths = attr.ib(init=False, default=set())
_label = b'status.morestatus' _label = b'status.morestatus'
def formatfile(self, path, fm): def formatfile(self, path, fm):
self._formattedpaths.add(path)
if self.activemerge and path in self.unresolvedpaths: if self.activemerge and path in self.unresolvedpaths:
fm.data(unresolved=True) fm.data(unresolved=True)
def formatfooter(self, fm): def formatfooter(self, fm):
if self.unfinishedop or self.unfinishedmsg: if self.unfinishedop or self.unfinishedmsg:
fm.startitem() fm.startitem()
fm.data(itemtype=b'morestatus') fm.data(itemtype=b'morestatus')
if self.unfinishedop: if self.unfinishedop:
fm.data(unfinished=self.unfinishedop) fm.data(unfinished=self.unfinishedop)
statemsg = ( statemsg = (
_(b'The repository is in an unfinished *%s* state.') _(b'The repository is in an unfinished *%s* state.')
% self.unfinishedop % self.unfinishedop
) )
fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
if self.unfinishedmsg: if self.unfinishedmsg:
fm.data(unfinishedmsg=self.unfinishedmsg) fm.data(unfinishedmsg=self.unfinishedmsg)
# May also start new data items.
self._formatconflicts(fm) self._formatconflicts(fm)
if self.unfinishedmsg: if self.unfinishedmsg:
fm.plain( fm.plain(
b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
) )
def _formatconflicts(self, fm): def _formatconflicts(self, fm):
'''Unresolved merge conflicts: '''Unresolved merge conflicts:
%s %s
To mark files as resolved: hg resolve --mark FILE''' To mark files as resolved: hg resolve --mark FILE'''
) )
% mergeliststr % 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.
pulkitUnsubmitted
Done

IIUC, if it's in one of the states that were not requested for display, then we should not display the file, right?

pulkit: IIUC, if it's in one of the states that were not requested for display, then we should not…
rdamazioAuthorUnsubmitted
Done

We don't display its status indeed.
They did request morestatus / verbose output, so plain old hg status still won't output it.

rdamazio: We don't display its status indeed. They did request morestatus / verbose output, so plain old…
fm.data(itemtype=b'file', path=f, unresolved=True)
else: else:
msg = _(b'No unresolved merge conflicts.') msg = _(b'No unresolved merge conflicts.')
fm.plain(b'%s\n' % _commentlines(msg), label=self._label) fm.plain(b'%s\n' % _commentlines(msg), label=self._label)
def readmorestatus(repo): def readmorestatus(repo):
"""Returns a morestatus object if the repo has unfinished state.""" """Returns a morestatus object if the repo has unfinished state."""

tests/test-update-branches.t

# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
$ hg status -Tjson $ hg status -Tjson
[ [
{ {
"itemtype": "file", "itemtype": "file",
"path": "foo", "path": "foo",
"status": "M" "status": "M"
},
{
"itemtype": "file",
"path": "a",
"unresolved": true
} }
] ]
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R a R a