Rely on nixpkgs' python3Packages.backoff

[git-cache] / git_cache.py

diff --git a/git_cache.py b/git_cache.py
index 75f7b2689b8b7f12313aedc60754c349b53fcdd3..c7bcdd215e2cf52bda04483ecb267d0b72ade596 100644 (file)
--- a/git_cache.py
+++ b/git_cache.py
@@ -85,7 +85,7 @@ def _read_fetch_log(repo: Repo) -> Iterator[_LogEntry]:
     filename = _log_filename(repo)
     if not os.path.exists(filename):
         return
     filename = _log_filename(repo)
     if not os.path.exists(filename):
         return

-    with open(filename, 'r') as f:
+    with open(filename, 'r', encoding='utf-8') as f:

         for line in f:
             _, _, rev, ref = line.strip().split(maxsplit=3)
             yield _LogEntry(ref, rev)
         for line in f:
             _, _, rev, ref = line.strip().split(maxsplit=3)
             yield _LogEntry(ref, rev)


@@ -107,7 +107,7 @@ def _log_fetch(repo: Repo, ref: Ref, rev: Rev, force: bool = False) -> None:
             verify_ancestry(repo, rev, prev_rev)
     filename = _log_filename(repo)
     os.makedirs(os.path.dirname(filename), exist_ok=True)
             verify_ancestry(repo, rev, prev_rev)
     filename = _log_filename(repo)
     os.makedirs(os.path.dirname(filename), exist_ok=True)

-    with open(filename, 'a') as f:
+    with open(filename, 'a', encoding='utf-8') as f:

         f.write(
             f'{time.strftime("%Y-%m%d-%H:%M:%S%z")} '
             f'{"FORCEDFETCH" if force else "fetch"} {rev} {ref}\n'
         f.write(
             f'{time.strftime("%Y-%m%d-%H:%M:%S%z")} '
             f'{"FORCEDFETCH" if force else "fetch"} {rev} {ref}\n'


@@ -189,7 +189,7 @@ def fetch(repo: Repo, ref: Ref, force: bool = False) -> Tuple[Path, Rev]:
     logging.debug('Fetching ref "%s" from %s', ref, repo)
     _git_fetch(cachedir, repo, ref, force=force)
 
     logging.debug('Fetching ref "%s" from %s', ref, repo)
     _git_fetch(cachedir, repo, ref, force=force)
 

-    with open(os.path.join(cachedir, 'refs', 'heads', ref)) as rev_file:
+    with open(os.path.join(cachedir, 'refs', 'heads', ref), encoding='utf-8') as rev_file:

         rev = Rev(rev_file.read(999).strip())
     verify_ancestry(repo, ref, rev, force=force)
     _log_fetch(repo, ref, rev, force=force)
         rev = Rev(rev_file.read(999).strip())
     verify_ancestry(repo, ref, rev, force=force)
     _log_fetch(repo, ref, rev, force=force)