Page MenuHomePhabricator

merge: avoid a negation in the definition of updatedirstate
ClosedPublic

Authored by martinvonz on Jan 15 2020, 8:21 PM.

Details

Summary

We only use partial in one place: the definition of
updatedirstate. Let's simplify that a little.

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

martinvonz created this revision.Jan 15 2020, 8:21 PM
pulkit added a subscriber: pulkit.Jan 24 2020, 7:57 AM
pulkit added inline comments.
mercurial/merge.py
2290–2291

This comment now looks misplaced.

martinvonz marked an inline comment as done.Jan 24 2020, 11:42 AM
martinvonz added inline comments.
mercurial/merge.py
2290–2291

I'll insert another patch before this one to help with that.

Unrelated to your comment, I'll also reorder D7901 and D7902 because I think D7902 is less controversial.

pulkit accepted this revision.Jan 24 2020, 12:01 PM
This revision is now accepted and ready to land.Jan 24 2020, 12:01 PM