[update-checkout] add a check for locked repositories #84079
Merged
Conversation
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
charles-zablit
added
the
update-checkout
charles-zablit
requested review from
justice-adams-apple and
shahmishal
as code owners
|
@swift-ci please test |
charles-zablit
force-pushed
the
charles-zablit/update-checkout/add-locked-repository-check
branch
from
d443280 to
1122439
Compare
|
@swift-ci please smoke test |
| locked_repositories: set[str] = _is_any_repository_locked(pool_args) | ||
| if len(locked_repositories) > 0: | ||
| return [ | ||
| f"'{repo_name}' is locked by git. Cannot update it." |
There was a problem hiding this comment.
in what exit status does this result?
There was a problem hiding this comment.
This adds an error to the results variable, which is passed to the check_parallel_results function. The exit status is 1.
./swift/utils/update-checkout --scheme release/6.2.1 --skip-repository swift || echo $?
+ pushd /Users/charleszablit/Developer/lldb/swift
+ popd
Skipping update of 'swift', requested by user
======UPDATE FAILURES======
'llvm-project' is locked by git. Cannot update it.
update-checkout failed, fix errors and try again
1
adrian-prantl
approved these changes
Sep 5, 2025
This was referenced Sep 8, 2025
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.
This patch adds a check for locked repositories in
update_checkout.If a repository is locked by another program (or if a
.lockfile was not properly deleted bygit),update_checkoutwill hang on a random repository. The error message will be spread across multiple cloning logs.Before running the
updatepart ofupdate-checkout, we check if there is any locked repository and prompt the user to fix the issue before returning early. Iflibxml2is locked:The added tests were ran at desk.
rdar://159749530