Page MenuHomePhabricator

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

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

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 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 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