X-Git-Url: http://git.scottworley.com/git-cache/blobdiff_plain/a28f4bb75d2c9cc49b6e8d8d36ed53ff43d2a173..HEAD:/git_cache.py

diff --git a/git_cache.py b/git_cache.py
index c7bcdd2..76c0ed4 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
@@ -17,6 +24,11 @@ from typing import Iterator, NamedTuple, Optional, TypeVar, Tuple, Union
 
 import backoff
 
+
+class GitCacheError(Exception):
+    pass
+
+
 Path = str   # eg: "/home/user/.cache/git-cache/v1"
 Repo = str   # eg: "https://github.com/NixOS/nixpkgs.git"
 Ref = str    # eg: "master" or "v1.0.0"
@@ -67,7 +79,7 @@ def is_ancestor(repo: Repo, descendant: RefOrRev, ancestor: RefOrRev) -> bool:
                               'merge-base',
                               '--is-ancestor',
                               ancestor,
-                              descendant],
+                              descendant.removeprefix('tag ')],
                              check=False)
     return process.returncode == 0
 
@@ -78,7 +90,7 @@ def verify_ancestry(
         ancestor: RefOrRev,
         force: bool = False) -> None:
     if not force and not is_ancestor(repo, descendant, ancestor):
-        raise Exception(f'{ancestor} is not an ancestor of {descendant}')
+        raise GitCacheError(f'{ancestor} is not an ancestor of {descendant}')
 
 
 def _read_fetch_log(repo: Repo) -> Iterator[_LogEntry]:
@@ -166,9 +178,12 @@ def _git_fetch(
         repo: Repo,
         ref: Ref,
         force: bool = False) -> None:
+    refargs = (['tag', ref.removeprefix('tag ')]
+               if ref.startswith('tag ')
+               else [f'{ref}:{ref}'])
     subprocess.run(['git', '-C', cachedir, 'fetch'] +
                    (['--force'] if force else []) +
-                   [repo, f'{ref}:{ref}'], check=True)
+                   [repo] + refargs, check=True)
 
 
 def fetch(repo: Repo, ref: Ref, force: bool = False) -> Tuple[Path, Rev]:
@@ -189,7 +204,10 @@ 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), encoding='utf-8') as rev_file:
+    rev_path = (['tags', ref.removeprefix('tag ')]
+                if ref.startswith('tag ')
+                else ['heads', ref])
+    with open(os.path.join(cachedir, 'refs', *rev_path), 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)