feat: barebones initial server-side upload-pack implementation#2465
feat: barebones initial server-side upload-pack implementation#2465James Gill (JamesPatrickGill) wants to merge 3 commits into
Conversation
James Gill (JamesPatrickGill)
changed the title
16fb5c6 to
d414008
Compare
0981434 to
a614ce3
Compare
Sebastian Thiel (Byron)
left a comment
Sebastian Thiel (Byron)
left a comment
There was a problem hiding this comment.
Hi, I had a first brief look and hoped you could squash this work into one commit per crate, in order of dependency?
Thanks a lot!
There was a problem hiding this comment.
As I ramp up for review, could you remove the .tar file so I can add them myself (or chose to not add them at all)?
There was a problem hiding this comment.
Thanks for getting back!
I've just done those suggested changes and pushed them.
Understand this might be far from the desired state but very happy to put the time in to get the feature (and also figure out what the contribution looks like to gitoxide haha, the first is always hardest)
There was a problem hiding this comment.
Hi Sebastian Thiel (@Byron), just checking in to see if you've had any chance to review? There's no rush on this obviously, I just have some time coming up I can sink into getting this feature compatible with the codebase.
Any feedback is greatly appreciated 🙏
There was a problem hiding this comment.
Sebastian Thiel (@Byron) Just a quick bump on this as I see I have a conflict - before I resolve is this a feature you see merging in the near future?
a614ce3 to
21390ba
Compare
21390ba to
eaec1bc
Compare
## Summary
Closes 9 compat-mode rows in tests/journey/parity/branch.sh, lands three
reusable foundations consumed by future sprints (commit, push, tag, merge),
and folds in 6 upstream syncs that arrived during the sprint.
## Closed parity rows (all bytes-mode, steward-verified, on-disk state asserted)
- `-v` / `--verbose` — column-aligned name + SHA + subject
- `-vv` — adds `[upstream: ahead N, behind N]` tracking annotation
- `--abbrev=N` / `--no-abbrev` — SHA width override
- `--column=always` — column-major packing
- `-u` / `--set-upstream-to` — writes branch.<n>.{remote,merge}
- `--unset-upstream` — clears them; emits `fatal: branch '<n>' has no upstream information` + exit 128 when absent
- `--track` (create-side) — writes upstream config after ref creation
- `--edit-description` — spawns editor, writes branch.<n>.description
Plus three on-disk-state guard rows (chained gix → gix invocations) so
bytes-mode parity tests can no longer mask missing-side-effect regressions
in branch-config writers.
## Foundations introduced
- gix::Repository::{set_branch_upstream, unset_branch_upstream, set_branch_description}
with $GIT_DIR/config persistence via gix_config::File::write_to_filter
on Source::Local sections (matches gix/src/clone/fetch/util.rs::setup_branch_config).
- Branch::DESCRIPTION key constant + SnapshotMut::clear_subsection_value helper.
- gitoxide-core::shared::columns::write_columns — column-major packer (reusable
for status --column).
- gitoxide-core::shared::editor::edit_file — $GIT_EDITOR/core.editor/$VISUAL/$EDITOR/vi
resolver + shell-spawn (reusable for commit -e, tag --edit, merge --edit).
## Upstream syncs folded in
- merge: pull upstream gix-main into gix-brit (security hardening + fuzz expansion)
- merge: pull GitoxideLabs#2508 — allow checkouts into non-empty directories
- merge: pull GitoxideLabs#2375 — filters and partial cloning: initial support
- merge: pull GitoxideLabs#2503 — IOUC (UNTR extension) dirwalk speedup
- merge: pull GitoxideLabs#2457 — gix-blame: Incremental
- merge: pull GitoxideLabs#2465 — barebones server-side upload-pack
## Adjustments
- steward agent: surface idiomatic Rust as an explicit design priority,
reframing vendor/git as the *what* (flag surface, exit codes, output bytes)
while gitoxide idioms anchor *how*.
- Post-merge cleanup: dropped duplicate clone --filter stub (superseded by GitoxideLabs#2375)
and pr-2457's orphaned log helpers (our log_all already handles paths).
Plan: etc/plan/foundations-sprint-branch-render-and-config.md
Pre-squash backup tag: pre-squash-foundations
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
Thanks James Gill (@JamesPatrickGill) for following up and sorry for the late response! In future I should respond much more swiftly. Without having looked at the code, I'd be happy to work with you on making this mergeable.
Packs can already be created via Further, to make the implementation useful, I'd love it to deal with capabilities as far as correctness is concerned. Unsupported ones should be rejected, for instance, while SHA-256 can probably be supported without much hassle (but it's fine to leave it as long it rejects what it doesn't do right). The last mile to make it usefulFrom what I know, this implementation should already be useful for cloning From there, Finally, you could adjust the test structure to match the other crates. |
2 participants
tl;dr
I am building a git forge and needed server-side git functionality. I found gitoxide, really liked it and decided to build on it. This is me attempting to upstream it.
I'm happy to rework it and take any feedback!
Hey!
Sorry if me opening this PR out of the blue and is not the process but I have recently started building a small toy git forge in Rust for some fun and when it came to the "git" part I came across gitoxide and really liked it. However, I noticed that the server-side support was not ready for me to build what I wanted, this is my assumption from reading the code anyway.
So I was interested enough to just try to implement it myself and this is what this PR contains. I attempted to go as shallow as possible as to have something to maybe discuss if this is something gitoxide is interested in before I got carried away into all the nitty gritty. That being said it does do some (very little) real stuff:
What is here:
ACK/NAK writers, and upload-pack orchestrators for both protocol versions
objects, and a top-level serve_upload_pack() entrypoint
There are a lot of caveats though...
Caveats:
However despite being pretty far from done I have an ssh server in my git forge able to serve
git clonerequests - this can be seen here: https://github.com/JamesPatrickGill/steidI am very open to guidance and getting this ship shape if you see value. I attempted to match conventions from other crates in the repo as closely as possible.