Address the base repository in PR/MR-reading commands when base config keys are set - #1748
Open
PawelLipski wants to merge 3 commits into
Open
Address the base repository in PR/MR-reading commands when base config keys are set#1748PawelLipski wants to merge 3 commits into
PawelLipski wants to merge 3 commits into
Conversation
PawelLipski
added
bug
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #1748 +/- ##
========================================
Coverage 98.75% 98.75%
========================================
Files 45 45
Lines 5379 5389 +10
Branches 980 982 +2
========================================
+ Hits 5312 5322 +10
Misses 41 41
Partials 26 26 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
In a fork workflow the PR/MR is hosted by the base (upstream) repository, not the head (fork) repository that holds the branches.
retarget-pr/restack-pr (and their GitLab retarget-mr/restack-mr counterparts) now resolve the code hosting client against the base repository
inferred from the parent branch's tracking remote - exactly like create-pr already does - so they query the repository that actually hosts the PR
even when no machete.{github,gitlab}.base* config keys are set.
Resolution is best-effort: if the base repository cannot be determined unambiguously and no base* keys are set, it falls back to the head repository,
preserving the previous behavior.
…g keys are set
`_init_code_hosting_client` always resolved the code-hosting client from the head remote, so the PR/MR-reading and -modifying commands (`anno-prs`, `checkout-prs`, `retarget-pr`, `restack-pr`, `update-pr-descriptions` and their GitLab counterparts) ignored the `machete.{github,gitlab}.base*` config keys, which until now only affected `create-{pr,mr}`.
In a fork workflow (head = fork, base = upstream) those commands therefore queried the fork - where the PRs/MRs don't live - and found nothing.
The client is now created against the base repository whenever any `base*` key is set, while the returned head remote is kept for fetching/pushing branches; when no `base*` key is set the base repository resolves to the head one, so this is a no-op for the common non-fork case, and `create-{pr,mr}`'s stricter base resolution is left untouched.
Document that the base* config keys are what make the PR/MR-reading and -modifying commands (anno-prs, checkout-prs, retarget-pr, restack-pr, update-pr-descriptions and their MR counterparts) address a base repository that differs from the head one. Only create-pr/create-mr infers the base repository/target project from the base branch's tracking remote, so it can target a fork/upstream base even with no config; the other commands are initialized without a base branch to infer from and therefore need the keys.
PawelLipski
force-pushed
the
fix/read-prs-from-base-repo
branch
from
July 28, 2026 15:34
1a82807 to
f4bbfe4
Compare
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.
_init_code_hosting_clientalways resolved the code-hosting client from the head remote, so the PR/MR-reading and -modifying commands (anno-prs,checkout-prs,retarget-pr,restack-pr,update-pr-descriptionsand their GitLab counterparts) ignored themachete.{github,gitlab}.base*config keys, which until now only affectedcreate-{pr,mr}.In a fork workflow (head = fork, base = upstream) those commands therefore queried the fork - where the PRs/MRs don't live - and found nothing.
The client is now created against the base repository whenever any
base*key is set, while the returned head remote is kept for fetching/pushing branches; when nobase*key is set the base repository resolves to the head one, so this is a no-op for the common non-fork case, andcreate-{pr,mr}'s stricter base resolution is left untouched.