git-project 0.0.26__tar.gz → 0.0.27__tar.gz

{git_project-0.0.26 → git_project-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-project
-Version: 0.0.26
+Version: 0.0.27
 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.26 → git_project-0.0.27}/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.26'
-__version_tuple__ = version_tuple = (0, 0, 26)
+__version__ = version = '0.0.27'
+__version_tuple__ = version_tuple = (0, 0, 27)

{git_project-0.0.26 → git_project-0.0.27}/src/git_project/git.py

@@ -396,7 +396,10 @@ class Git(object):
 
     # Repository-wide info
     def __init__(self):
-        repo_path = pygit2.discover_repository(Path.cwd())
+        self.reinit(Path.cwd())
+
+    def reinit(self, gitdir: Path):
+        repo_path = pygit2.discover_repository(gitdir)
         if repo_path:
             self._repo = pygit2.Repository(repo_path)
             self._config = self.Config(self, self._repo.config)
@@ -461,16 +464,18 @@ class Git(object):
         return self._repo.path
 
     def get_git_common_dir(self):
-        """Get the GIT_COMMON_DIR directory.
+        """Get the GIT_COMMON_DIR directory."""
+        if not self.get_current_worktree():
+            return self.get_gitdir()
 
-        NOTE: This assumes that worktree paths are in .git/worktrees/<name>
+        worktree_gitdir = Path(self._repo.path)
 
-        """
-        gitdir = Path(self._repo.path)
-        while gitdir.name != '.git':
-            gitdir = gitdir.parent
+        commondir_filename = worktree_gitdir / 'commondir'
 
-        return str(gitdir)
+        with open(commondir_filename, 'r') as commondir_file:
+            commondir = commondir_file.read().strip()
+
+        return commondir
 
     def get_current_worktree(self):
         """Return the name of the current worktree or None if we are not in a
@@ -556,6 +561,10 @@ class Git(object):
 
     # Operations on remotes
 
+    def get_remote_url(self, remote):
+        """Get the URL for the given remote."""
+        return self._repo.remotes[remote].url
+
     def set_remote_fetch_refspecs(self, remote, refspecs):
         """Set the refspec list for the given remote to refspecs."""
         if isinstance(refspecs, str):

{git_project-0.0.26 → git_project-0.0.27}/src/git_project/substitutable.py

@@ -64,28 +64,18 @@ class SubstitutableConfigObject(ConfigObject):
 
         # Substitute for project-global values.
         for key, value in project.iteritems():
-            if key == 'path':
-                found_path = True
             if key == self.get_subsection():
                 value = self.get_ident()
             formats[key] = value
 
         # Substitute for values in self.
         for key, value in self.iteritems():
-           if key == 'path':
-               found_path = True
            formats[key] = value
 
         formats['project'] = project.get_section()
-        formats['gitdir'] = git.get_gitdir()
-        formats['git_common_dir'] = git.get_git_common_dir()
-
-        if not found_path:
-            # We haven't found a worktree or other construct to give us a path,
-            # so do a mildly expensive thing to get the path of the curernt
-            # working copy.
-            path = git.get_working_copy_root()
-            formats['path'] = path
+        formats['gitdir'] = str(git.get_gitdir())
+        formats['git_common_dir'] = str(git.get_git_common_dir())
+        formats['git_workdir'] = str(git.get_working_copy_root())
 
         current_branch = git.get_current_branch()
         if not current_branch:
@@ -107,6 +97,19 @@ class SubstitutableConfigObject(ConfigObject):
 
         formats['branch'] = current_branch
 
+        # Make sure substitutions don't reference themselves, to avoid an
+        # infinite loop substituting.
+        #
+        # NOTE: This won't catch mutually-recursive situations like:
+        #
+        # path: {dir}/foo
+        # dir: {path}/bar
+        for key, value in formats.items():
+            if f'{{{key}}}' in value:
+                raise RuntimeError(
+                    f'Recursive substitution: {key} is in {value}'
+                )
+
         def try_format(string, formats):
             return eval(f"f'{string}'", formats)
 

{git_project-0.0.26 → git_project-0.0.27}/src/git_project/test_support/common.py

@@ -323,9 +323,9 @@ def init_clone(url, path):
 
     remote_only_commit = repo.revparse_single('refs/remotes/origin/remote_only')
 
-    merged_remote_only_branch = repo.branches.create('merged_remote_only', remote_only_commit)
+    pushed_remote_only_branch = repo.branches.create('pushed_remote_only', remote_only_commit)
 
-    # -------merged_remote, origin/old_master--origin/master, pushed_indirectly--origin/remote_only, merged_remote_only
+    # -------merged_remote, origin/old_master--origin/master, pushed_indirectly--origin/remote_only, pushed_remote_only
     #   |                                \
     #   |                                 `---master, merged_local--unmerged
     #    \

{git_project-0.0.26 → git_project-0.0.27}/test.out

@@ -3,15 +3,16 @@ platform darwin -- Python 3.13.2, pytest-8.3.4, pluggy-1.5.0
 rootdir: /Users/dag/projects/git-project/master
 configfile: pyproject.toml
 plugins: console-scripts-1.4.1
-collected 106 items
+collected 111 items
 
-tests/test_confobj.py ............                                       [ 11%]
-tests/test_git.py .....................................................  [ 61%]
+tests/test_confobj.py ............                                       [ 10%]
+tests/test_git.py ...................................................... [ 59%]
+..                                                                       [ 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%]
+tests/test_main.py .                                                     [ 63%]
+tests/test_project.py ...........                                        [ 73%]
+tests/test_runnable.py ........                                          [ 81%]
+tests/test_scopedobj.py .....                                            [ 85%]
+tests/test_substitutable.py ................                             [100%]
 
-============================= 106 passed in 31.62s =============================
+============================= 111 passed in 32.41s =============================

{git_project-0.0.26 → git_project-0.0.27}/tests/test_git.py

@@ -391,10 +391,10 @@ def test_git_iterrefnames(reset_directory, local_repository):
             ['refs/heads/master',
              'refs/heads/merged_local',
              'refs/heads/merged_remote',
-             'refs/heads/merged_remote_only',
              'refs/heads/notpushed',
              'refs/heads/pushed',
              'refs/heads/pushed_indirectly',
+             'refs/heads/pushed_remote_only',
              'refs/heads/unmerged'])
 
 def test_git_iterrefnames_str(reset_directory, local_repository):
@@ -408,10 +408,10 @@ def test_git_iterrefnames_str(reset_directory, local_repository):
             ['refs/heads/master',
              'refs/heads/merged_local',
              'refs/heads/merged_remote',
-             'refs/heads/merged_remote_only',
              'refs/heads/notpushed',
              'refs/heads/pushed',
              'refs/heads/pushed_indirectly',
+             'refs/heads/pushed_remote_only',
              'refs/heads/unmerged'])
 
 def test_git_create_branch(reset_directory, local_repository):
@@ -668,10 +668,10 @@ def test_git_iterbranches(reset_directory, git):
     assert branches == {'master',
                         'merged_local',
                         'merged_remote',
-                        'merged_remote_only',
                         'notpushed',
                         'pushed',
                         'pushed_indirectly',
+                        'pushed_remote_only',
                         'unmerged',
                         'origin/HEAD',
                         'origin/master',
@@ -820,3 +820,57 @@ def test_git_worktree_get_current_worktree(reset_directory, local_repository):
     wtgit = git_project.Git()
 
     assert wtgit.get_current_worktree() == 'test-wt'
+
+def test_git_get_remote_url(reset_directory, local_repository, remote_repository):
+    os.chdir(local_repository.path)
+
+    git = git_project.Git()
+
+    assert git.has_repo()
+
+    url = git.get_remote_url('origin')
+
+    assert url == remote_repository.path
+
+def test_git_reinit(local_repository):
+    repo_parent = Path(local_repository.path).parent
+
+    os.chdir(local_repository.path)
+
+    git = git_project.Git()
+
+    assert git.has_repo()
+    assert Path(git.get_gitdir()) == Path(local_repository.path)
+
+    new_hidden_dir = '.test.git'
+
+    gitdir = Path(git.get_gitdir())
+    newgitdir = repo_parent / new_hidden_dir
+
+    gitdir.rename(newgitdir)
+
+    git.reinit(newgitdir)
+
+    assert git.has_repo()
+    assert Path(git.get_gitdir()) == repo_parent / new_hidden_dir
+
+def test_git_get_git_common_dir_renamed(reset_directory, local_repository):
+    repo_parent = Path(local_repository.path).parent
+
+    os.chdir(local_repository.path)
+
+    git = git_project.Git()
+
+    assert git.has_repo()
+
+    new_hidden_dir = '.test.git'
+
+    gitdir = Path(git.get_gitdir())
+    newgitdir = repo_parent / new_hidden_dir
+
+    gitdir.rename(newgitdir)
+
+    git.reinit(newgitdir)
+
+    assert git.has_repo()
+    assert Path(git.get_git_common_dir()).name == new_hidden_dir

{git_project-0.0.26 → git_project-0.0.27}/tests/test_project.py

@@ -77,6 +77,7 @@ def test_project_add_branch(project):
     assert branches == {'master', 'project', 'remote_only'}
 
 def test_project_iterrefnames(project):
+    print(f'In {Path.cwd()}')
     project.add_branch('pushed')
 
     branches = {branch for branch in project.iterbranches()}
@@ -93,6 +94,7 @@ def test_project_iterrefnames(project):
                     'refs/remotes/origin/master',
                     'refs/heads/pushed',
                     'refs/heads/pushed_indirectly',
+                    'refs/heads/pushed_remote_only',
                     'refs/remotes/origin/pushed',
                     'refs/remotes/origin/remote_only'}
 
@@ -104,7 +106,8 @@ def test_project_branch_is_merged(project):
     assert project.branch_is_merged('merged_local')
     assert not project.branch_is_merged('unmerged')
     assert project.branch_is_merged('merged_remote')
-    assert project.branch_is_merged('merged_remote_only')
+    # FIXME: Is not really merged!
+    assert project.branch_is_merged('pushed_remote_only')
 
 def test_project_branch_is_pushed(project):
     assert not project.branch_is_pushed('master')
@@ -113,7 +116,7 @@ def test_project_branch_is_pushed(project):
     assert project.branch_is_pushed('merged_remote')
     assert not project.branch_is_pushed('merged_local')
     assert not project.branch_is_pushed('unmerged')
-    assert project.branch_is_pushed('merged_remote_only')
+    assert project.branch_is_pushed('pushed_remote_only')
 
 def test_project_prune_branch(reset_directory,
                               remote_repository,

{git_project-0.0.26 → git_project-0.0.27}/tests/test_substitutable.py

@@ -25,6 +25,7 @@ from git_project.test_support import check_config_file
 
 import os
 from pathlib import Path
+import pytest
 import shutil
 
 class MySubstitutable(git_project.SubstitutableConfigObject):
@@ -402,3 +403,102 @@ def test_substitutable_substitute_fstring(reset_directory, git):
                                              substitutable.command)
 
     assert command == f'cd {project.builddir}/{current_branch.replace("imerge/", "", 1)} && make {project.target}'
+
+def test_substitutable_substitute_recursive(reset_directory, git):
+    class MyProject(git_project.ScopedConfigObject):
+        def __init__(self):
+            super().__init__(git,
+                             'project',
+                             None,
+                             'myproject',
+                             builddir='/path/to/{builddir}',
+                             target='debug')
+
+    substitutable = MySubstitutable.get(git, 'project', 'test')
+
+    project = MyProject()
+
+    with pytest.raises(Exception) as e:
+        command = substitutable.substitute_value(git,
+                                                 project,
+                                                 substitutable.command)
+
+def test_substitutable_substitute_project(reset_directory, git):
+    class MyProject(git_project.ScopedConfigObject):
+        def __init__(self):
+            super().__init__(git,
+                             'project',
+                             None,
+                             'myproject',
+                             builddir='/path/to/build/{project}',
+                             target='debug')
+
+    substitutable = MySubstitutable.get(git, 'project', 'test')
+
+    project = MyProject()
+
+    command = substitutable.substitute_value(git,
+                                             project,
+                                             substitutable.command)
+
+    assert command == f'cd /path/to/build/{project.get_section()}/{git.get_current_branch()} && make {project.target}'
+
+def test_substitutable_substitute_gitdir(reset_directory, git):
+    class MyProject(git_project.ScopedConfigObject):
+        def __init__(self):
+            super().__init__(git,
+                             'project',
+                             None,
+                             'myproject',
+                             builddir='{gitdir}/../path/to/build',
+                             target='debug')
+
+    substitutable = MySubstitutable.get(git, 'project', 'test')
+
+    project = MyProject()
+
+    command = substitutable.substitute_value(git,
+                                             project,
+                                             substitutable.command)
+
+    assert command == f'cd {git.get_gitdir()}/../path/to/build/{git.get_current_branch()} && make {project.target}'
+
+def test_substitutable_substitute_git_common_dir(reset_directory, git):
+    class MyProject(git_project.ScopedConfigObject):
+        def __init__(self):
+            super().__init__(git,
+                             'project',
+                             None,
+                             'myproject',
+                             builddir='{git_common_dir}/../path/to/build',
+                             target='debug')
+
+    substitutable = MySubstitutable.get(git, 'project', 'test')
+
+    project = MyProject()
+
+    command = substitutable.substitute_value(git,
+                                             project,
+                                             substitutable.command)
+
+    assert command == f'cd {git.get_git_common_dir()}/../path/to/build/{git.get_current_branch()} && make {project.target}'
+
+def test_substitutable_substitute_git_workdir(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 = MySubstitutable.get(git, 'project', 'test')
+
+    project = MyProject()
+
+    command = substitutable.substitute_value(git,
+                                             project,
+                                             substitutable.command)
+
+    assert command == f'cd {git.get_working_copy_root()}/path/to/build/{git.get_current_branch()} && make {project.target}'