Skip to content

fix(util): wait for contended locks with relative filenames #2282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
FanWu-ai wants to merge 2 commits into from
Closed

fix(util): wait for contended locks with relative filenames #2282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac29284
fix(util): wait for contended locks with relative filenames
FanWu-ai Oct 11, 2026
62fe322
test(util): patch sleep portably on older Python versions
FanWu-ai Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion git/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ def _obtain_lock(self) -> None:
# synity check: if the directory leading to the lockfile is not
# readable anymore, raise an exception
curtime = time.time()
if not osp.isdir(osp.dirname(self._lock_file_path())):
if not osp.isdir(osp.dirname(self._lock_file_path()) or osp.curdir):
msg = "Directory containing the lockfile %r was not readable anymore after waiting %g seconds" % (
self._lock_file_path(),
curtime - starttime,
Expand Down
37 changes: 37 additions & 0 deletions test/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,3 +862,40 @@ def test_mode_str_to_int_accepts_bytes():
assert mode_str_to_int(b"100644") == 0o100644
assert mode_str_to_int("644") == 0o644
assert mode_str_to_int(b"120000") == 0o120000


@pytest.mark.parametrize("path_type", [str, pathlib.Path])
@pytest.mark.parametrize("relative", [True, False])
def test_blocking_lock_waits_for_existing_holder(tmp_path, monkeypatch, path_type, relative):
monkeypatch.chdir(tmp_path)
path = path_type("resource" if relative else tmp_path / "resource")
owner = LockFile(path)
waiter = BlockingLockFile(path, check_interval_s=0.01, max_block_time_s=1)
owner._obtain_lock()
try:
with mock.patch("git.util.time.sleep", side_effect=lambda _: owner._release_lock()) as sleep:
waiter._obtain_lock()
sleep.assert_called_once_with(0.01)
assert waiter._has_lock()
finally:
owner._release_lock()
waiter._release_lock()


@pytest.mark.parametrize("path_type", [str, pathlib.Path])
def test_blocking_relative_lock_reports_timeout(tmp_path, monkeypatch, path_type):
monkeypatch.chdir(tmp_path)
owner = LockFile(path_type("resource"))
waiter = BlockingLockFile(path_type("resource"), max_block_time_s=0)
owner._obtain_lock()
try:
with pytest.raises(OSError, match="Waited .* seconds for lock"):
waiter._obtain_lock()
finally:
owner._release_lock()


def test_blocking_lock_still_rejects_missing_directory(tmp_path):
waiter = BlockingLockFile(tmp_path / "missing" / "resource")
with pytest.raises(OSError, match="Directory containing the lockfile"):
waiter._obtain_lock()
Loading