Skip to content

Hydrate notes at transport boundaries before rewrites - #2039

Open
svarlamov wants to merge 1 commit into
mainfrom
fix/transport-aware-notes-sync-jul-29
Open

Hydrate notes at transport boundaries before rewrites#2039
svarlamov wants to merge 1 commit into
mainfrom
fix/transport-aware-notes-sync-jul-29

Conversation

@svarlamov

@svarlamov svarlamov commented Jul 29, 2026

Copy link
Copy Markdown
Member

Summary

  • hydrate authorship notes after successful fetch/pull transport, before non-fast-forward rewrite handling
  • fetch Git notes once from the selected remote instead of speculatively fetching all remotes from local rewrite destinations
  • warm the HTTP cache from immutable trace2-derived incoming revision OIDs with one bounded rev-list and batched API reads
  • defer transport-sync errors until rewrite and working-log side effects finish, then preserve the existing error reporting contract
  • restore the authoritative force-pushed target regression and add the literal User A restack / User B extra-work rebase E2E
  • cover the same ordering guarantee with the HTTP notes backend
  • keep standalone cherry-pick target-note merging local, since no transport occurred to authorize a network fetch

Test plan

  • task fmt
  • task lint
  • task test (full suite)
  • task test TEST_FILTER=notes_sync_
  • task test TEST_FILTER=does_not_fetch_notes_for_fresh
  • task test TEST_FILTER=pull_rebase_force_pushed_target_preserves_remote_authorship_note
  • task test TEST_FILTER=pull_rebase_after_collaborator_restack_preserves_both_users_notes
  • task test TEST_FILTER=cherry_pick_merges_existing_authoritative_target_note

Stack

2 of 2. Depends on #2038.

svarlamov commented Jul 29, 2026

Copy link
Copy Markdown
Member Author

@svarlamov svarlamov changed the title Hydrate notes before transport rewrites Hydrate notes at transport boundaries before rewrites Jul 29, 2026
@svarlamov
svarlamov marked this pull request as ready for review July 29, 2026 21:48

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no bugs or issues to report.

Open in Devin Review

Base automatically changed from fix/reduce-fetches-jul-29 to main July 30, 2026 02:49
@svarlamov
svarlamov force-pushed the fix/transport-aware-notes-sync-jul-29 branch from 680eb47 to 9da443b Compare July 30, 2026 21:39
devin-ai-integration[bot]

This comment was marked as resolved.

@svarlamov
svarlamov force-pushed the fix/transport-aware-notes-sync-jul-29 branch 2 times, most recently from 9da443b to 9d700c5 Compare July 30, 2026 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant