Page MenuHomePhabricator

rebase: remove some redundant setting of dirstate parents
ClosedPublic

Authored by martinvonz on Jan 11 2020, 1:47 AM.

Details

Summary

Since we're now setting the dirstate parents to its correct values
from the beginning (right after merge.update()), we usually don't
need to set them again before committing. The only case we need to
care about is when committing collapsed commits. So we can remove the
setparents() calls just before committing and add one only for the
collapse case.

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 11 2020, 1:47 AM
martinvonz planned changes to this revision.Jan 14 2020, 12:34 PM

I'll rebase this on top of the series with D7859, which should make the test impact go away.

martinvonz edited the summary of this revision. (Show Details)Jan 16 2020, 3:18 AM
martinvonz updated this revision to Diff 19346.
martinvonz updated this revision to Diff 19706.Wed, Jan 29, 8:01 PM
martinvonz updated this revision to Diff 19862.Mon, Feb 3, 1:08 PM
martinvonz updated this revision to Diff 20098.Mon, Feb 10, 7:23 PM
durin42 accepted this revision.Mon, Feb 10, 9:16 PM
This revision is now accepted and ready to land.Mon, Feb 10, 9:16 PM