Fix inverted logic around [gitc-]init and -c

Instead of not using '-c' for '--current-branch' when using gitc, we were only using '-c' when using gitc, so we still had the conflict with the gitc option, and other users still couldn't use '-c'. Test: repo init -u https://android.googlesource.com/platform/manifest; repo init -c Test: repo gitc-init -u ... -b ... -c testing Change-Id: I71e4950a49c281418249f0783c6a2ea34f0d3e2b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253795 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Dan Willemsen <dwillemsen@google.com> (cherry picked from commit 93293ca47f)
Do not try to fetch default revision for mirrors always
2025-06-26 20:17:52 +00:00 · 2020-02-07 15:54:52 -05:00 · 2020-02-06 09:19:35 -05:00 · 2020-02-05 18:04:11 +00:00 · 2020-02-05 02:56:08 +00:00
4 changed files with 13 additions and 5 deletions
--- a/project.py
+++ b/project.py
@ -2252,7 +2252,10 @@ class Project(object):
      spec.append('tag')
      spec.append(tag_name)

-    branch = self.revisionExpr
+    if self.manifest.IsMirror and not current_branch_only:
+      branch = None
+    else:
+      branch = self.revisionExpr
    if (not self.manifest.IsMirror and is_sha1 and depth
        and git_require((1, 8, 3))):
      # Shallow checkout of a specific commit, fetch from that commit and not
--- a/2
+++ b/2
@ -16,7 +16,7 @@ import os
 REPO_URL = os.environ.get('REPO_URL', None)
 if not REPO_URL:
  REPO_URL = 'https://gerrit.googlesource.com/git-repo'
-REPO_REV = 'stable'
+REPO_REV = 'repo-1'

 # Copyright (C) 2008 Google Inc.
 #
--- a/subcmds/gitc_init.py
+++ b/subcmds/gitc_init.py
@ -50,7 +50,7 @@ use for this GITC client.
 """

  def _Options(self, p):
-    super(GitcInit, self)._Options(p)
+    super(GitcInit, self)._Options(p, gitc_init=True)
    g = p.add_option_group('GITC options')
    g.add_option('-f', '--manifest-file',
                 dest='manifest_file',
--- a/subcmds/init.py
+++ b/subcmds/init.py
@ -81,7 +81,7 @@ manifest, a subsequent `repo sync` (or `repo sync -d`) is necessary
 to update the working directory files.
 """

-  def _Options(self, p):
+  def _Options(self, p, gitc_init=False):
    # Logging
    g = p.add_option_group('Logging options')
    g.add_option('-q', '--quiet',
@ -96,7 +96,12 @@ to update the working directory files.
    g.add_option('-b', '--manifest-branch',
                 dest='manifest_branch',
                 help='manifest branch or revision', metavar='REVISION')
-    g.add_option('-c', '--current-branch',
+    cbr_opts = ['--current-branch']
+    # The gitc-init subcommand allocates -c itself, but a lot of init users
+    # want -c, so try to satisfy both as best we can.
+    if not gitc_init:
+      cbr_opts += ['-c']
+    g.add_option(*cbr_opts,
                 dest='current_branch_only', action='store_true',
                 help='fetch only current manifest branch from server')
    g.add_option('-m', '--manifest-name',
Author	SHA1	Message	Date
Dan Willemsen	619a2b5887	Fix inverted logic around [gitc-]init and -c Instead of not using '-c' for '--current-branch' when using gitc, we were only using '-c' when using gitc, so we still had the conflict with the gitc option, and other users still couldn't use '-c'. Test: repo init -u https://android.googlesource.com/platform/manifest; repo init -c Test: repo gitc-init -u ... -b ... -c testing Change-Id: I71e4950a49c281418249f0783c6a2ea34f0d3e2b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253795 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Dan Willemsen <dwillemsen@google.com> (cherry picked from commit `93293ca47f`)	2020-02-07 15:54:52 -05:00
Chirayu Desai	ab15e42fa4	Do not try to fetch default revision for mirrors always * Mirrors may contain multiple projects, some of which may not always contain the default revision. * Only fetch the default revision explicitly if '--current-branch' is set. * Fixes breakage casued by commit `6856f98467` "Fix repo mirror with --current-branch" Bug: https://crbug.com/gerrit/12274 Change-Id: Iaafabe2992f76f3644b841f24245d3e19c9515a9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253093 Reviewed-by: Kuang-che Wu <kcwu@chromium.org> Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Chirayu Desai <chirayudesai1@gmail.com> (cherry picked from commit `f7b64e3350`)	2020-02-06 09:19:35 -05:00
Mike Frysinger	75c02fe4cb	init: handle -c conflicts with gitc-init We keep getting requests for init to support -c. This conflicts with gitc-init which allocates -c for its own use. Lets make this dynamic so we keep it with "init" but omit it for "gitc-init". Bug: https://crbug.com/gerrit/10200 Change-Id: Ibf69c2bbeff638e28e63cb08926fea0c622258db (cherry picked from commit `66098f707a`) Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253392 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: Mike Frysinger <vapier@google.com>	2020-02-05 18:04:11 +00:00
Mike Frysinger	afd1b4023f	repo: point default branch to repo-1 Since this will be feature-frozen for Python 2 users, lets point the default update branch to "repo-1" rather than "stable" as the latter will follow the master development (and Python 3-only). Bug: https://crbug.com/gerrit/10418 Change-Id: Iceff0983684a580dc5c9ec1c60acfb5eda5ce2c4 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253172 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Mike Frysinger <vapier@google.com>	2020-02-05 02:56:08 +00:00