Essien Ita Essien 322e91be36 git sync: PoC ... ## Summary * [X] Get branch pre-fetch heads * [X] Build candidates from prefetch heads * [X] Fetch from remotes * [X] Get branch post-fetch heads * [X] Rebase * [X] Build old -> new map * [X] transform descendants # git sync: Setup scaffolding ## Details * First commit that just sets up scaffolding. * `jj git sync` is hidden as it's not yet ready. * Set up some tracing guards which will help debugging when run with --debug. # git sync: Get branch heads and fetch from remote. ## Details * For branch heads, we grab local branches matching the pattern specified in args. * Pre-fetch heads query tx.base_repo() while post-fetch heads query tx.repo(); tx.repo() is the in memory Mutable repo which is updated after a fetch in a transaction. * We fetch from all branches from all configured remotes. --all_remotes affects if we use `git.fetch` or all repo remotes. # git sync: Build candidate commits. ## Details * Candidate commits (parent_id, child_id) are: * branch commits * and their descendants * which are not found in untracked remote branches # git sync: Build update record ## Details Build a record of old branch heads mapped to the new branch heads. This record will be used to derive the candidates that need rebasing. # git sync: unhide `jj git sync` ## Details * Add tests * Unhide the command, now that it's complete. * Update CHANGELOG # git sync: Rebase commits onto new branch heads. ## Details * implement CommitRewritter::repo() to return an immutable reference. * transform_descendants() roots are candidates with parents in update_record. * simplify parent merge * drop newly emptied commits * update new parents from the updated heads set if the old parents are ancestors. Issue: #1039		2024-11-24 03:29:44 +00:00
..
benches	style: add semicolon at the end of expressions used as statements	2024-10-04 22:29:13 +02:00
gen-protos	cargo: inherit lints configuration from workspace	2024-10-04 22:29:13 +02:00
proc-macros	style: remove useless uses of .iter()	2024-10-04 22:29:13 +02:00
src	git sync: PoC	2024-11-24 03:29:44 +00:00
tests	merged_tree: propagate errors from conflict iterator	2024-11-23 13:53:04 -08:00
testutils	transaction: propagate errors from commit()	2024-11-13 23:05:24 -08:00
Cargo.toml	config: extract ConfigNamePathBuf to jj-lib	2024-11-23 10:20:27 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00