scmrepo 3.5.1__py3-none-any.whl → 3.5.2__py3-none-any.whl

scmrepo/base.py

@@ -103,3 +103,7 @@ class Base(AbstractContextManager):
 
     def _reset(self) -> None:
         pass
+
+    def list_submodules(self) -> list[str]:
+        """Returns a list of submodules in the repo."""
+        return []

scmrepo/git/__init__.py

@@ -412,6 +412,7 @@ class Git(Base):
     check_attr = partialmethod(_backend_func, "check_attr")
 
     get_tree_obj = partialmethod(_backend_func, "get_tree_obj")
+    list_submodules = partialmethod(_backend_func, "list_submodules")
 
     def branch_revs(self, branch: str, end_rev: Optional[str] = None) -> Iterable[str]:
         """Iterate over revisions in a given branch (from newest to oldest).

scmrepo/git/backend/dulwich/__init__.py

@@ -199,6 +199,9 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
         self._submodules: dict[str, str] = self._find_submodules()
         self._stashes: dict = {}
 
+    def list_submodules(self) -> list[str]:
+        raise NotImplementedError
+
     def _find_submodules(self) -> dict[str, str]:
         """Return dict mapping submodule names to submodule paths.
 
@@ -349,21 +352,6 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
 
     def _expand_paths(self, paths: list[str], force: bool = False) -> Iterator[str]:
         for path in paths:
-            if not os.path.isabs(path) and self._submodules:
-                # NOTE: If path is inside a submodule, Dulwich expects the
-                # staged paths to be relative to the submodule root (not the
-                # parent git repo root). We append path to root_dir here so
-                # that the result of relpath(path, root_dir) is actually the
-                # path relative to the submodule root.
-                fs_path = relpath(path, self.root_dir)
-                for sm_path in self._submodules.values():
-                    assert self.root_dir
-                    if fs_path.startswith(sm_path):
-                        path = os.path.join(
-                            self.root_dir,
-                            relpath(fs_path, sm_path),
-                        )
-                        break
             if os.path.isdir(path):
                 for root, _, fs in os.walk(path):
                     for fpath in fs:

scmrepo/git/backend/gitpython.py

@@ -789,3 +789,6 @@ class GitPythonBackend(BaseGitBackend):  # pylint:disable=abstract-method
         if info == "unset":
             return False
         return info
+
+    def list_submodules(self) -> list[str]:
+        raise NotImplementedError

scmrepo/git/backend/pygit2/__init__.py

@@ -269,6 +269,9 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         # can be reacquired later as needed.
         self.repo.free()
 
+    def list_submodules(self) -> list[str]:
+        return self.repo.listall_submodules()
+
     @classmethod
     def clone(
         cls,
@@ -865,6 +868,11 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         from pygit2 import IndexEntry
         from pygit2.enums import ResetMode
 
+        if self.list_submodules():
+            raise NotImplementedError(
+                "pygit2 seems to remove files from submodules on reset"
+            )
+
         self.repo.index.read(False)  # type: ignore[attr-defined]
         if paths is not None:
             tree = self.repo.revparse_single("HEAD").tree  # type: ignore[attr-defined]

{scmrepo-3.5.1.dist-info → scmrepo-3.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scmrepo
-Version: 3.5.1
+Version: 3.5.2
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Requires-Dist: aiohttp-retry>=2.5.0
 Requires-Dist: tqdm
 Provides-Extra: tests
 Requires-Dist: aioresponses<0.8,>=0.7; extra == "tests"
-Requires-Dist: paramiko<4,>=3.4.0; extra == "tests"
+Requires-Dist: paramiko<5,>=3.4.0; extra == "tests"
 Requires-Dist: pytest<9,>=7; extra == "tests"
 Requires-Dist: pytest-asyncio<2,>=0.23.2; extra == "tests"
 Requires-Dist: pytest-cov>=4.1.0; extra == "tests"
@@ -38,7 +38,7 @@ Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Requires-Dist: proxy.py; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.17.0; extra == "dev"
+Requires-Dist: mypy==1.17.1; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.5.1.dist-info → scmrepo-3.5.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 scmrepo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scmrepo/asyn.py,sha256=DoTSfXhvGocuS0HS5CuO5MSFIy2qkdbJ4vjymhvT1R8,1457
-scmrepo/base.py,sha256=pgddGR7UeZoEq2d5lip1vjbxTmpwTnKFH4JwHy-Fmho,3007
+scmrepo/base.py,sha256=vQrPSM6lmVSLAAWeE2V2ClKb_OZ-wGzrWrxMrEuuvBY,3126
 scmrepo/exceptions.py,sha256=vR8BuCKgKh9lMnCemzNYGHiJctioOmhn_Kv5m8XO69Y,1053
 scmrepo/fs.py,sha256=8efNf_D5IQb-N42w-apAkG3Uwe8gJA_HVflniY9gX6M,6639
 scmrepo/noscm.py,sha256=xraqlBek4zhFlHf1LvTMkgBM0hykgcTfMVkTNCpVlcQ,491
@@ -8,18 +8,18 @@ scmrepo/progress.py,sha256=p4FJwEv1x588oYHk-AcWbq9C382hJ1lq8ThGi9iGPcQ,2336
 scmrepo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scmrepo/urls.py,sha256=vEfW1h1lb7GXvMVBk-TNwqctpl-5xGMA2LbOPVn7t4Q,638
 scmrepo/utils.py,sha256=PA-U6od-sq1-ty_qriyptNrDvuZGDP8cwCOSQDvHCsw,1714
-scmrepo/git/__init__.py,sha256=lTpkGdtwPM1PtYmmymTss8AvZRrdYCX0x_A_wS_pago,17203
+scmrepo/git/__init__.py,sha256=-EBGaBI3l-x2TgGpochkVx-uF7XcxuHjMMPJCAqKbSE,17273
 scmrepo/git/config.py,sha256=0t0OBmJ9SIa5tf22QdcGzhZfdMzzppvEmceUDg8ZPyE,943
 scmrepo/git/credentials.py,sha256=_jHkeC-CNQRLtGhaliE57xLWILGBp2Oy7aPJ1TK9Mqw,22314
 scmrepo/git/objects.py,sha256=qx8zAHZIrr0SDbZGD9wVShlMZK57nef8stIeRVqYdCU,4676
 scmrepo/git/stash.py,sha256=wKWnYj_xpdT_3pvHiXtE7_I_By4S-Zbxf4Lv-ZY2sxI,2785
 scmrepo/git/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scmrepo/git/backend/base.py,sha256=U_ldNl5Njz2EoMryfo8nyOf5EKs6Kf2yv_MjObaNndA,13570
-scmrepo/git/backend/gitpython.py,sha256=fHJJAaX58fb7OJyXT6X4rOZ7ZmebEGU-MptLGfiXOOE,25762
-scmrepo/git/backend/dulwich/__init__.py,sha256=dgbOnhybFhnrncogp0frgQewElwDsazMo-jgnWFKF4g,36086
+scmrepo/git/backend/gitpython.py,sha256=Kzg04vr4T2dL-V_w-I6UOdmEZQCtjDViBeQC4RAzPxc,25841
+scmrepo/git/backend/dulwich/__init__.py,sha256=R6mdUIIm9HxVYa4CxNS6APuEcIE0Bzx4X-bUZN0SNm8,35339
 scmrepo/git/backend/dulwich/asyncssh_vendor.py,sha256=QnaUyHmPWBWtryK1JCXR_S0UZyjfF_NN7z9jIii3Bac,9912
 scmrepo/git/backend/dulwich/client.py,sha256=VvAheye_QAK6agGsKVj5Jk62zOp-SipgdwuaJLIWDbA,2573
-scmrepo/git/backend/pygit2/__init__.py,sha256=iBNDQDUcdoXMhmfwNBD8acBRQ2Ldt7CcBuWsdjr4c4E,38514
+scmrepo/git/backend/pygit2/__init__.py,sha256=lu4y4CsmCIctbQ3HwzLVcWOX4H7dFP46HDkib563Ql4,38766
 scmrepo/git/backend/pygit2/callbacks.py,sha256=Mk-2e5dfJPNLsczRiK4rTnjHd5ZyonmegdwiFwM9Anc,2849
 scmrepo/git/backend/pygit2/filter.py,sha256=lBzwjSTWQ8VY62liqPnVMUZQA0zaol1Koafg1X0sDXE,2377
 scmrepo/git/lfs/__init__.py,sha256=at5blRIKnKpg_g5dLRDsGWBFi6SbucRlF_DX6aAkGtE,257
@@ -31,8 +31,8 @@ scmrepo/git/lfs/pointer.py,sha256=BcVbtjoOUG9cEzyJSJDeweqehGZvq43P6NNLDYUGYEI,31
 scmrepo/git/lfs/progress.py,sha256=AcWvygDG0ee__Jec5BlRr58F-lAj3d4Z_j7JbW3OUcI,4733
 scmrepo/git/lfs/smudge.py,sha256=LMt9I5QodXLh8FiQbAbix3GHbeuyPXGwHuHYJ0f5ORo,1610
 scmrepo/git/lfs/storage.py,sha256=nx_HvHHC1sf15Qgbsj8jEOkdHXkZ8VUEh8QBtt9sLwI,2348
-scmrepo-3.5.1.dist-info/licenses/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
-scmrepo-3.5.1.dist-info/METADATA,sha256=jWWESkCTzFdRF6zfD6HMjaA4wGWN8hAsJ9tWoeN5cT0,4825
-scmrepo-3.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scmrepo-3.5.1.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
-scmrepo-3.5.1.dist-info/RECORD,,
+scmrepo-3.5.2.dist-info/licenses/LICENSE,sha256=-1jhbPjoIVHR0cEgahL4Zhct75Ff4MzYCR_jOaJDPq8,11340
+scmrepo-3.5.2.dist-info/METADATA,sha256=CO24sQaEyD2vE1oqdqo_AqsL4nkXywX9k6gR-xxfWQY,4825
+scmrepo-3.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scmrepo-3.5.2.dist-info/top_level.txt,sha256=iunjod6w3GogERsAYfLRupnANXnqzX3jbIfbeIQG5cc,8
+scmrepo-3.5.2.dist-info/RECORD,,