/Explore

madison / open-git

public
CodeIssues16Pull requests2InsightsCampfireDocs

fix: Mergability

merged
#27 opened by madisonfix/mergability→main
Conversation5Commits5Files changed13
Gitty
madisonopened this pull requestAuthor· 4 weeks ago

Issue:

same-repo PR merges were triggering object copying. Now, fast-forward copies only msising objects reachable from the PR head instead of recursively copying entire source objects directory.

Issue 2:

PR diffs were slow. Beyond slow. That is changed with this PR. Now matches closely to diffshub performance.

Madison added 5 commits · 4 weeks ago

View commits
  • same-repo PR merges now avoid constructing/passing a separate sourceRepo, so they no longer trigger object copying for the common case. Fork/cross-repo fast-forward now copies only missing objects reachable from the PR head instead of recursively copying the entire source objects directory. The new test proves an unrelated source branch commit is not copied into the target during merge57889c9
  • diff stats now populate immediately from precomputed manifest instead of waiting for every file diff payload to fetch/parse. CodeView now receives placeholder items for every manifest file up front, so sidebar clicks always have a scroll target, even for files that have not been visted yet. Actual /files/id/diff payloads now hydrate lazily for rendered/selected files instead of sequentially fetching the entire manifest. Sidebar selection now scrolls immediately, hydrates that file, and re-expands it after hydration if needed.6ba2932
  • selecting a far-down file aborts unrelated in-flight diff fetches. It prioritizes the selected file plus 4 before and after it. It waits for the selected files real diff to hydrate before scrolling, so you dont land on empty/collapsed placeholders. Normal scrolling still lazily hydrates visible files.599e8fc
  • jk. Added a single streamed PR diff endpoint. Replaced per-file hydration and neighbor fetching with one streamed patch loader. Client now parses streamed git-style patches with pierre/diffs processFile, then appends real CodeView items in batches. Removed the batch files/diffs route and all hydration scroll/select logic. Diff stats still populate immediately from the manifest; skipped/binary/generated files are inserted as manifest placeholders.839bf0d
  • Merge remote-tracking branch 'origin/main' into fix/mergability277c19c

Sign in to comment.

Merge readiness

Ahead0
Behind0
Fast-forwardReady

This pull request can be merged without creating a merge commit.

Autopilot

Debug

Reviews

Approved0
ReviewersNone yet

Running Autopilot requires review access on this PR and push access to the source branch.