vcs-python
diff --git a/‎src/libvcs/cmd/git.py
Copy file name to clipboardExpand all lines: src/libvcs/cmd/git.py
+88-11Lines changed: 88 additions & 11 deletions b/‎src/libvcs/cmd/git.py
Copy file name to clipboardExpand all lines: src/libvcs/cmd/git.py
+88-11Lines changed: 88 additions & 11 deletions
@@ -4,6 +4,7 @@
 
 import datetime
 import pathlib
+import re
 import shlex
 import typing as t
 from collections.abc import Sequence
@@ -2361,12 +2362,16 @@ class GitRemoteCmd:
     """Run commands directly for a git remote on a git repository."""
 
     remote_name: str
+    fetch_url: str | None
+    push_url: str | None
 
     def __init__(
         self,
         *,
         path: StrPath,
         remote_name: str,
+        fetch_url: str | None = None,
+        push_url: str | None = None,
         cmd: Git | None = None,
     ) -> None:
         r"""Lite, typed, pythonic wrapper for git-remote(1).
@@ -2408,6 +2413,8 @@ def __init__(
         self.cmd = cmd if isinstance(cmd, Git) else Git(path=self.path)
 
         self.remote_name = remote_name
+        self.fetch_url = fetch_url
+        self.push_url = push_url
 
     def __repr__(self) -> str:
         """Representation of a git remote for a git repository."""
@@ -2731,6 +2738,24 @@ def set_url(
         )
 
 
+GitRemoteManagerLiteral = Literal[
+    "--verbose",
+    "add",
+    "rename",
+    "remove",
+    "set-branches",
+    "set-head",
+    "set-branch",
+    "get-url",
+    "set-url",
+    "set-url --add",
+    "set-url --delete",
+    "prune",
+    "show",
+    "update",
+]
+
+
 class GitRemoteManager:
     """Run commands directly related to git remotes of a git repo."""
 
@@ -2777,7 +2802,7 @@ def __repr__(self) -> str:
 
     def run(
         self,
-        command: GitRemoteCommandLiteral | None = None,
+        command: GitRemoteManagerLiteral | None = None,
         local_flags: list[str] | None = None,
         *,
         # Pass-through to run()
@@ -2860,6 +2885,16 @@ def show(
         --------
         >>> GitRemoteManager(path=example_git_repo.path).show()
         'origin'
+
+        For the example below, add a remote:
+        >>> GitRemoteManager(path=example_git_repo.path).add(
+        ...     name='my_remote', url=f'file:///dev/null'
+        ... )
+        ''
+
+        Retrieve a list of remote names:
+        >>> GitRemoteManager(path=example_git_repo.path).show().splitlines()
+        ['my_remote', 'origin']
         """
         local_flags: list[str] = []
         required_flags: list[str] = []
@@ -2880,17 +2915,17 @@ def show(
             log_in_real_time=log_in_real_time,
         )
 
-    def _ls(self) -> list[str]:
-        """List remotes.
+    def _ls(self) -> str:
+        r"""List remotes (raw output).
 
         Examples
         --------
         >>> GitRemoteManager(path=example_git_repo.path)._ls()
-        ['origin']
+        'origin\tfile:///... (fetch)\norigin\tfile:///... (push)'
         """
         return self.run(
-            "show",
-        ).splitlines()
+            "--verbose",
+        )
 
     def ls(self) -> QueryList[GitRemoteCmd]:
         """List remotes.
@@ -2899,14 +2934,56 @@ def ls(self) -> QueryList[GitRemoteCmd]:
         --------
         >>> GitRemoteManager(path=example_git_repo.path).ls()
         [<GitRemoteCmd path=... remote_name=origin>]
+
+        For the example below, add a remote:
+        >>> GitRemoteManager(path=example_git_repo.path).add(
+        ...     name='my_remote', url=f'file:///dev/null'
+        ... )
+        ''
+
+        >>> GitRemoteManager(path=example_git_repo.path).ls()
+        [<GitRemoteCmd path=... remote_name=my_remote>,
+         <GitRemoteCmd path=... remote_name=origin>]
         """
-        return QueryList(
-            [
-                GitRemoteCmd(path=self.path, remote_name=remote_name.lstrip("* "))
-                for remote_name in self._ls()
-            ],
+        remote_str = self._ls()
+        remote_pattern = re.compile(
+            r"""
+            (?P<name>\S+)           # Remote name: one or more non-whitespace characters
+            \s+                     # One or more whitespace characters
+            (?P<url>\S+)            # URL: one or more non-whitespace characters
+            \s+                     # One or more whitespace characters
+            \((?P<cmd_type>fetch|push)\)  # 'fetch' or 'push' in parentheses
+        """,
+            re.VERBOSE | re.MULTILINE,
         )
 
+        remotes: dict[str, dict[str, str | None]] = {}
+
+        for match_obj in remote_pattern.finditer(remote_str):
+            name = match_obj.group("name")
+            url = match_obj.group("url")
+            cmd_type = match_obj.group("cmd_type")
+
+            if name not in remotes:
+                remotes[name] = {}
+
+            remotes[name][cmd_type] = url
+
+        remote_cmds: list[GitRemoteCmd] = []
+        for name, urls in remotes.items():
+            fetch_url = urls.get("fetch")
+            push_url = urls.get("push")
+            remote_cmds.append(
+                GitRemoteCmd(
+                    path=self.path,
+                    remote_name=name,
+                    fetch_url=fetch_url,
+                    push_url=push_url,
+                )
+            )
+
+        return QueryList(remote_cmds)
+
     def get(self, *args: t.Any, **kwargs: t.Any) -> GitRemoteCmd | None:
         """Get remote via filter lookup.