branch comment: add end-to-end test scripts - #1164
Closed
ed-irl wants to merge 6 commits into
Closed
Conversation
Collaborator
Author
|
This change is part of the following stack: Change managed by git-spice. |
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 2, 2026 18:58
75c2b68 to
bed2fb1
Compare
ed-irl
force-pushed
the
branch-comment-tests
branch
from
June 2, 2026 18:58
47a7eed to
d42cd46
Compare
This was referenced Jun 2, 2026
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 2, 2026 20:17
bed2fb1 to
55e79ed
Compare
ed-irl
force-pushed
the
branch-comment-tests
branch
2 times, most recently
from
June 2, 2026 22:31
e683e4f to
bc2d528
Compare
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 2, 2026 22:33
c1b7235 to
631867a
Compare
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 8, 2026 10:18
cc6ba9a to
a4057f6
Compare
ed-irl
force-pushed
the
branch-comment-tests
branch
2 times, most recently
from
June 8, 2026 11:15
d270ec2 to
0a8ca42
Compare
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 12, 2026 20:07
fa75bd3 to
b8b5295
Compare
ed-irl
force-pushed
the
branch-comment-tests
branch
from
June 12, 2026 20:07
0a8ca42 to
03fafd4
Compare
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 13, 2026 13:39
b8b5295 to
6f87470
Compare
ed-irl
force-pushed
the
branch-comment-tests
branch
from
June 13, 2026 13:39
03fafd4 to
1f477e3
Compare
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 15, 2026 09:52
6f87470 to
f6588c8
Compare
ed-irl
force-pushed
the
branch-comment-tests
branch
from
June 15, 2026 09:52
1f477e3 to
7241e23
Compare
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 19, 2026 01:03
7170265 to
f86efce
Compare
ed-irl
changed the title
ed-irl
force-pushed
the
branch-comment-tests
branch
from
June 19, 2026 01:03
f84f05d to
c2cb662
Compare
Introduces restack.Options{AutoResolve} and threads an opts *Options
parameter through the high-level restack entry points (RestackBranch,
RestackStack, RestackDownstack) and the merge/sync RestackHandler
interfaces, with all current callers passing nil.
This is foundational plumbing for the restack auto-resolve feature.
Landing it on a branch below the consuming stacks lets every branch
inherit the 3-arg signature, rather than the signature change living
on a branch parallel to its callers.
Add inline comment infrastructure across all forges (GitHub, GitLab, Bitbucket, ShamHub) with three optional interfaces: - WithInlineComments: list, post, and batch-submit inline comments - WithThreadResolution: resolve/unresolve review threads - WithCommentEdit: edit existing review comments Refactor Bitbucket and GitLab implementations to use typed gateway client methods (CommentCreate, CommentResolve, MergeRequestDiscussionCreate, etc.) in place of raw HTTP calls, and add reply support for Bitbucket inline comments via the Parent field on CommentCreateRequest. Introduce the diffmap package for mapping working-tree line numbers to diff coordinates, and staged comment storage in the spice state for local comment management before batch submission. Regenerate forge mocks to reflect the updated MergeChange signature and the new inline-comment interfaces.
Add `gs branch comment` subcommand group with six commands: - list: show inline comments and staged comments, with `--json` for NDJSON output - stage: stage an inline comment for batch submission - add: post an inline comment immediately - submit-staged: submit all staged comments as a review - resolve: resolve or unresolve a review thread - edit: edit a staged or forge comment Also adds DiffBranchBytes to git.Worktree for programmatic diff access needed by comment coordinate mapping.
Add test scripts covering the core comment workflows: - stage and submit staged comments as a review - add an inline comment immediately - list comments (text and `--json` output) - resolve a review thread - edit a staged comment Also fixes a nil pointer dereference when no staged comments exist for a branch, and includes thread IDs in list output for use with resolve/unresolve commands.
ed-irl
force-pushed
the
branch-comment-commands
branch
from
June 24, 2026 01:32
f86efce to
112367a
Compare
ed-irl
force-pushed
the
branch-comment-tests
branch
from
June 24, 2026 01:32
c2cb662 to
63cfc0c
Compare
abhinav
changed the title
abhinav
force-pushed
the
branch-comment-commands
branch
from
August 24, 2026 05:15
112367a to
916ca7d
Compare
Owner
|
Closing because these test scripts have been folded into #1163 so the commands and their end-to-end coverage are reviewed together. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add test scripts covering the core comment workflows:
--jsonoutput)Also fixes a nil pointer dereference when no staged comments
exist for a branch, and includes thread IDs in list output
for use with resolve/unresolve commands.