GitPython 3.1.60__py3-none-any.whl → 3.1.62__py3-none-any.whl

git/__init__.py

@@ -86,7 +86,7 @@ __all__ = [
     "to_hex_sha",
 ]
 
-__version__ = '3.1.60'
+__version__ = '3.1.62'
 
 from typing import Any, List, Optional, Sequence, TYPE_CHECKING, Tuple, Union
 

git/config.py

@@ -467,6 +467,45 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
 
         # END string_decode
 
+        def is_line_continuation(value: str) -> bool:
+            quoted = escaped = False
+            for char in value:
+                if escaped:
+                    escaped = False
+                elif char == "\\":
+                    escaped = True
+                elif char == '"':
+                    quoted = not quoted
+                elif char in "#;" and not quoted:
+                    return False
+            return escaped
+
+        def parse_value(value: str) -> str:
+            parsed: List[str] = []
+            whitespace: List[str] = []
+            quoted = escaped = False
+            escapes = {"b": "\b", "n": "\n", "t": "\t", '"': '"', "\\": "\\"}
+            for char in value:
+                if escaped:
+                    parsed.append(escapes.get(char, "\\" + char))
+                    escaped = False
+                    continue
+                if char.isspace() and not quoted:
+                    if parsed:
+                        whitespace.append(char)
+                    continue
+                if char in "#;" and not quoted:
+                    break
+                parsed.extend(whitespace)
+                whitespace.clear()
+                if char == "\\":
+                    escaped = True
+                elif char == '"':
+                    quoted = not quoted
+                else:
+                    parsed.append(char)
+            return "".join(parsed)
+
         while True:
             # We assume to read binary!
             line = fp.readline().decode(defenc)
@@ -513,7 +552,29 @@ class GitConfigParser(cp.RawConfigParser, metaclass=MetaParserBuilder):
 
                     if len(optval) < 2 or optval[0] != '"':
                         # Does not open quoting.
-                        pass
+                        # A value ending in an odd number of backslashes
+                        # continues on the next line, exactly as git does: the
+                        # final backslash and the newline are removed and the
+                        # next line is appended before the complete value is
+                        # parsed. An even number means the last backslash is
+                        # escaped and the value ends there.
+                        continued = False
+                        while True:
+                            if not is_line_continuation(optval):
+                                break
+                            continuation = fp.readline()
+                            if not continuation:
+                                # Backslash at end of file: git drops it.
+                                optval = optval[:-1]
+                                break
+                            lineno = lineno + 1
+                            joined = continuation.decode(defenc)
+                            while joined.endswith("\n") or joined.endswith("\r"):
+                                joined = joined[:-1]
+                            optval = optval[:-1] + joined
+                            continued = True
+                        if continued:
+                            optval = parse_value(optval)
                     elif optval[-1] != '"':
                         # Opens quoting and does not close: appears to start multi-line quoting.
                         is_multi_line = True

git/objects/submodule/base.py

@@ -414,6 +414,18 @@ class Submodule(IndexObject, TraversableIterableObj):
 
         return path
 
+    @property
+    def abspath(self) -> PathLike:
+        root = self.repo.working_tree_dir
+        if root is None:
+            return super().abspath
+        path = root
+        for component in os.fspath(self._to_relative_path(self.repo, self.path)).split("/"):
+            path = join_path_native(path, component)
+            if osp.islink(path):
+                raise ValueError("Submodule checkout path %r contains a symbolic link" % self.path)
+        return path
+
     @classmethod
     def _write_git_file_and_module_config(cls, working_tree_dir: PathLike, module_abspath: PathLike) -> None:
         """Write a ``.git`` file containing a (preferably) relative path to the actual

git/repo/base.py

@@ -386,6 +386,10 @@ class Repo:
             # Let's not assume the option exists, although it should.
             pass
 
+        # A linked worktree is not bare even when its main repository is.
+        if self._bare and self._working_tree_dir and osp.isfile(osp.join(self.git_dir, "commondir")):
+            self._bare = False
+
         # Adjust the working directory in case we are actually bare - we didn't know
         # that in the first place.
         if self._bare:

git/util.py

@@ -80,6 +80,7 @@ from typing import (
     Sequence,
     Tuple,
     TYPE_CHECKING,
+    Type,
     TypeVar,
     Union,
     cast,
@@ -108,6 +109,7 @@ from git.types import (
 
 T_IterableObj = TypeVar("T_IterableObj", bound=Union["IterableObj", "Has_id_attribute"], covariant=True)
 # So IterableList[Head] is subtype of IterableList[IterableObj].
+T_Actor = TypeVar("T_Actor", bound="Actor")
 
 _logger = logging.getLogger(__name__)
 
@@ -853,11 +855,27 @@ class CallableRemoteProgress(RemoteProgress):
         self._callable(*args, **kwargs)
 
 
+class _DeprecatedActorNameEmailRegex:
+    _pattern = re.compile(r"(.*) <(.*?)>")
+
+    def __get__(self, _instance: Any, _owner: Any) -> Pattern[str]:
+        warnings.warn(
+            "Actor.name_email_regex is deprecated and will be removed in GitPython 4.0.0 because searching long "
+            "malformed strings with it can take quadratic time. Use Actor.from_string() to parse actor identities, "
+            "or Actor(name, email) when the fields are already separate.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self._pattern
+
+
 class Actor:
     """Actors hold information about a person acting on the repository. They can be
     committers and authors or anything with a name and an email as mentioned in the git
     log entries."""
 
+    name_email_regex = _DeprecatedActorNameEmailRegex()
+
     # ENVIRONMENT VARIABLES
     # These are read when creating new commits.
     env_author_name = "GIT_AUTHOR_NAME"
@@ -891,7 +909,7 @@ class Actor:
         return '<git.Actor "%s <%s>">' % (self.name, self.email)
 
     @classmethod
-    def _from_string(cls, string: str) -> "Actor":
+    def from_string(cls: Type[T_Actor], string: str) -> T_Actor:
         """Create an :class:`Actor` from a string.
 
         :param string:
@@ -906,10 +924,12 @@ class Actor:
         left_bracket = line.find("<")
         right_bracket = line.find(">", left_bracket + 1)
         if left_bracket >= 0 and right_bracket >= 0:
-            return Actor(line[:left_bracket].rstrip(), line[left_bracket + 1 : right_bracket])
+            return cls(line[:left_bracket].rstrip(), line[left_bracket + 1 : right_bracket])
 
         # Assume the best and use the whole string as name.
-        return Actor(string, None)
+        return cls(string, None)
+
+    _from_string = from_string
 
     @classmethod
     def _main_actor(

{gitpython-3.1.60.dist-info → gitpython-3.1.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GitPython
-Version: 3.1.60
+Version: 3.1.62
 Summary: GitPython is a Python library used to interact with Git repositories
 Home-page: https://github.com/gitpython-developers/GitPython
 Author: Sebastian Thiel, Michael Trier

{gitpython-3.1.60.dist-info → gitpython-3.1.62.dist-info}/RECORD

@@ -1,14 +1,14 @@
-git/__init__.py,sha256=wqCnZT2brJ5_CGnA-7ZUMBDKSNys3SD-ZBDfUbwd9xo,8899
+git/__init__.py,sha256=rd1vUhNuzo6FFHAATYj5FYGWRA0dq3E1qUVR6ZucIUs,8899
 git/cmd.py,sha256=y-7TVp8PVWVkXcQrKqrSO2vaD6Bdiue73ZzFlWzLryU,77137
 git/compat.py,sha256=y1E6y6O2q5r8clSlr8ZNmuIWG9nmHuehQEsVsmBffs8,4526
-git/config.py,sha256=XTKrw9MQM6cy4JQm0fEEFl4S5yxYK1QGaAVKZHOlKYQ,40052
+git/config.py,sha256=G_Xwo8BCClPo8CpbZdolhYzM2fVRKBrffST-G3LvAsY,42778
 git/db.py,sha256=X19omm9sk3eEy5WAzMoZ2tG9UmdPZFQYf-8yqpvsYF0,3202
 git/diff.py,sha256=e2ljcabFPkl4BVDjIhsxEkhcF3hQ_jva_BVDimyN5PQ,28898
 git/exc.py,sha256=Gc7g1pHpn8OmTse30NHmJVsBJ2CYH8LxaR8y8UA3lIM,7119
 git/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 git/remote.py,sha256=d68K7XmkYXZUlIoLBDRpRom_df6mbkhWMrcPAP5s11c,46900
 git/types.py,sha256=d3oDduUGjfoqffcUL_GOD-3qroF8m3r9ai6Xi9_FraM,10279
-git/util.py,sha256=j49ea4S4jSWBIDkH81k8LMPVmO_gmEd7toZnLs2ZzEE,47948
+git/util.py,sha256=NPPk11jSohWD7E9-LNY0AlL_x8Qp6G2H_cBpn3vUiuw,48679
 git/index/__init__.py,sha256=i-Nqb8Lufp9aFbmxpQBORmmQnjEVVM1Pn58fsQkyGgQ,406
 git/index/base.py,sha256=cOeIjjS2LYZwqKdSGvrcgVC37TNZcTNtQzHWbGPyRwk,64775
 git/index/fun.py,sha256=AIW3T6Gr6h5E22z_2wKHevzh5K0HhjjEO9kXAK3nHOM,22419
@@ -23,7 +23,7 @@ git/objects/tag.py,sha256=jAGESnpmTEv-dLakPzheT5ILZFFArcItnXYqfxfDrgc,4441
 git/objects/tree.py,sha256=MmExcS59Iamb2cBqUvoHPdzgixabyvv5voHabossrl8,13898
 git/objects/util.py,sha256=Nlza4zLgdPmr_Yasyvvs6c1rKtW_wMxI6wDmQpQ3ufw,23846
 git/objects/submodule/__init__.py,sha256=6xySp767LVz3UylWgUalntS_nGXRuVzXxDuFAv_Wc2c,303
-git/objects/submodule/base.py,sha256=JBoT8FiVCk9ODMMQo2DDR89ThZDmj317Qr2L4JZtB2g,67073
+git/objects/submodule/base.py,sha256=pDVdSeC3XHx-dNM6xw_5VQ-UDJd4SMmdpA60HgNLGJw,67544
 git/objects/submodule/root.py,sha256=767GIhBwCwn2xvXeMHm2uEO3kZlRyaIaFXnSqcfdZxU,20277
 git/objects/submodule/util.py,sha256=sQqAYaiSJdFkZa9NlAuK_wTsMNiS-kkQnQjvIoJtc_o,3509
 git/refs/__init__.py,sha256=DWlJNnsx-4jM_E-VycbP-FZUdn6iWhjnH_uZ_pZXBro,509
@@ -34,11 +34,11 @@ git/refs/remote.py,sha256=WTlkJtpu895jJxbknDNOwL31tivQY_AHQrvroUoFBX4,2902
 git/refs/symbolic.py,sha256=MPi5UN0ujdE2GMOrzfW2zt-6HlVreuY5W4P7tnBg4V8,36103
 git/refs/tag.py,sha256=Gm1jn9kClc6f6jGQXRrpLyelrM3-KDcqHRRkD0mL4SE,5510
 git/repo/__init__.py,sha256=CILSVH36fX_WxVFSjD9o1WF5LgsNedPiJvSngKZqfVU,210
-git/repo/base.py,sha256=AGUo8RCtkjWoDL8pnFiAD4aC_YBKTJAdqKzpHNm1fj8,67336
+git/repo/base.py,sha256=AGkZ_-xm3G79SSZ6fh1PivZi4Pz5LLppfCs-hwlbl74,67544
 git/repo/fun.py,sha256=LeInQM4xN_DuNcTJ0vlRhjTzgBcZ1m5Os9_RO-Xep-w,24901
-gitpython-3.1.60.dist-info/licenses/AUTHORS,sha256=Iucx_CH3w7_4084yjM6C5BvKfLA8cVfYHWW2pVmpxSk,2410
-gitpython-3.1.60.dist-info/licenses/LICENSE,sha256=hvyUwyGpr7wRUUcTURuv3tIl8lEA3MD3NQ6CvCMbi-s,1503
-gitpython-3.1.60.dist-info/METADATA,sha256=MjkbZs9NBaGu8B58zfeufXUBGRGNyRo3ZK493ynRqqM,13558
-gitpython-3.1.60.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-gitpython-3.1.60.dist-info/top_level.txt,sha256=0hzDuIp8obv624V3GmbqsagBWkk8ohtGU-Bc1PmTT0o,4
-gitpython-3.1.60.dist-info/RECORD,,
+gitpython-3.1.62.dist-info/licenses/AUTHORS,sha256=Iucx_CH3w7_4084yjM6C5BvKfLA8cVfYHWW2pVmpxSk,2410
+gitpython-3.1.62.dist-info/licenses/LICENSE,sha256=hvyUwyGpr7wRUUcTURuv3tIl8lEA3MD3NQ6CvCMbi-s,1503
+gitpython-3.1.62.dist-info/METADATA,sha256=rKMsD3wuor-sivzUK0SrkveTUreIIiJwz5rAH9iVbGE,13558
+gitpython-3.1.62.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+gitpython-3.1.62.dist-info/top_level.txt,sha256=0hzDuIp8obv624V3GmbqsagBWkk8ohtGU-Bc1PmTT0o,4
+gitpython-3.1.62.dist-info/RECORD,,