!squash more

Author: tony

vcspull/config.py

@@ -64,11 +64,11 @@ def extract_repos(config: dict, cwd=pathlib.Path.cwd()) -> list[ConfigDict]:
     -------
     list : List of normalized repository information
     """
-    configs = []
+    configs: list[ConfigDict] = []
     for directory, repos in config.items():
         for repo, repo_data in repos.items():
 
-            conf = {}
+            conf: ConfigDict = {}
 
             """
             repo_name: http://myrepo.com/repo.git
@@ -96,18 +96,26 @@ def extract_repos(config: dict, cwd=pathlib.Path.cwd()) -> list[ConfigDict]:
             if "parent_dir" not in conf:
                 conf["parent_dir"] = expand_dir(directory, cwd=cwd)
 
-            # repo_dir -> dir in libvcs 0.12.0b25
-            if "repo_dir" in conf and "dir" not in conf:
-                conf["dir"] = conf.pop("repo_dir")
-
             if "dir" not in conf:
-                conf["dir"] = expand_dir(conf["parent_dir"] / conf["name"], cwd)
+                conf["dir"] = expand_dir(
+                    pathlib.Path(conf["parent_dir"]) / conf["name"], cwd
+                )
 
             if "remotes" in conf:
                 for remote_name, url in conf["remotes"].items():
-                    conf["remotes"][remote_name] = GitRemote(
-                        name=remote_name, fetch_url=url, push_url=url
-                    )
+                    if isinstance(url, GitRemote):
+                        continue
+                    if isinstance(url, str):
+                        conf["remotes"][remote_name] = GitRemote(
+                            name=remote_name, fetch_url=url, push_url=url
+                        )
+                    elif isinstance(url, dict):
+                        assert "push_url" in url
+                        assert "fetch_url" in url
+                        conf["remotes"][remote_name] = GitRemote(
+                            name=remote_name, **url
+                        )
+
             configs.append(conf)
 
     return configs
@@ -194,7 +202,7 @@ def find_config_files(
                     configs.extend(find_config_files(path, match, f))
             else:
                 match = f"{match}.{filetype}"
-                configs = path.glob(match)
+                configs = list(path.glob(match))
 
     return configs
 
@@ -222,6 +230,7 @@ def load_configs(files: list[StrPath], cwd=pathlib.Path.cwd()):
     for file in files:
         if isinstance(file, str):
             file = pathlib.Path(file)
+        assert isinstance(file, pathlib.Path)
         ext = file.suffix.lstrip(".")
         conf = kaptan.Kaptan(handler=ext).import_config(str(file))
         newrepos = extract_repos(conf.export("dict"), cwd=cwd)