git-project 0.0.30__tar.gz → 0.0.32__tar.gz

git_project-0.0.32/.git

@@ -0,0 +1 @@
+gitdir: /home/dag/src/git-project/.git/worktrees/master/

{git_project-0.0.30 → git_project-0.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-project
-Version: 0.0.30
+Version: 0.0.32
 Summary: The extensible stupid project manager
 Author-email: "David A. Greene" <dag@obbligato.org>
 License-Expression: AGPL-3.0-or-later

{git_project-0.0.30 → git_project-0.0.32}/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.30'
-__version_tuple__ = version_tuple = (0, 0, 30)
+__version__ = version = '0.0.32'
+__version_tuple__ = version_tuple = (0, 0, 32)

{git_project-0.0.30 → git_project-0.0.32}/src/git_project/git.py

@@ -48,7 +48,7 @@ class Git(object):
     implement git-project functionality."""
 
     class RemoteCallbacks(pygit2.RemoteCallbacks):
-        def __init__(self):
+        def __init__(self, ssh_id: str):
             self.started_transfer = False
             self.transfer_done = False
 
@@ -57,11 +57,15 @@ class Git(object):
 
             self.null_oid = pygit2.Oid(hex='0000000000000000000000000000000000000000')
 
+            self.ssh_id = ssh_id
+
         def credentials(self, url, username_from_url, allowed_types):
             if allowed_types & pygit2.enums.CredentialType.SSH_KEY:
                 return pygit2.Keypair(
-                    username_from_url, str(Path.home() / '.ssh' / 'id_rsa.pub'),
-                    str(Path.home() / '.ssh' / 'id_rsa'), ''
+                    username_from_url,
+                    str(Path.home() / '.ssh' / f'{self.ssh_id}.pub'),
+                    str(Path.home() / '.ssh' / self.ssh_id),
+                    ''
                 )
             elif allowed_types & pygit2.enums.CredentialType.USERNAME:
                 return pygit2.Username(username_from_url)
@@ -373,11 +377,18 @@ class Git(object):
                 del self._sections[section_name]
 
     class RemoteBranchDeleteCallback(pygit2.RemoteCallbacks):
+        def __init__(self, ssh_id: str):
+            super().__init__(ssh_id)
+
         """Check the result of remove branch prune operations."""
         def credentials(self, url, username_from_url, allowed_types):
             if allowed_types & pygit2.enums.CredentialType.SSH_KEY:
-                return pygit2.Keypair(username_from_url, str(Path.home() / '.ssh' / 'id_rsa.pub'),
-                                      str(Path.home() / '.ssh' / 'id_rsa'), '')
+                return pygit2.Keypair(
+                    username_from_url,
+                    str(Path.home() / '.ssh' / f'{self.ssh_id}.pub'),
+                    str(Path.home() / '.ssh' / self.ssh_id),
+                    ''
+                )
             elif allowed_types & pygit2.enums.CredentialType.USERNAME:
                 return pygit2.Username(username_from_url)
             return None
@@ -388,6 +399,9 @@ class Git(object):
                                 format(message))
 
     class LsRemotesCallbacks(pygit2.RemoteCallbacks):
+        def __init__(self, ssh_id: str):
+            super().__init__(ssh_id)
+
         def credentials(self, url, username_from_url, allowed_types):
             if allowed_types & pygit2.enums.CredentialType.SSH_KEY:
                 return pygit2.Keypair(username_from_url, str(Path.home() / '.ssh' / 'id_rsa.pub'),
@@ -421,6 +435,10 @@ class Git(object):
         if self.has_repo():
             self._config = self.Config(self, self._repo.config)
 
+    def get_ssh_id(self):
+        """Return the ssh ID to use for this repository."""
+        return self.config.get_item('ssh', 'id')
+
     def is_bare_repository(self):
         """Return whether the configured repository is bare."""
         return self._repo.is_bare
@@ -821,7 +839,9 @@ class Git(object):
         # (local) name of the branch on the remote side.  Assume for now that
         # it's the same as our local name.
         remote_refname = self.get_remote_push_refname(refname, remote)
-        for item in self._repo.remotes[remote].ls_remotes(callbacks=Git.LsRemotesCallbacks()):
+        for item in self._repo.remotes[remote].ls_remotes(
+                callbacks=Git.LsRemotesCallbacks(self.get_ssh_id())
+        ):
             if not item['local'] and item['name'] == refname:
                 return True
         return False
@@ -832,7 +852,7 @@ class Git(object):
         # reason push :branch_name doesn't work.  push
         # :remotes/<remote>/branch_name also doesn't work.
         refname = self.branch_name_to_refname(branch_name)
-        callback = self.RemoteBranchDeleteCallback();
+        callback = self.RemoteBranchDeleteCallback(self.get_ssh_id());
         refspecs = [f':{refname}']
         remote = self._repo.remotes[remote]
         remote.push(refspecs, callback)

{git_project-0.0.30 → git_project-0.0.32}/src/git_project/substitutable.py

@@ -95,7 +95,9 @@ class SubstitutableConfigObject(ConfigObject):
                     current_branch = git.refname_to_branch_name(head_name.read_text().strip())
                     break
 
-        formats['branch'] = current_branch
+        print(f'current_branch: {current_branch}')
+        if current_branch is not None:
+            formats['branch'] = current_branch
 
         # Make sure substitutions don't reference themselves, to avoid an
         # infinite loop substituting.

{git_project-0.0.30 → git_project-0.0.32}/tests/test_substitutable.py

@@ -50,6 +50,28 @@ class MySubstitutable(git_project.SubstitutableConfigObject):
                            command='cd {builddir}/{branch} && make {target}',
                            description='Test command')
 
+class MyNoBranchSubstitutable(git_project.SubstitutableConfigObject):
+    def __init__(self,
+                 git,
+                 project_section,
+                 subsection,
+                 ident,
+                 **kwargs):
+        super().__init__(git,
+                         project_section,
+                         subsection,
+                         ident,
+                         **kwargs)
+
+    @classmethod
+    def get(cls, git, project_section, ident):
+        return super().get(git,
+                           project_section,
+                           'mysubstitutable',
+                           ident,
+                           command='cd {builddir} && make {target}',
+                           description='Test command')
+
 def test_substitutable_get(reset_directory, git):
     substitutable = MySubstitutable.get(git, 'project', 'test')
 
@@ -542,3 +564,26 @@ def test_substitutable_substitute_preserve_escaped_braces(reset_directory, git):
                                              substitutable.command)
 
     assert command == f'cd {git.get_working_copy_root()}/{{{{}}path{{}}}}/to/build/{git.get_current_branch()} && make {project.target}'
+
+
+def test_substitutable_substitute_no_branch(reset_directory, git):
+    class MyProject(git_project.ScopedConfigObject):
+        def __init__(self):
+            super().__init__(git,
+                             'project',
+                             None,
+                             'myproject',
+                             builddir='{git_workdir}/path/to/build',
+                             target='debug')
+
+    substitutable = MyNoBranchSubstitutable.get(git, 'project', 'test')
+
+    project = MyProject()
+
+    git.detach_head()
+
+    command = substitutable.substitute_value(git,
+                                             project,
+                                             substitutable.command)
+
+    assert command == f'cd {git.get_working_copy_root()}/path/to/build && make {project.target}'

git_project-0.0.30/.git

@@ -1 +0,0 @@
-gitdir: /home/dag/src/git-project/.git/worktrees/dev/

git_project-0.0.30/test.out

@@ -1,131 +0,0 @@
-============================= test session starts ==============================
-platform linux -- Python 3.11.9, pytest-8.2.2, pluggy-1.5.0
-rootdir: /home/dag/src/git-project/dev
-configfile: pyproject.toml
-plugins: anyio-4.3.0, console-scripts-1.4.1
-collected 106 items
-
-tests/test_confobj.py ............                                       [ 11%]
-tests/test_git.py .......................FF............................  [ 61%]
-tests/test_gitproject.py ..                                              [ 63%]
-tests/test_main.py .                                                     [ 64%]
-tests/test_project.py ...........                                        [ 74%]
-tests/test_runnable.py ........                                          [ 82%]
-tests/test_scopedobj.py .....                                            [ 86%]
-tests/test_substitutable.py ..............                               [100%]
-
-=================================== FAILURES ===================================
-________________________________ test_git_clone ________________________________
-
-reset_directory = None
-remote_repository = pygit2.Repository('/tmp/pytest-of-dag/pytest-14/local_remote_test_git_clone.git0/')
-tmp_path_factory = TempPathFactory(_given_basetemp=None, _trace=<pluggy._tracing.TagTracerSub object at 0x7ff199ba1e50>, _basetemp=PosixPath('/tmp/pytest-of-dag/pytest-14'), _retention_count=3, _retention_policy='all')
-
-    def test_git_clone(reset_directory, remote_repository, tmp_path_factory):
-        path = tmp_path_factory.mktemp('clone-workdir')
-    
-        os.chdir(path)
-    
-        git = git_project.Git()
-    
-        remote_url = 'file://' + remote_repository.path
-    
->       clone_path = git.clone(remote_url)
-
-/home/dag/src/git-project/dev/tests/test_git.py:441: 
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
-/home/dag/src/git-project/dev/src/git_project/git.py:744: in clone
-    self._repo = pygit2.clone_repository(url, target_path, bare, callbacks=callbacks)
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/__init__.py:217: in clone_repository
-    payload.check_error(err)
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/callbacks.py:93: in check_error
-    raise self._stored_exception
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/callbacks.py:424: in wrapper
-    return f(*args)
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/callbacks.py:552: in _transfer_progress_cb
-    transfer_progress(TransferProgress(stats_ptr))
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
-
-self = <git_project.git.Git.RemoteCallbacks object at 0x7ff199a06950>
-stats = <pygit2.remotes.TransferProgress object at 0x7ff199a9f790>
-
-    def transfer_progress(self, stats):
-        if not self.started_transfer:
-            self.started_transfer = True
-            print(f'Receiving objects ({stats.total_objects})...')
->           self.progress.start(max_value=stats.total_objects)
-E           TypeError: ProgressBar.start() got an unexpected keyword argument 'max_value'
-
-/home/dag/src/git-project/dev/src/git_project/git.py:77: TypeError
------------------------------ Captured stdout call -----------------------------
-Remote: Counting objects 1
-Remote: Counting objects 9
-Remote: Counting objects 14
-Remote: Counting objects 14
-
-Remote: Compressing objects: 0% (0/14)
-Remote: Compressing objects: 100% (14/14), done
-
-Receiving objects (14)...
-___________________________ test_git_clone_with_path ___________________________
-
-reset_directory = None
-remote_repository = pygit2.Repository('/tmp/pytest-of-dag/pytest-14/local_remote_test_git_clone_with_path.git0/')
-tmp_path_factory = TempPathFactory(_given_basetemp=None, _trace=<pluggy._tracing.TagTracerSub object at 0x7ff199ba1e50>, _basetemp=PosixPath('/tmp/pytest-of-dag/pytest-14'), _retention_count=3, _retention_policy='all')
-
-    def test_git_clone_with_path(reset_directory,
-                                 remote_repository,
-                                 tmp_path_factory):
-        path = tmp_path_factory.mktemp('clone-workdir')
-        os.chdir(path)
-    
-        git = git_project.Git()
-    
-        remote_url = 'file://' + remote_repository.path
-    
-        path = Path.cwd() / 'foo' / 'bar'
-    
-        os.makedirs(path)
-    
-        path = path / 'test-clone'
-    
->       clone_path = git.clone(remote_url, path)
-
-/home/dag/src/git-project/dev/tests/test_git.py:482: 
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
-/home/dag/src/git-project/dev/src/git_project/git.py:744: in clone
-    self._repo = pygit2.clone_repository(url, target_path, bare, callbacks=callbacks)
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/__init__.py:217: in clone_repository
-    payload.check_error(err)
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/callbacks.py:93: in check_error
-    raise self._stored_exception
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/callbacks.py:424: in wrapper
-    return f(*args)
-/home/dag/.virtualenvs/dev/lib/python3.11/site-packages/pygit2/callbacks.py:552: in _transfer_progress_cb
-    transfer_progress(TransferProgress(stats_ptr))
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
-
-self = <git_project.git.Git.RemoteCallbacks object at 0x7ff198a8e350>
-stats = <pygit2.remotes.TransferProgress object at 0x7ff198a8eb10>
-
-    def transfer_progress(self, stats):
-        if not self.started_transfer:
-            self.started_transfer = True
-            print(f'Receiving objects ({stats.total_objects})...')
->           self.progress.start(max_value=stats.total_objects)
-E           TypeError: ProgressBar.start() got an unexpected keyword argument 'max_value'
-
-/home/dag/src/git-project/dev/src/git_project/git.py:77: TypeError
------------------------------ Captured stdout call -----------------------------
-Remote: Counting objects 1
-Remote: Counting objects 14
-Remote: Counting objects 14
-
-Remote: Compressing objects: 0% (0/14)
-Remote: Compressing objects: 100% (14/14), done
-
-Receiving objects (14)...
-=========================== short test summary info ============================
-FAILED tests/test_git.py::test_git_clone - TypeError: ProgressBar.start() got...
-FAILED tests/test_git.py::test_git_clone_with_path - TypeError: ProgressBar.s...
-======================== 2 failed, 104 passed in 2.74s =========================