X-Git-Url: http://git.scottworley.com/git-cache/blobdiff_plain/f580771a046e5aa9c2f8f3948213c8998a1e8cc3..50685beba299ab4b601b6aabb013bb8398c8bfb0:/git_cache.py diff --git a/git_cache.py b/git_cache.py index 75f7b26..a34c329 100644 --- a/git_cache.py +++ b/git_cache.py @@ -1,3 +1,10 @@ +# git-cache: Cache git content locally +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, version 3. + + # It would be nice if we could share the nix git cache, but as of the # time of writing it is transitioning from gitv2 (deprecated) to gitv3 # (not ready yet), and trying to straddle them both is too far into nix @@ -85,7 +92,7 @@ def _read_fetch_log(repo: Repo) -> Iterator[_LogEntry]: 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) @@ -107,7 +114,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) - 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' @@ -189,7 +196,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) - 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)