Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rewrite: deduplicate parent ids per remap iteration #4353

Merged
merged 3 commits into from
Aug 28, 2024
Merged

rewrite: deduplicate parent ids per remap iteration #4353

merged 3 commits into from
Aug 28, 2024

Commits on Aug 28, 2024

  1. rewrite: flip inner/outer loops of mut_repo.new_parents() 

    This is basically a DFS to find leaf nodes. It will help omit duplicated
parent ids early.
    @yuja
    yuja committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    c8e26f5 View commit details
    Browse the repository at this point in the history

  2. rewrite: deduplicate parent ids per remap iteration 

    If merge-heavy history was abandoned, intermediate parent chains can have tons
of duplicates, and the process explodes soon. Instead, we can skip any parent
ids that have been remapped.

We can no longer detect cycles reliably, but I think that's okay so long as
the function terminates.

Fixes martinvonz#4352
    @yuja
    yuja committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    36a4972 View commit details
    Browse the repository at this point in the history

  3. rewrite: pass old parent ids in to mut_repo.new_parents() by slice

    @yuja
    yuja committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    9cb0a0b View commit details
    Browse the repository at this point in the history