PoC: Implement jj git sync - v1
#4824
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
essiene
force-pushed
the
essiene/tknsxroqylmx
branch
2 times, most recently
from
9720683
to
a28c7e1
Compare
essiene
force-pushed
the
essiene/pmwupzxmwsqz
branch
from
084797c
to
845892d
Compare
essiene
force-pushed
the
essiene/tknsxroqylmx
branch
4 times, most recently
from
344f0ae
to
1225a22
Compare
essiene
force-pushed
the
essiene/pmwupzxmwsqz
branch
from
845892d
to
c1da3c8
Compare
essiene
force-pushed
the
essiene/tknsxroqylmx
branch
2 times, most recently
from
4aa68ec
to
e4de5bc
Compare
This is not meant to be merged in this form.
I am bashing everything on the head with a large bat, until it works.
Once everything works nicely in this draft, I will break it up into
smaller tested pieces that are intended to be merged.
* Grab current heads and build a set of [(Parent, Child)...]
* Start a transaction.
* Fetch in the transaction:
It's extremely important to fetch *all* branches from *all* remotes.
This is because if we don't fetch all branches, when we start rebasing,
a root branch may be merged upstream with contents of a branch we didn't
fetch, so we end up with conflicts. It's safest to always fetch all branches
and then only rebase what we need.
* Grab current heads on transaction:
* Transaction MutableRepo should be updated after fetch.
* Build a Map where old heads are the keys and the new heads are values.
* If old == new, skip it.
* This way if nothing changed, we end up with an empty map and avoid bugs
downstream (index.is_ancestor returns true if old == new).
* Relationship is figured out by index.is_ancestor(old_head_id, new_head_id) in a loop.
* Check if rebase is needed.
* old_heads.set_diffence(new_heads) gives old heads that are no longer heads, which would
mean, their descendants need to be rebased.
* Find children needing rebase:
* Build list of rebase specs with: (commit, new_parent)
* commit is the immdiate child of old_heads needing rebase.
* call repo_mut.transform_descendants with a rewritter closure.
* simplify_merge
* rewrite commits matching the rebase_specs
* for all other commits, if any new_parents match old_heads in our old -> new mapping,
update those to point at the updated heads.
* rebase with emptying newly emptied commits.
Issue: #1039
essiene
force-pushed
the
essiene/tknsxroqylmx
branch
from
e4de5bc
to
a31e01d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is not meant to be merged in this form.
I am bashing everything on the head with a large bat, until it works. Once everything works nicely in this draft, I will break it up into smaller tested pieces that are intended to be merged.
Part of: #1039
Checklist
If applicable:
CHANGELOG.md