summaryrefslogtreecommitdiff
path: root/git/objects/submodule/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/objects/submodule/util.py')
-rw-r--r--git/objects/submodule/util.py23
1 files changed, 7 insertions, 16 deletions
diff --git a/git/objects/submodule/util.py b/git/objects/submodule/util.py
index cde18d08..5290000b 100644
--- a/git/objects/submodule/util.py
+++ b/git/objects/submodule/util.py
@@ -5,20 +5,11 @@ from io import BytesIO
import weakref
-# typing -----------------------------------------------------------------------
-
-from typing import Any, Sequence, TYPE_CHECKING, Union
-
-from git.types import PathLike
+from typing import Any, TYPE_CHECKING, Union
if TYPE_CHECKING:
from .base import Submodule
from weakref import ReferenceType
- from git.repo import Repo
- from git.refs import Head
- from git import Remote
- from git.refs import RemoteReference
-
__all__ = ('sm_section', 'sm_name', 'mkhead', 'find_first_remote_branch',
'SubmoduleConfigParser')
@@ -26,23 +17,23 @@ __all__ = ('sm_section', 'sm_name', 'mkhead', 'find_first_remote_branch',
#{ Utilities
-def sm_section(name: str) -> str:
+def sm_section(name):
""":return: section title used in .gitmodules configuration file"""
- return f'submodule {name}'
+ return 'submodule "%s"' % name
-def sm_name(section: str) -> str:
+def sm_name(section):
""":return: name of the submodule as parsed from the section name"""
section = section.strip()
return section[11:-1]
-def mkhead(repo: 'Repo', path: PathLike) -> 'Head':
+def mkhead(repo, path):
""":return: New branch/head instance"""
return git.Head(repo, git.Head.to_full_path(path))
-def find_first_remote_branch(remotes: Sequence['Remote'], branch_name: str) -> 'RemoteReference':
+def find_first_remote_branch(remotes, branch_name):
"""Find the remote branch matching the name of the given branch or raise InvalidGitRepositoryError"""
for remote in remotes:
try:
@@ -101,7 +92,7 @@ class SubmoduleConfigParser(GitConfigParser):
#{ Overridden Methods
def write(self) -> None:
- rval: None = super(SubmoduleConfigParser, self).write()
+ rval = super(SubmoduleConfigParser, self).write()
self.flush_to_index()
return rval
# END overridden methods