( )⚙ D8817 merge: move conversion of file-key dict to action-key dict in mergeresult

This is an archive of the discontinued Mercurial Phabricator instance.

merge: move conversion of file-key dict to action-key dict in mergeresult
ClosedPublic

Authored by pulkit on Jul 25 2020, 5:59 AM.

Details

Summary

Initially the actions dict which we get has file has keys, but later we want a
dict which has actions as keys. This patch moves code computing that to
mergeresult class as that's where it should be anyway.

Diff Detail

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

Event Timeline

pulkit created this revision.Jul 25 2020, 5:59 AM
indygreg accepted this revision.Aug 2 2020, 12:56 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/merge.py
590

Nit: a more concise way of writing this is actions.setdefault(m, []).append((f, args, msg))

1824

Thank you for removing this alias.

This revision is now accepted and ready to land.Aug 2 2020, 12:56 PM