HomePhabricator

rebase: remove some redundant setting of dirstate parents

Authored by martinvonz.

Description

rebase: remove some redundant setting of dirstate parents

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.

Differential Revision: https://phab.mercurial-scm.org/D7828

Details

Committed
martinvonzJan 11 2020, 12:40 AM
Differential Revision
D7828: rebase: remove some redundant setting of dirstate parents
Parents
rHG9c9cfecd4600: rebase: don't use rebased node as dirstate p2 (BC)
Branches
Unknown
Tags
Unknown