-
-
Notifications
You must be signed in to change notification settings - Fork 315
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.
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
octopus-merge (part 5: tree-merge-ORT three-way) #1618
Commits on Oct 31, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 32d6bfb - Browse repository at this point
Copy the full SHA 32d6bfbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1f40a89 - Browse repository at this point
Copy the full SHA 1f40a89View commit details -
Improve error message to be less elusive
Co-authored-by: Eliah Kagan <degeneracypressure@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for eb9f9c3 - Browse repository at this point
Copy the full SHA eb9f9c3View commit details -
feat: Allow access to
tree::State::buf1|2
.This allows to re-use that memory at least, making this kind of state a little more useful. Also, these fields can certainly be considered stable.
Configuration menu - View commit details
-
Copy full SHA for eb55c00 - Browse repository at this point
Copy the full SHA eb55c00View commit details -
feat: add
tree_with_rewrites::Change(Ref)::previous_location()
That way, it's also possible to obtain the previous location in case of rewrites.
Configuration menu - View commit details
-
Copy full SHA for 76e6762 - Browse repository at this point
Copy the full SHA 76e6762View commit details -
feat: add traits for partial equality comparison to `tree_with_rewrit…
…es::Change` types
Configuration menu - View commit details
-
Copy full SHA for 6740520 - Browse repository at this point
Copy the full SHA 6740520View commit details -
feat: Add
tree::Editor::get()
to get entries directly from the editor.This is useful if in the middle of an edit you'd like to lookup what's there to choose a non-conflicting name, for example.
Configuration menu - View commit details
-
Copy full SHA for e2ea398 - Browse repository at this point
Copy the full SHA e2ea398View commit details -
fix!: prefer to receive borrowed
gix_command::Context
when it's jus……t passed on. That way, the clone occours only when needed, without forcing the caller to pre-emptively clone each time it's called.
Configuration menu - View commit details
-
Copy full SHA for 78a5355 - Browse repository at this point
Copy the full SHA 78a5355View commit details -
feat!: Don't fail on big files during blob-merge, but turn them into …
…binary merges. Binary merges are mere choices of which side to pick, which works well for big files as well. Git doesn't define this well during its own merges, so there is some room here.
Configuration menu - View commit details
-
Copy full SHA for c1cf08c - Browse repository at this point
Copy the full SHA c1cf08cView commit details -
feat: add
blob::PlatformRef::id_by_pick()
to more efficiently pick ……merge results. This works by either selecting a possibly unchanged and not even loaded resource, instead of always loading it to provide a buffer, in case the user doesn't actually want a buffer. Note that this also alters `buffer_by_pick()` to enforce handling of the 'buffer-too-large' option.
Configuration menu - View commit details
-
Copy full SHA for dd99991 - Browse repository at this point
Copy the full SHA dd99991View commit details -
Configuration menu - View commit details
-
Copy full SHA for 278dd88 - Browse repository at this point
Copy the full SHA 278dd88View commit details
Commits on Nov 1, 2024
-
fix!: Adjust blob-merge baseline to also test the reverse of each ope…
…ration This also fixes an issue with blob merge computations. It's breaking because the marker-size was reduced to `u8`.
Configuration menu - View commit details
-
Copy full SHA for de1cfb6 - Browse repository at this point
Copy the full SHA de1cfb6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 29aad45 - Browse repository at this point
Copy the full SHA 29aad45View commit details -
Configuration menu - View commit details
-
Copy full SHA for ba7b811 - Browse repository at this point
Copy the full SHA ba7b811View commit details -
fix: make sure ordinary capitalized partial names can be found by par…
…tial name. For instance, previously, a ref named `A` could not be found even though `refs/heads/A` existed.
Configuration menu - View commit details
-
Copy full SHA for 1fbb946 - Browse repository at this point
Copy the full SHA 1fbb946View commit details -
feat!: move
gix-odb::Write
trait togix-object::Write
.There it's far more useful and plumbing crates are enabled to write objects without pulling in `gix-odb` as dependency.
Configuration menu - View commit details
-
Copy full SHA for 7325c58 - Browse repository at this point
Copy the full SHA 7325c58View commit details -
Configuration menu - View commit details
-
Copy full SHA for 96488f7 - Browse repository at this point
Copy the full SHA 96488f7View commit details
Commits on Nov 2, 2024
-
feat: add
tree()
andcommit()
merge support, en par with `merge-O……RT` as far as tests go. Note that this judgement of quality is based on a limited amount of partially complex test, but it's likely that in practice there will be deviations of sorts. Also, given the complexity of the implementation it is definitely under-tested, but with that it's mostly en par with Git, unfortunatly. On the bright side, some of the tests are very taxing and I'd hope this means something for real-world quality.
Configuration menu - View commit details
-
Copy full SHA for 4b1764c - Browse repository at this point
Copy the full SHA 4b1764cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 80e006b - Browse repository at this point
Copy the full SHA 80e006bView commit details -
Configuration menu - View commit details
-
Copy full SHA for bd91d6a - Browse repository at this point
Copy the full SHA bd91d6aView commit details -
feat:
gix::Repository
implements all traits for object reading and ……writing. That way it becomes usable when merging trees, which benefits from automatic checking of hashes before writing loose objects.
Configuration menu - View commit details
-
Copy full SHA for 07746f3 - Browse repository at this point
Copy the full SHA 07746f3View commit details -
Configuration menu - View commit details
-
Copy full SHA for d1ac584 - Browse repository at this point
Copy the full SHA d1ac584View commit details -
Configuration menu - View commit details
-
Copy full SHA for 84707c2 - Browse repository at this point
Copy the full SHA 84707c2View commit details