'merge-base',
'--is-ancestor',
ancestor,
- descendant],
+ descendant.removeprefix('tag ')],
check=False)
return process.returncode == 0
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]:
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)
git_cache.ensure_rev_available(
self.upstream, 'main', rev, force=True)
+ def test_fetch_tag(self) -> None:
+ _git(self.upstream, 'tag', 'v1.2.3')
+ d, rev = git_cache.fetch(self.upstream, 'tag v1.2.3')
+ self.assertEqual(_git(d, 'show', f'{rev}:file'), b'Contents')
+
+ def test_ensure_tag(self) -> None:
+ rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
+ _git(self.upstream, 'tag', 'v1.2.3')
+ d = git_cache.ensure_rev_available(self.upstream, 'tag v1.2.3', rev)
+ self.assertEqual(_git(d, 'show', f'{rev}:file'), b'Contents')
+
+ def test_fetch_annotated_tag(self) -> None:
+ _git(self.upstream, 'tag', '--annotate', '-m', 'Tag', 'v1.2.3')
+ d, rev = git_cache.fetch(self.upstream, 'tag v1.2.3')
+ self.assertEqual(_git(d, 'show', f'{rev}:file'), b'Contents')
+
+ def test_ensure_annotated_tag(self) -> None:
+ rev = _git(self.upstream, 'log', '--format=%H', '-n1').strip().decode()
+ _git(self.upstream, 'tag', '--annotate', '-m', 'Tag', 'v1.2.3')
+ d = git_cache.ensure_rev_available(self.upstream, 'tag v1.2.3', rev)
+ self.assertEqual(_git(d, 'show', f'{rev}:file'), b'Contents')
+
if __name__ == '__main__':
unittest.main()