commit 6bd89aa6579cb5a108554c392d7d87a6ce978aa8
author Raman Tenneti <rtenneti@google.com> Tue Nov 16 11:48:09 2021 -0800
committer Raman Tenneti <rtenneti@google.com> Thu Nov 18 01:27:41 2021 +0000
tree a82f37473cc0a7070b0b77f902c029fe8b3081b2
parent 9c1fc5bc5d1e78f7794ae0ddfa379b448fcb4b1f

superproject: Inherit --no-use-superproject with --mirror option.

init.py
+ Similar to opt.archive, gave an error if --mirror option is
  used with --use-superproject.

sync.py
+ Defaulted to --no-use-superproject if manifest is a mirror or
  archive (similar to error at line# 1067).

Tested:
+ run_tests
+ flake8 (will fix known errors in another CL).

$ repo_dev init -u sso://googleplex-android.git.corp.google.com/platform/manifest --use-superproject --mirror
Usage: repo init [options] [manifest url]

main.py: error: --mirror and --use-superproject cannot be used together.

+ repo init and repo sync with --mirror and without --mirror
  options.
  $ repo_dev init -u https://android.googlesource.com/platform/manifest
  $ repo_dev sync
    ...superproject.git: Initial setup for superproject completed.

+ With --mirror option, verfied there are no exceptions in git_superproject.py

Bug: [google internal] b/206537893
Change-Id: I059f20e76f0ab36f0587f29779bb53ede4663bd4
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/323955
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Raman Tenneti <rtenneti@google.com>

subcmds/init.py

diff --git a/subcmds/init.py b/subcmds/init.py
index a3f3241..1fbe465 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -478,8 +478,13 @@
 
     # Check this here, else manifest will be tagged "not new" and init won't be
     # possible anymore without removing the .repo/manifests directory.
-    if opt.archive and opt.mirror:
-      self.OptionParser.error('--mirror and --archive cannot be used together.')
+    if opt.mirror:
+      if opt.archive:
+        self.OptionParser.error('--mirror and --archive cannot be used '
+                                'together.')
+      if opt.use_superproject is not None:
+        self.OptionParser.error('--mirror and --use-superproject cannot be '
+                                'used together.')
 
     if opt.standalone_manifest and (
         opt.manifest_branch or opt.manifest_name != 'default.xml'):

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index 1d778e1..ee7e4a8 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -986,6 +986,10 @@
 
     load_local_manifests = not self.manifest.HasLocalManifests
     use_superproject = git_superproject.UseSuperproject(opt, self.manifest)
+    if self.manifest.IsMirror or self.manifest.IsArchive:
+      # Don't use superproject, because we have no working tree.
+      use_superproject = False
+      print('Defaulting to no-use-superproject because there is no working tree.')
     superproject_logging_data = {
         'superproject': use_superproject,
         'haslocalmanifests': bool(self.manifest.HasLocalManifests),