This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: add a `in_merge` property
ClosedPublic

Authored by marmoute on Jul 4 2021, 5:49 PM.

Details

Summary

This factor the "p2 is not null" check and is fairly simpler to read.

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

marmoute created this revision.Jul 4 2021, 5:49 PM
SimonSapin accepted this revision.Jul 5 2021, 12:01 AM
SimonSapin added a subscriber: SimonSapin.

Nit: why a property instead of a method?

pulkit accepted this revision.Jul 6 2021, 12:22 PM
This revision is now accepted and ready to land.Jul 6 2021, 12:22 PM
baymax updated this revision to Diff 28854.Jul 6 2021, 2:08 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

This revision was automatically updated to reflect the committed changes.