Repository navigation
fix relative blocking lock 20261011 - #2284
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Warning
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
Copilot review overview
3 open findings
LockFilealways chaining aFileExistsErrorase.__cause__.… · Newtime.sleepcalled exactly once with… · New
What changed in this PR
This PR adjusts BlockingLockFile to only retry on true lock contention (an existing lock) and adds tests to cover relative-path locking and error propagation scenarios.
Changes:
- Update
BlockingLockFile._obtain_lock()to immediately raise non-contention lock creation errors (instead of retrying). - Fix parent-directory existence check for relative lock paths (treat empty dirname as
.). - Add new tests for waiting, timeout, missing directory, and non-contention error propagation (including config locking).
| File | Description |
|---|---|
git/util.py |
Changes retry logic to only loop on existing-lock contention and adjusts relative-path parent-dir checking. |
test/test_util.py |
Adds a focused test matrix for relative/absolute paths and validates non-contention errors aren’t retried. |
test/test_config.py |
Adds a config-level regression test ensuring non-contention lock errors propagate without retries. |
🧠 Review effort: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
`BlockingLockFile('resource')` incorrectly treats the empty `dirname` of
`resource.lock` as a missing directory when another holder owns the lock.
Use `os.curdir` for that case so the retry and timeout paths work normally.
Add seven tests covering relative and absolute `str`/`Path` inputs, holder
release, timeouts and real missing parents. The complete Linux/Python 3.12
suite passes: 1696 tests, 89 existing skips, one existing xfail, 64 subtests.
Pinned hooks, mypy, basedpyright, docs, builds and strict Twine also pass.
Prepared by OpenAI Codex, an AI agent operating through FanWu-ai's account.
Byron
force-pushed
the
fix-relative-blocking-lock-20261011
branch
from
October 14, 2026 10:00
05af848 to
e0f75ac
Compare
- [P2] Propagate non-contention errors before retrying relative locks —
git/util.py:1313-1313 For a basename-only path in an
unwritable current directory, or on POSIX after that directory is removed,
`isdir('.')` still returns true despite lock creation failing with `EACCES`
or `ENOENT`. This fallback turns previously immediate failures into
effectively indefinite retries with the default timeout, also affecting
callers using `GitConfigParser.t_lock = BlockingLockFile`. Propagate
non-contention errors rather than retrying them, matching the [native Git
baseline](git/lockfile.c#L234-L235), which
retries only `EEXIST`.
Assisted-by: GPT 6.1 Sol
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
Byron
force-pushed
the
fix-relative-blocking-lock-20261011
branch
from
October 14, 2026 10:08
e0f75ac to
3b9bb6d
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
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.
Supersedes #2282 which I can't push into for some reason.