tsrc sync -r support

THANKS

@@ -10,6 +10,7 @@ Jakob Heuser
 Tronje Krabbe
 Matthew Lovell
 Atte Pellikka
+Albert De La Fuente Vigliotti
 
 
 If you make a contribution, feel free to make a pull request to add your name

docs/guide/groups.md

@@ -39,16 +39,16 @@ tsrc init [email protected]:acme/manifest --group g1
 
 ## Filtering repositories in groups with regular expressions
 
-You can utilize inclusive regular expression with the `-r`-flag and
-exclusive regular expression with the `-i`-flag. This allows you to filter
+You can utilize inclusive regular expression with the `-i`-flag and
+exclusive regular expression with the `-e`-flag. This allows you to filter
 repositories within a group or a set of groups for the given action.
 
 
 To include all repositories in the group g1 matching "config" and excluding "template",
 you can do the following:
 
 ```
-tsrc init [email protected]:acme/manifest --group g1 -r config -i template
+tsrc init [email protected]:acme/manifest --group g1 -i config -e template
 ```
 
 

docs/guide/remotes.md

@@ -28,7 +28,7 @@ In that case, you can use an alternative syntax:
 repos:
   # foo is open source and thus needs two remotes:
   - dest: foo
-  - remotes:
+    remotes:
     - name: origin
       url: [email protected]/your-team/foo
     - name: github
@@ -57,14 +57,14 @@ In that case, you can create a manifest looking like this:
 ```yaml
 repos:
   - dest: foo
-  - remotes:
+    remotes:
     - name: origin
       url: [email protected]/your-team/foo
     - name: vpn
       url: [email protected]/gitlab/your-team/foo
 
   - dest: bar
-  - remotes:
+    remotes:
     - name: origin
       url: [email protected]/your-team/bar
     - name: vpn

docs/ref/cli.md

@@ -58,8 +58,8 @@ tsrc init MANIFEST_URL [--group GROUP1, GROUP2] [--singular-remote SINGULAR_REMO
     The `-g,--groups`  option can be used to specify a list of groups
     to use when cloning repositories.
 
-    The `-r` "inclusive regular expression" and `-i` "exclusive regular expression" options
-    can be combined with the group option to filter for repositories within a group. `-r` takes
+    The `-i` "inclusive regular expression" and `-e` "exclusive regular expression" options
+    can be combined with the group option to filter for repositories within a group. `-i` takes
     precedence if both options are present.
 
     The `-s,--shallow` option can be used to make shallow clone of all repositories.

docs/ref/manifest-config.md

@@ -11,7 +11,7 @@ repos:
     dest: foo
     branch: next
 
-  - remotes:
+    remotes:
       - name: origin
         url: [email protected]:proj1/bar
       - name: upstream

docs/ref/workspace-config.md

@@ -22,4 +22,8 @@ singular_remote:
 * `shallow_clones`: whether to use only shallow clones when cloning missing repositories
 * `repo_groups`: the list of groups to use - every mentioned group must be present in the `manifest.yml` file (see above)
 * `clone_all_repos`: whether to ignore groups entirely and clone every repository from the manifest instead
-* `singular_remote`: if set to `<remote-name>`, behaves as if `tsrc sync` and `tsrc init` were called with `--singular-remote <remote-name>` option. See the [Using remotes guide](../guide/remotes.md) for details.
+* `singular_remote`: if set to `<remote-name>`, behaves as if `tsrc sync` and
+  `tsrc init` were called with `--singular-remote <remote-name>` option. See the
+  [Using remotes guide](../guide/remotes.md) for details. If `tsrc sync -r
+  <remote-name>` is used, it will take precedence over the file configuration
+  parameter.

tsrc/cli/__init__.py

@@ -75,12 +75,12 @@ def add_repos_selection_args(parser: argparse.ArgumentParser) -> None:
         help="run on all cloned repos",
     )
     parser.add_argument(
-        "-r",
+        "-i",
         dest="regex",
         help="Include only repositories matching the regex",
     )
     parser.add_argument(
-        "-i", dest="iregex", help="Exclude repositories matching the regex"
+        "-e", dest="iregex", help="Exclude repositories matching the regex"
     )
 
 
@@ -116,6 +116,7 @@ def get_workspace_with_repos(namespace: argparse.Namespace) -> Workspace:
 def resolve_repos(
     workspace: Workspace,
     *,
+    singular_remote: str = "",
     groups: Optional[List[str]],
     all_cloned: bool,
     regex: str = "",
@@ -138,6 +139,18 @@ def resolve_repos(
     else:
         repos = repos_from_config(manifest, workspace.config)
 
+    if singular_remote:
+        filtered_repos = []
+        for repo in repos:
+            remotes = [
+                remote
+                for remote in repo.remotes
+                if re.search(singular_remote, remote.name)
+            ]
+            if remotes:
+                filtered_repos.append(repo)
+        repos = filtered_repos
+
     if regex:
         repos = [repo for repo in repos if re.search(regex, repo.dest)]
 

tsrc/cli/sync.py

@@ -28,6 +28,11 @@ def configure_parser(subparser: argparse._SubParsersAction) -> None:
         dest="update_manifest",
         help="skip updating the manifest before syncing repositories",
     )
+    parser.add_argument(
+        "-r",
+        "--singular-remote",
+        help="only use this remote when cloning repositories",
+    )
     add_num_jobs_arg(parser)
     parser.set_defaults(run=run)
 
@@ -37,6 +42,7 @@ def run(args: argparse.Namespace) -> None:
     update_manifest = args.update_manifest
     groups = args.groups
     all_cloned = args.all_cloned
+    singular_remote = args.singular_remote
     regex = args.regex
     iregex = args.iregex
     workspace = get_workspace(args)
@@ -49,11 +55,16 @@ def run(args: argparse.Namespace) -> None:
         ui.info_2("Not updating manifest")
 
     workspace.repos = resolve_repos(
-        workspace, groups=groups, all_cloned=all_cloned, regex=regex, iregex=iregex
+        workspace,
+        singular_remote=singular_remote,
+        groups=groups,
+        all_cloned=all_cloned,
+        regex=regex,
+        iregex=iregex,
     )
 
     workspace.clone_missing(num_jobs=num_jobs)
     workspace.set_remotes(num_jobs=num_jobs)
-    workspace.sync(force=force, num_jobs=num_jobs)
+    workspace.sync(force=force, singular_remote=singular_remote, num_jobs=num_jobs)
     workspace.perform_filesystem_operations()
     ui.info_1("Workspace synchronized")

tsrc/workspace.py

@@ -124,10 +124,15 @@ def perform_filesystem_operations(
                 collection.print_errors()
                 raise FileSystemOperatorError
 
-    def sync(self, *, force: bool = False, num_jobs: int = 1) -> None:
-        syncer = Syncer(
-            self.root_path, force=force, remote_name=self.config.singular_remote
-        )
+    def sync(
+        self, *, singular_remote: str = "", force: bool = False, num_jobs: int = 1
+    ) -> None:
+        remote_name = ""
+        if singular_remote:
+            remote_name = singular_remote
+        elif self.config.singular_remote:
+            remote_name = self.config.singular_remote
+        syncer = Syncer(self.root_path, force=force, remote_name=remote_name)
         repos = self.repos
         ui.info_2("Synchronizing repos")
         collection = process_items(repos, syncer, num_jobs=num_jobs)