Support "tag <tag>" syntax for fetching tags

diff --git a/Changelog b/Changelog
index 8075597682544ebc640fa692fecd7e049e1a3921..59085ea7b7ab9f5574544d3ad244d888c656735d 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 ## [Unreleased]
 ## [Unreleased]

+- Support "tag <tag>" syntax for fetching tags

 
 
 ## [1.4.4] - 2024-06-03
 
 
 ## [1.4.4] - 2024-06-03

diff --git a/git_cache.py b/git_cache.py
index 8171b48f3a06e8b4921bbcce5dcb028980c4d8d0..76c0ed48a4f8bd0ceb2c8b7d10ec7e06918971dc 100644 (file)
--- a/git_cache.py
+++ b/git_cache.py
@@ -79,7 +79,7 @@ def is_ancestor(repo: Repo, descendant: RefOrRev, ancestor: RefOrRev) -> bool:
                               'merge-base',
                               '--is-ancestor',
                               ancestor,
                               'merge-base',
                               '--is-ancestor',
                               ancestor,

-                              descendant],
+                              descendant.removeprefix('tag ')],

                              check=False)
     return process.returncode == 0
 
                              check=False)
     return process.returncode == 0
 


@@ -178,9 +178,12 @@ def _git_fetch(
         repo: Repo,
         ref: Ref,
         force: bool = False) -> None:
         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 []) +
     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]:
 
 
 def fetch(repo: Repo, ref: Ref, force: bool = False) -> Tuple[Path, Rev]:


@@ -201,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)
 
     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)
         rev = Rev(rev_file.read(999).strip())
     verify_ancestry(repo, ref, rev, force=force)
     _log_fetch(repo, ref, rev, force=force)

diff --git a/test_git_cache.py b/test_git_cache.py
index 1845c010af8e33434e4218fa5a9fc33ff972b8d4..36781718839ec633da6995ba04fc1c16ee07ad59 100644 (file)
--- a/test_git_cache.py
+++ b/test_git_cache.py
@@ -261,6 +261,28 @@ class TestGitCache(unittest.TestCase):
         git_cache.ensure_rev_available(
             self.upstream, 'main', rev, force=True)
 
         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()
 
 if __name__ == '__main__':
     unittest.main()