( )⚙ D7594 status: add template/json data about whether a file has unresolved conflicts

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7594

status: add template/json data about whether a file has unresolved conflicts
ClosedPublic

Authored by rdamazio on Dec 10 2019, 1:39 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7315464f0613: status: add template/json data about whether a file has unresolved conflicts

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

rdamazio created this revision.Dec 10 2019, 1:39 AM
pulkit accepted this revision.Dec 10 2019, 8:15 AM
This revision is now accepted and ready to land.Dec 10 2019, 8:15 AM
rdamazio updated this revision to Diff 18587.Dec 10 2019, 1:15 PM
martinvonz added a subscriber: martinvonz.Dec 11 2019, 12:02 PM
martinvonz added inline comments.
mercurial/cmdutil.py
792

That's an O(n) lookup. Probably fine since you very rarely have thousands of conflicts...

rdamazio added inline comments.Dec 11 2019, 4:38 PM
mercurial/cmdutil.py
792

Yes, I thought of storing it as a set, but then thought that it either didn't matter or would be slower because there are so few items.

rdamazio marked an inline comment as done.Dec 11 2019, 4:38 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (4 lines)
Mmercurial/commands.py (2 lines)
Mtests/test-conflict.t (3 lines)

Diff 18587

mercurial/cmdutil.py

class morestatus(object): class morestatus(object):
reporoot = attr.ib() reporoot = attr.ib()
unfinishedop = attr.ib() unfinishedop = attr.ib()
unfinishedmsg = attr.ib() unfinishedmsg = attr.ib()
inmergestate = attr.ib() inmergestate = attr.ib()
unresolvedpaths = attr.ib() unresolvedpaths = attr.ib()
_label = b'status.morestatus' _label = b'status.morestatus'
def formatfile(self, path, fm):
if self.inmergestate and path in self.unresolvedpaths:
martinvonzUnsubmitted
Done

That's an O(n) lookup. Probably fine since you very rarely have thousands of conflicts...

martinvonz: That's an O(n) lookup. Probably fine since you very rarely have thousands of conflicts...
rdamazioAuthorUnsubmitted
Done

Yes, I thought of storing it as a set, but then thought that it either didn't matter or would be slower because there are so few items.

rdamazio: Yes, I thought of storing it as a set, but then thought that it either didn't matter or would…
fm.data(unresolved=True)
def formatfooter(self, fm): def formatfooter(self, fm):
statemsg = _(b'The repository is in an unfinished *%s* state.' statemsg = _(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)
self._formatconflicts(fm) self._formatconflicts(fm)
if self.unfinishedmsg: if self.unfinishedmsg:
fm.plain(b'%s\n' % _commentlines(self.unfinishedmsg), fm.plain(b'%s\n' % _commentlines(self.unfinishedmsg),

mercurial/commands.py

fm.condwrite(showchar, b'status', b'%s ', char, label=label) fm.condwrite(showchar, b'status', b'%s ', char, label=label)
fm.plain(fmt % uipathfn(f), label=label) fm.plain(fmt % uipathfn(f), label=label)
if f in copy: if f in copy:
fm.data(source=copy[f]) fm.data(source=copy[f])
fm.plain( fm.plain(
(b' %s' + end) % uipathfn(copy[f]), (b' %s' + end) % uipathfn(copy[f]),
label=b'status.copied', label=b'status.copied',
) )
if morestatus:
morestatus.formatfile(f, fm)
if morestatus: if morestatus:
morestatus.formatfooter(fm) morestatus.formatfooter(fm)
fm.end() fm.end()
@command( @command(
b'summary|sum', b'summary|sum',

tests/test-conflict.t

# To continue: hg commit # To continue: hg commit
# To abort: hg merge --abort # To abort: hg merge --abort
$ hg status -Tjson $ hg status -Tjson
[ [
{ {
"path": "a", "path": "a",
"status": "M" "status": "M",
"unresolved": true
}, },
{ {
"path": "a.orig", "path": "a.orig",
"status": "?" "status": "?"
} }
] ]
$ cat a $ cat a