docs: add deprecated branch banner

The master branch is dead.  Add banners to all the docs in case people
try referring to these and don't realize they're on the wrong branch.

Change-Id: I3488d0d96df25fafd7285848fe9f519b4205519c
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/400918
Tested-by: Mike Frysinger <vapier@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>

.github/workflows/test-ci.yml

@@ -5,7 +5,7 @@ name: Test CI
 
 on:
   push:
-    branches: [main, repo-1, stable, maint]
+    branches: [master, repo-1, stable, maint]
     tags: [v*]
 
 jobs:
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8]
     runs-on: ${{ matrix.os }}
 
     steps:

.gitignore

@@ -7,7 +7,6 @@ __pycache__
 .repopickle_*
 /repoc
 /.tox
-/.venv
 
 # PyCharm related
 /.idea/

.gitreview

@@ -1,5 +0,0 @@
-[gerrit]
-host=gerrit-review.googlesource.com
-scheme=https
-project=git-repo.git
-defaultbranch=main

README.md

@@ -1,5 +1,8 @@
 # repo
 
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/README.md
+
 Repo is a tool built on top of Git.  Repo helps manage many Git repositories,
 does the uploads to revision control systems, and automates parts of the
 development workflow.  Repo is not meant to replace Git, only to make it

SUBMITTING_PATCHES.md

@@ -1,16 +1,19 @@
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/SUBMITTING_PATCHES.md
+
 [TOC]
 
 # Short Version
 
  - Make small logical changes.
- - [Provide a meaningful commit message][commit-message-style].
+ - Provide a meaningful commit message.
  - Check for coding errors and style nits with flake8.
  - Make sure all code is under the Apache License, 2.0.
  - Publish your changes for review.
  - Make corrections if requested.
  - Verify your changes on gerrit so they can be submitted.
 
-   `git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/main`
+   `git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/master`
 
 
 # Long Version
@@ -26,11 +29,10 @@ yourself with the following relevant bits.
 
 ## Make separate commits for logically separate changes.
 
-Unless your patch is really trivial, you should not be sending out a patch that
-was generated between your working tree and your commit head.
-Instead, always make a commit with a complete
-[commit message][commit-message-style] and generate a series of patches from
-your repository.
+Unless your patch is really trivial, you should not be sending
+out a patch that was generated between your working tree and your
+commit head.  Instead, always make a commit with complete commit
+message and generate a series of patches from your repository.
 It is a good discipline.
 
 Describe the technical detail of the change(s).
@@ -151,7 +153,7 @@ Push your patches over HTTPS to the review server, possibly through
 a remembered remote to make this easier in the future:
 
     git config remote.review.url https://gerrit-review.googlesource.com/git-repo
-    git config remote.review.push HEAD:refs/for/main
+    git config remote.review.push HEAD:refs/for/master
 
     git push review
 
@@ -172,6 +174,3 @@ After you receive a Code-Review+2 from the maintainer, select the Verified
 button on the gerrit page for the change. This verifies that you have tested
 your changes and notifies the maintainer that they are ready to be submitted.
 The maintainer will then submit your changes to the repository.
-
-
-[commit-message-style]: https://chris.beams.io/posts/git-commit/

color.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

command.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,65 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import multiprocessing
 import os
 import optparse
+import platform
 import re
 import sys
 
 from event_log import EventLog
 from error import NoSuchProjectError
 from error import InvalidProjectGroupsError
-import progress
-
-
-# Are we generating man-pages?
-GENERATE_MANPAGES = os.environ.get('_REPO_GENERATE_MANPAGES_') == ' indeed! '
-
-
-# Number of projects to submit to a single worker process at a time.
-# This number represents a tradeoff between the overhead of IPC and finer
-# grained opportunity for parallelism. This particular value was chosen by
-# iterating through powers of two until the overall performance no longer
-# improved. The performance of this batch size is not a function of the
-# number of cores on the system.
-WORKER_BATCH_SIZE = 32
-
-
-# How many jobs to run in parallel by default?  This assumes the jobs are
-# largely I/O bound and do not hit the network.
-DEFAULT_LOCAL_JOBS = min(os.cpu_count(), 8)
 
 
 class Command(object):
   """Base class for any command line action in repo.
   """
 
-  # Singleton for all commands to track overall repo command execution and
-  # provide event summary to callers.  Only used by sync subcommand currently.
-  #
-  # NB: This is being replaced by git trace2 events.  See git_trace2_event_log.
+  common = False
   event_log = EventLog()
-
-  # Whether this command is a "common" one, i.e. whether the user would commonly
-  # use it or it's a more uncommon command.  This is used by the help command to
-  # show short-vs-full summaries.
-  COMMON = False
-
-  # Whether this command supports running in parallel.  If greater than 0,
-  # it is the number of parallel jobs to default to.
-  PARALLEL_JOBS = None
-
-  def __init__(self, repodir=None, client=None, manifest=None, gitc_manifest=None,
-               git_event_log=None):
-    self.repodir = repodir
-    self.client = client
-    self.manifest = manifest
-    self.gitc_manifest = gitc_manifest
-    self.git_event_log = git_event_log
-
-    # Cache for the OptionParser property.
-    self._optparse = None
+  manifest = None
+  _optparse = None
 
   def WantPager(self, _opt):
     return False
@@ -106,37 +68,12 @@ class Command(object):
         usage = 'repo %s' % self.NAME
       epilog = 'Run `repo help %s` to view the detailed manual.' % self.NAME
       self._optparse = optparse.OptionParser(usage=usage, epilog=epilog)
-      self._CommonOptions(self._optparse)
       self._Options(self._optparse)
     return self._optparse
 
-  def _CommonOptions(self, p, opt_v=True):
-    """Initialize the option parser with common options.
-
-    These will show up for *all* subcommands, so use sparingly.
-    NB: Keep in sync with repo:InitParser().
-    """
-    g = p.add_option_group('Logging options')
-    opts = ['-v'] if opt_v else []
-    g.add_option(*opts, '--verbose',
-                 dest='output_mode', action='store_true',
-                 help='show all output')
-    g.add_option('-q', '--quiet',
-                 dest='output_mode', action='store_false',
-                 help='only show errors')
-
-    if self.PARALLEL_JOBS is not None:
-      default = 'based on number of CPU cores'
-      if not GENERATE_MANPAGES:
-        # Only include active cpu count if we aren't generating man pages.
-        default = f'%default; {default}'
-      p.add_option(
-          '-j', '--jobs',
-          type=int, default=self.PARALLEL_JOBS,
-          help=f'number of jobs to run in parallel (default: {default})')
-
   def _Options(self, p):
-    """Initialize the option parser with subcommand-specific options."""
+    """Initialize the option parser.
+    """
 
   def _RegisteredEnvironmentOptions(self):
     """Get options that can be set from environment variables.
@@ -162,11 +99,6 @@ class Command(object):
     self.OptionParser.print_usage()
     sys.exit(1)
 
-  def CommonValidateOptions(self, opt, args):
-    """Validate common options."""
-    opt.quiet = opt.output_mode is False
-    opt.verbose = opt.output_mode is True
-
   def ValidateOptions(self, opt, args):
     """Validate the user options & arguments before executing.
 
@@ -182,44 +114,6 @@ class Command(object):
     """
     raise NotImplementedError
 
-  @staticmethod
-  def ExecuteInParallel(jobs, func, inputs, callback, output=None, ordered=False):
-    """Helper for managing parallel execution boiler plate.
-
-    For subcommands that can easily split their work up.
-
-    Args:
-      jobs: How many parallel processes to use.
-      func: The function to apply to each of the |inputs|.  Usually a
-          functools.partial for wrapping additional arguments.  It will be run
-          in a separate process, so it must be pickalable, so nested functions
-          won't work.  Methods on the subcommand Command class should work.
-      inputs: The list of items to process.  Must be a list.
-      callback: The function to pass the results to for processing.  It will be
-          executed in the main thread and process the results of |func| as they
-          become available.  Thus it may be a local nested function.  Its return
-          value is passed back directly.  It takes three arguments:
-          - The processing pool (or None with one job).
-          - The |output| argument.
-          - An iterator for the results.
-      output: An output manager.  May be progress.Progess or color.Coloring.
-      ordered: Whether the jobs should be processed in order.
-
-    Returns:
-      The |callback| function's results are returned.
-    """
-    try:
-      # NB: Multiprocessing is heavy, so don't spin it up for one job.
-      if len(inputs) == 1 or jobs == 1:
-        return callback(None, output, (func(x) for x in inputs))
-      else:
-        with multiprocessing.Pool(jobs) as pool:
-          submit = pool.imap if ordered else pool.imap_unordered
-          return callback(pool, output, submit(func, inputs, chunksize=WORKER_BATCH_SIZE))
-    finally:
-      if isinstance(output, progress.Progress):
-        output.end()
-
   def _ResetPathToProjectMap(self, projects):
     self._by_path = dict((p.worktree, p) for p in projects)
 
@@ -263,7 +157,9 @@ class Command(object):
     mp = manifest.manifestProject
 
     if not groups:
-      groups = manifest.GetGroupsStr()
+      groups = mp.config.GetString('manifest.groups')
+    if not groups:
+      groups = 'default,platform-' + platform.system().lower()
     groups = [x for x in re.split(r'[,\s]+', groups) if x]
 
     if not args:

completion.bash

@@ -1,156 +0,0 @@
-# Copyright 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Programmable bash completion.  https://github.com/scop/bash-completion
-
-# TODO: Handle interspersed options.  We handle `repo h<tab>`, but not
-# `repo --time h<tab>`.
-
-# Complete the list of repo subcommands.
-__complete_repo_list_commands() {
-  local repo=${COMP_WORDS[0]}
-  (
-  # Handle completions if running outside of a checkout.
-  if ! "${repo}" help --all 2>/dev/null; then
-    repo help 2>/dev/null
-  fi
-  ) | sed -n '/^  /{s/  \([^ ]\+\) .\+/\1/;p}'
-}
-
-# Complete list of all branches available in all projects in the repo client
-# checkout.
-__complete_repo_list_branches() {
-  local repo=${COMP_WORDS[0]}
-  "${repo}" branches 2>/dev/null | \
-    sed -n '/|/{s/[ *][Pp ] *\([^ ]\+\) .*/\1/;p}'
-}
-
-# Complete list of all projects available in the repo client checkout.
-__complete_repo_list_projects() {
-  local repo=${COMP_WORDS[0]}
-  "${repo}" list -n 2>/dev/null
-  "${repo}" list -p --relative-to=. 2>/dev/null
-}
-
-# Complete the repo <command> argument.
-__complete_repo_command() {
-  if [[ ${COMP_CWORD} -ne 1 ]]; then
-    return 1
-  fi
-
-  local command=${COMP_WORDS[1]}
-  COMPREPLY=($(compgen -W "$(__complete_repo_list_commands)" -- "${command}"))
-  return 0
-}
-
-# Complete repo subcommands that take <branch> <projects>.
-__complete_repo_command_branch_projects() {
-  local current=$1
-  if [[ ${COMP_CWORD} -eq 2 ]]; then
-    COMPREPLY=($(compgen -W "$(__complete_repo_list_branches)" -- "${current}"))
-  else
-    COMPREPLY=($(compgen -W "$(__complete_repo_list_projects)" -- "${current}"))
-  fi
-}
-
-# Complete repo subcommands that take only <projects>.
-__complete_repo_command_projects() {
-  local current=$1
-  COMPREPLY=($(compgen -W "$(__complete_repo_list_projects)" -- "${current}"))
-}
-
-# Complete `repo help`.
-__complete_repo_command_help() {
-  local current=$1
-  # CWORD=1 is "start".
-  # CWORD=2 is the <subcommand> which we complete here.
-  if [[ ${COMP_CWORD} -eq 2 ]]; then
-    COMPREPLY=(
-      $(compgen -W "$(__complete_repo_list_commands)" -- "${current}")
-    )
-  fi
-}
-
-# Complete `repo forall`.
-__complete_repo_command_forall() {
-  local current=$1
-  # CWORD=1 is "forall".
-  # CWORD=2+ are <projects> *until* we hit the -c option.
-  local i
-  for (( i = 0; i < COMP_CWORD; ++i )); do
-    if [[ "${COMP_WORDS[i]}" == "-c" ]]; then
-      return 0
-    fi
-  done
-
-  COMPREPLY=(
-    $(compgen -W "$(__complete_repo_list_projects)" -- "${current}")
-  )
-}
-
-# Complete `repo start`.
-__complete_repo_command_start() {
-  local current=$1
-  # CWORD=1 is "start".
-  # CWORD=2 is the <branch> which we don't complete.
-  # CWORD=3+ are <projects> which we complete here.
-  if [[ ${COMP_CWORD} -gt 2 ]]; then
-    COMPREPLY=(
-      $(compgen -W "$(__complete_repo_list_projects)" -- "${current}")
-    )
-  fi
-}
-
-# Complete the repo subcommand arguments.
-__complete_repo_arg() {
-  if [[ ${COMP_CWORD} -le 1 ]]; then
-    return 1
-  fi
-
-  local command=${COMP_WORDS[1]}
-  local current=${COMP_WORDS[COMP_CWORD]}
-  case ${command} in
-  abandon|checkout)
-    __complete_repo_command_branch_projects "${current}"
-    return 0
-    ;;
-
-  branch|branches|diff|info|list|overview|prune|rebase|smartsync|stage|status|\
-  sync|upload)
-    __complete_repo_command_projects "${current}"
-    return 0
-    ;;
-
-  help|start|forall)
-    __complete_repo_command_${command} "${current}"
-    return 0
-    ;;
-
-  *)
-    return 1
-    ;;
-  esac
-}
-
-# Complete the repo arguments.
-__complete_repo() {
-  COMPREPLY=()
-  __complete_repo_command && return 0
-  __complete_repo_arg && return 0
-  return 0
-}
-
-# Fallback to the default complete methods if we aren't able to provide anything
-# useful.  This will allow e.g. local paths to be used when it makes sense.
-complete -F __complete_repo -o bashdefault -o default repo

docs/internal-fs-layout.md

@@ -1,5 +1,8 @@
 # Repo internal filesystem layout
 
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/docs/internal-fs-layout.md
+
 A reference to the `.repo/` tree in repo client checkouts.
 Hopefully it's complete & up-to-date, but who knows!
 
@@ -93,25 +96,6 @@ support, see the [manifest-format.md] file.
 
 ### Project objects
 
-*** note
-**Warning**: Please do not use repo's approach to projects/ & project-objects/
-layouts as a model for other tools to implement similar approaches.
-It has a number of known downsides like:
-*   [Symlinks do not work well under Windows](./windows.md).
-*   Git sometimes replaces symlinks under .git/ with real files (under unknown
-    circumstances), and then the internal state gets out of sync, and data loss
-    may ensue.
-*   When sharing project-objects between multiple project checkouts, Git might
-    automatically run `gc` or `prune` which may lead to data loss or corruption
-    (since those operate on leaf projects and miss refs in other leaves).  See
-    https://gerrit-review.googlesource.com/c/git-repo/+/254392 for more details.
-
-Instead, you should use standard Git workflows like [git worktree] or
-[gitsubmodules] with [superprojects].
-***
-
-*   `copy-link-files.json`: Tracking file used by `repo sync` to determine when
-    copyfile or linkfile are added or removed and need corresponding updates.
 *   `project.list`: Tracking file used by `repo sync` to determine when projects
     are added or removed and need corresponding updates in the checkout.
 *   `projects/`: Bare checkouts of every project synced by the manifest.  The
@@ -125,7 +109,7 @@ Instead, you should use standard Git workflows like [git worktree] or
     setting in the manifest (i.e. the path on the remote server) with a `.git`
     suffix.  This allows for multiple checkouts of the same remote git repo to
     share their objects.  For example, you could have different branches of
-    `foo/bar.git` checked out to `foo/bar-main`, `foo/bar-release`, etc...
+    `foo/bar.git` checked out to `foo/bar-master`, `foo/bar-release`, etc...
     There will be multiple trees under `projects/` for each one, but only one
     under `project-objects/`.
 
@@ -140,42 +124,32 @@ Instead, you should use standard Git workflows like [git worktree] or
     (i.e. the path on the remote server) with a `.git` suffix.  This has the
     same advantages as the `project-objects/` layout above.
 
-    This is used when [git worktree]'s are enabled.
+    This is used when git worktrees are enabled.
 
 ### Global settings
 
 The `.repo/manifests.git/config` file is used to track settings for the entire
 repo client checkout.
-
 Most settings use the `[repo]` section to avoid conflicts with git.
-
-Everything under `[repo.syncstate.*]` is used to keep track of sync details for logging
-purposes.
-
 User controlled settings are initialized when running `repo init`.
 
-| Setting                  | `repo init` Option        | Use/Meaning |
-|-------------------       |---------------------------|-------------|
-| manifest.groups          | `--groups` & `--platform` | The manifest groups to sync |
-| manifest.standalone      | `--standalone-manifest`   | Download manifest as static file instead of creating checkout |
-| repo.archive             | `--archive`               | Use `git archive` for checkouts |
-| repo.clonebundle         | `--clone-bundle`          | Whether the initial sync used clone.bundle explicitly |
-| repo.clonefilter         | `--clone-filter`          | Filter setting when using [partial git clones] |
-| repo.depth               | `--depth`                 | Create shallow checkouts when cloning |
-| repo.dissociate          | `--dissociate`            | Dissociate from any reference/mirrors after initial clone |
-| repo.git-lfs             | `--git-lfs`               | Enable [Git LFS] support |
-| repo.mirror              | `--mirror`                | Checkout is a repo mirror |
-| repo.partialclone        | `--partial-clone`         | Create [partial git clones] |
-| repo.partialcloneexclude | `--partial-clone-exclude` | Comma-delimited list of project names (not paths) to exclude while using [partial git clones] |
-| repo.reference           | `--reference`             | Reference repo client checkout |
-| repo.submodules          | `--submodules`            | Sync git submodules |
-| repo.superproject        | `--use-superproject`      | Sync [superproject] |
-| repo.worktree            | `--worktree`              | Use [git worktree] for checkouts |
-| user.email               | `--config-name`           | User's e-mail address; Copied into `.git/config` when checking out a new project |
-| user.name                | `--config-name`           | User's name; Copied into `.git/config` when checking out a new project |
+| Setting           | `repo init` Option        | Use/Meaning |
+|-------------------|---------------------------|-------------|
+| manifest.groups   | `--groups` & `--platform` | The manifest groups to sync |
+| repo.archive      | `--archive`               | Use `git archive` for checkouts |
+| repo.clonebundle  | `--clone-bundle`          | Whether the initial sync used clone.bundle explicitly |
+| repo.clonefilter  | `--clone-filter`          | Filter setting when using [partial git clones] |
+| repo.depth        | `--depth`                 | Create shallow checkouts when cloning |
+| repo.dissociate   | `--dissociate`            | Dissociate from any reference/mirrors after initial clone |
+| repo.mirror       | `--mirror`                | Checkout is a repo mirror |
+| repo.partialclone | `--partial-clone`         | Create [partial git clones] |
+| repo.reference    | `--reference`             | Reference repo client checkout |
+| repo.submodules   | `--submodules`            | Sync git submodules |
+| repo.worktree     | `--worktree`              | Use `git worktree` for checkouts |
+| user.email        | `--config-name`           | User's e-mail address; Copied into `.git/config` when checking out a new project |
+| user.name         | `--config-name`           | User's name; Copied into `.git/config` when checking out a new project |
 
 [partial git clones]: https://git-scm.com/docs/gitrepository-layout#_code_partialclone_code
-[superproject]: https://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects
 
 ### Repo hooks settings
 
@@ -255,11 +229,7 @@ Repo will create & maintain a few files in the user's home directory.
 
 
 [git-config]: https://git-scm.com/docs/git-config
-[Git LFS]: https://git-lfs.github.com/
-[git worktree]: https://git-scm.com/docs/git-worktree
-[gitsubmodules]: https://git-scm.com/docs/gitsubmodules
 [manifest-format.md]: ./manifest-format.md
 [local manifests]: ./manifest-format.md#Local-Manifests
-[superprojects]: https://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects
 [topic]: https://gerrit-review.googlesource.com/Documentation/intro-user.html#topics
 [upload-notify]: https://gerrit-review.googlesource.com/Documentation/user-upload.html#notify

docs/manifest-format.md

@@ -1,5 +1,8 @@
 # repo Manifest Format
 
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
+
 A repo manifest describes the structure of a repo client; that is
 the directories that are visible and where they should be obtained
 from with git.
@@ -21,7 +24,6 @@ following DTD:
 
 ```xml
 <!DOCTYPE manifest [
-
   <!ELEMENT manifest (notice?,
                       remote*,
                       default?,
@@ -30,13 +32,11 @@ following DTD:
                       project*,
                       extend-project*,
                       repo-hooks?,
-                      superproject?,
-                      contactinfo?,
                       include*)>
 
   <!ELEMENT notice (#PCDATA)>
 
-  <!ELEMENT remote (annotation*)>
+  <!ELEMENT remote EMPTY>
   <!ATTLIST remote name         ID    #REQUIRED>
   <!ATTLIST remote alias        CDATA #IMPLIED>
   <!ATTLIST remote fetch        CDATA #REQUIRED>
@@ -90,39 +90,22 @@ following DTD:
   <!ELEMENT extend-project EMPTY>
   <!ATTLIST extend-project name CDATA #REQUIRED>
   <!ATTLIST extend-project path CDATA #IMPLIED>
-  <!ATTLIST extend-project dest-path CDATA #IMPLIED>
   <!ATTLIST extend-project groups CDATA #IMPLIED>
   <!ATTLIST extend-project revision CDATA #IMPLIED>
   <!ATTLIST extend-project remote CDATA #IMPLIED>
 
   <!ELEMENT remove-project EMPTY>
   <!ATTLIST remove-project name  CDATA #REQUIRED>
-  <!ATTLIST remove-project optional  CDATA #IMPLIED>
 
   <!ELEMENT repo-hooks EMPTY>
   <!ATTLIST repo-hooks in-project CDATA #REQUIRED>
   <!ATTLIST repo-hooks enabled-list CDATA #REQUIRED>
 
-  <!ELEMENT superproject EMPTY>
-  <!ATTLIST superproject name     CDATA #REQUIRED>
-  <!ATTLIST superproject remote   IDREF #IMPLIED>
-  <!ATTLIST superproject revision CDATA #IMPLIED>
-
-  <!ELEMENT contactinfo EMPTY>
-  <!ATTLIST contactinfo bugurl  CDATA #REQUIRED>
-
   <!ELEMENT include EMPTY>
-  <!ATTLIST include name   CDATA #REQUIRED>
-  <!ATTLIST include groups CDATA #IMPLIED>
+  <!ATTLIST include name CDATA #REQUIRED>
 ]>
 ```
 
-For compatibility purposes across repo releases, all unknown elements are
-silently ignored.  However, repo reserves all possible names for itself for
-future use.  If you want to use custom elements, the `x-*` namespace is
-reserved for that purpose, and repo guarantees to never allocate any
-corresponding names.
-
 A description of the elements and their attributes follows.
 
 
@@ -130,10 +113,6 @@ A description of the elements and their attributes follows.
 
 The root element of the file.
 
-### Element notice
-
-Arbitrary text that is displayed to users whenever `repo sync` finishes.
-The content is simply passed through as it exists in the manifest.
 
 ### Element remote
 
@@ -166,8 +145,8 @@ Attribute `review`: Hostname of the Gerrit server where reviews
 are uploaded to by `repo upload`.  This attribute is optional;
 if not specified then `repo upload` will not function.
 
-Attribute `revision`: Name of a Git branch (e.g. `main` or
-`refs/heads/main`). Remotes with their own revision will override
+Attribute `revision`: Name of a Git branch (e.g. `master` or
+`refs/heads/master`). Remotes with their own revision will override
 the default revision.
 
 ### Element default
@@ -180,11 +159,11 @@ Attribute `remote`: Name of a previously defined remote element.
 Project elements lacking a remote attribute of their own will use
 this remote.
 
-Attribute `revision`: Name of a Git branch (e.g. `main` or
-`refs/heads/main`).  Project elements lacking their own
+Attribute `revision`: Name of a Git branch (e.g. `master` or
+`refs/heads/master`).  Project elements lacking their own
 revision attribute will use this revision.
 
-Attribute `dest-branch`: Name of a Git branch (e.g. `main`).
+Attribute `dest-branch`: Name of a Git branch (e.g. `master`).
 Project elements not setting their own `dest-branch` will inherit
 this value. If this value is not set, projects will use `revision`
 by default instead.
@@ -260,37 +239,24 @@ name will be prefixed by the parent's.
 The project name must match the name Gerrit knows, if Gerrit is
 being used for code reviews.
 
-"name" must not be empty, and may not be an absolute path or use "." or ".."
-path components.  It is always interpreted relative to the remote's fetch
-settings, so if a different base path is needed, declare a different remote
-with the new settings needed.
-These restrictions are not enforced for [Local Manifests].
-
 Attribute `path`: An optional path relative to the top directory
 of the repo client where the Git working directory for this project
-should be placed.  If not supplied the project "name" is used.
+should be placed.  If not supplied the project name is used.
 If the project has a parent element, its path will be prefixed
 by the parent's.
 
-"path" may not be an absolute path or use "." or ".." path components.
-These restrictions are not enforced for [Local Manifests].
-
-If you want to place files into the root of the checkout (e.g. a README or
-Makefile or another build script), use the [copyfile] or [linkfile] elements
-instead.
-
 Attribute `remote`: Name of a previously defined remote element.
 If not supplied the remote given by the default element is used.
 
 Attribute `revision`: Name of the Git branch the manifest wants
 to track for this project.  Names can be relative to refs/heads
-(e.g. just "main") or absolute (e.g. "refs/heads/main").
+(e.g. just "master") or absolute (e.g. "refs/heads/master").
 Tags and/or explicit SHA-1s should work in theory, but have not
 been extensively tested.  If not supplied the revision given by
 the remote element is used if applicable, else the default
 element is used.
 
-Attribute `dest-branch`: Name of a Git branch (e.g. `main`).
+Attribute `dest-branch`: Name of a Git branch (e.g. `master`).
 When using `repo upload`, changes will be submitted for code
 review on this branch. If unspecified both here and in the
 default element, `revision` is used instead.
@@ -299,7 +265,7 @@ Attribute `groups`: List of groups to which this project belongs,
 whitespace or comma separated.  All projects belong to the group
 "all", and each project automatically belongs to a group of
 its name:`name` and path:`path`.  E.g. for
-`<project name="monkeys" path="barrel-of"/>`, that project
+<project name="monkeys" path="barrel-of"/>, that project
 definition is implicitly in the following manifest groups:
 default, name:monkeys, and path:barrel-of.  If you place a project in the
 group "notdefault", it will not be automatically downloaded by repo.
@@ -338,11 +304,6 @@ against changes to the original manifest.
 Attribute `path`: If specified, limit the change to projects checked out
 at the specified path, rather than all projects with the given name.
 
-Attribute `dest-path`: If specified, a path relative to the top directory
-of the repo client where the Git working directory for this project
-should be placed.  This is used to move a project in the checkout by
-overriding the existing `path` setting.
-
 Attribute `groups`: List of additional groups to which this project
 belongs.  Same syntax as the corresponding element of `project`.
 
@@ -355,12 +316,12 @@ project.  Same syntax as the corresponding element of `project`.
 ### Element annotation
 
 Zero or more annotation elements may be specified as children of a
-project or remote element. Each element describes a name-value pair.
-For projects, this name-value pair will be exported into each project's
-environment during a 'forall' command, prefixed with `REPO__`.  In addition,
-there is an optional attribute "keep" which accepts the case insensitive values
-"true" (default) or "false".  This attribute determines whether or not the
-annotation will be kept when exported with the manifest subcommand.
+project element. Each element describes a name-value pair that will be
+exported into each project's environment during a 'forall' command,
+prefixed with REPO__.  In addition, there is an optional attribute
+"keep" which accepts the case insensitive values "true" (default) or
+"false".  This attribute determines whether or not the annotation will
+be kept when exported with the manifest subcommand.
 
 ### Element copyfile
 
@@ -401,62 +362,6 @@ This element is mostly useful in a local manifest file, where
 the user can remove a project, and possibly replace it with their
 own definition.
 
-Attribute `optional`: Set to true to ignore remove-project elements with no
-matching `project` element.
-
-### Element repo-hooks
-
-NB: See the [practical documentation](./repo-hooks.md) for using repo hooks.
-
-Only one repo-hooks element may be specified at a time.
-Attempting to redefine it will fail to parse.
-
-Attribute `in-project`: The project where the hooks are defined.  The value
-must match the `name` attribute (**not** the `path` attribute) of a previously
-defined `project` element.
-
-Attribute `enabled-list`: List of hooks to use, whitespace or comma separated.
-
-### Element superproject
-
-***
-*Note*: This is currently a WIP.
-***
-
-NB: See the [git superprojects documentation](
-https://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects) for background
-information.
-
-This element is used to specify the URL of the superproject. It has "name" and
-"remote" as atrributes. Only "name" is required while the others have
-reasonable defaults. At most one superproject may be specified.
-Attempting to redefine it will fail to parse.
-
-Attribute `name`: A unique name for the superproject. This attribute has the
-same meaning as project's name attribute. See the
-[element project](#element-project) for more information.
-
-Attribute `remote`: Name of a previously defined remote element.
-If not supplied the remote given by the default element is used.
-
-Attribute `revision`: Name of the Git branch the manifest wants
-to track for this superproject. If not supplied the revision given
-by the remote element is used if applicable, else the default
-element is used.
-
-### Element contactinfo
-
-***
-*Note*: This is currently a WIP.
-***
-
-This element is used to let manifest authors self-register contact info.
-It has "bugurl" as a required atrribute. This element can be repeated,
-and any later entries will clobber earlier ones. This would allow manifest
-authors who extend manifests to specify their own contact info.
-
-Attribute `bugurl`: The URL to file a bug against the manifest owner.
-
 ### Element include
 
 This element provides the capability of including another manifest
@@ -466,15 +371,8 @@ target manifest to include - it must be a usable manifest on its own.
 Attribute `name`: the manifest to include, specified relative to
 the manifest repository's root.
 
-"name" may not be an absolute path or use "." or ".." path components.
-These restrictions are not enforced for [Local Manifests].
 
-Attribute `groups`: List of additional groups to which all projects
-in the included manifest belong. This appends and recurses, meaning
-all projects in sub-manifests carry all parent include groups.
-Same syntax as the corresponding element of `project`.
-
-## Local Manifests {#local-manifests}
+## Local Manifests
 
 Additional remotes and projects may be added through local manifest
 files stored in `$TOP_DIR/.repo/local_manifests/*.xml`.
@@ -501,12 +399,4 @@ these extra projects.
 Manifest files stored in `$TOP_DIR/.repo/local_manifests/*.xml` will
 be loaded in alphabetical order.
 
-Projects from local manifest files are added into
-local::<local manifest filename> group.
-
 The legacy `$TOP_DIR/.repo/local_manifest.xml` path is no longer supported.
-
-
-[copyfile]: #Element-copyfile
-[linkfile]: #Element-linkfile
-[Local Manifests]: #local-manifests

docs/python-support.md

@@ -1,5 +1,8 @@
 # Supported Python Versions
 
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/docs/python-support.md
+
 With Python 2.7 officially going EOL on [01 Jan 2020](https://pythonclock.org/),
 we need a support plan for the repo project itself.
 Inevitably, there will be a long tail of users who still want to use Python 2 on
@@ -18,13 +21,13 @@ Bugfixes may be added on a best-effort basis or from the community, but largely
 no new features will be added, nor is support guaranteed.
 
 Users can select this during `repo init` time via the [repo launcher].
-Otherwise the default branches (e.g. stable & main) will be used which will
+Otherwise the default branches (e.g. stable & master) will be used which will
 require Python 3.
 
 This means the [repo launcher] needs to support both Python 2 & Python 3, but
 since it doesn't import any other repo code, this shouldn't be too problematic.
 
-The main branch will require Python 3.6 at a minimum.
+The master branch will require Python 3.6 at a minimum.
 If the system has an older version of Python 3, then users will have to select
 the legacy Python 2 branch instead.
 

docs/release-process.md

@@ -1,5 +1,8 @@
 # repo release process
 
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/docs/release-process.md
+
 This is the process for creating a new release of repo, as well as all the
 related topics and flows.
 
@@ -83,8 +86,7 @@ control how repo finds updates:
 *   `--repo-rev`: This tells repo which branch to use for the full project.
     It defaults to the `stable` branch (`REPO_REV` in the launcher script).
 
-Whenever `repo sync` is run, repo will, once every 24 hours, see if an update
-is available.
+Whenever `repo sync` is run, repo will check to see if an update is available.
 It fetches the latest repo-rev from the repo-url.
 Then it verifies that the latest commit in the branch has a valid signed tag
 using `git tag -v` (which uses gpg).
@@ -96,14 +98,9 @@ If that tag is valid, then repo will warn and use that commit instead.
 
 If that tag cannot be verified, it gives up and forces the user to resolve.
 
-### Force an update
-
-The `repo selfupdate` command can be used to force an immediate update.
-It is not subject to the 24 hour limitation.
-
 ## Branch management
 
-All development happens on the `main` branch and should generally be stable.
+All development happens on the `master` branch and should generally be stable.
 
 Since the repo launcher defaults to tracking the `stable` branch, it is not
 normally updated until a new release is available.
@@ -118,7 +115,7 @@ For example, when `stable` moves from `v1.10.x` to `v1.11.x`, then the `maint`
 branch will be updated from `v1.9.x` to `v1.10.x`.
 
 We don't have parallel release branches/series.
-Typically all tags are made against the `main` branch and then pushed to the
+Typically all tags are made against the `master` branch and then pushed to the
 `stable` branch to make it available to the rest of the world.
 Since repo doesn't typically see a lot of changes, this tends to be OK.
 
@@ -126,10 +123,10 @@ Since repo doesn't typically see a lot of changes, this tends to be OK.
 
 When you want to create a new release, you'll need to select a good version and
 create a signed tag using a key registered in repo itself.
-Typically we just tag the latest version of the `main` branch.
+Typically we just tag the latest version of the `master` branch.
 The tag could be pushed now, but it won't be used by clients normally (since the
 default `repo-rev` setting is `stable`).
-This would allow some early testing on systems who explicitly select `main`.
+This would allow some early testing on systems who explicitly select `master`.
 
 ### Creating a signed tag
 
@@ -150,7 +147,7 @@ $ export GNUPGHOME=~/.gnupg/repo/
 $ gpg -K
 
 # Pick whatever branch or commit you want to tag.
-$ r=main
+$ r=master
 
 # Pick the new version.
 $ t=1.12.10
@@ -208,132 +205,80 @@ Things in bold indicate stuff to take note of, but does not guarantee that we
 still support them.
 Things in italics are things we used to care about but probably don't anymore.
 
-|   Date   |     EOL      | [Git][rel-g] | [Python][rel-p] | [SSH][rel-o] | [Ubuntu][rel-u] / [Debian][rel-d] | Git | Python | SSH |
-|:--------:|:------------:|:------------:|:---------------:|:------------:|-----------------------------------|-----|--------|-----|
-| Apr 2008 |              |              |                 | 5.0          |
-| Jun 2008 |              |              |                 | 5.1          |
-| Oct 2008 | *Oct 2013*   |              | 2.6.0           |              | *10.04 Lucid* - 10.10 Maverick / *Squeeze* |
+|   Date   |     EOL      | [Git][rel-g] | [Python][rel-p] | [Ubuntu][rel-u] / [Debian][rel-d] | Git | Python |
+|:--------:|:------------:|--------------|-----------------|-----------------------------------|-----|--------|
+| Oct 2008 | *Oct 2013*   |              | 2.6.0           | *10.04 Lucid* - 10.10 Maverick / *Squeeze* |
 | Dec 2008 | *Feb 2009*   |              | 3.0.0           |
-| Feb 2009 |              |              |                 | 5.2          |
-| Feb 2009 | *Mar 2012*   |              |                 |              | Debian 5 Lenny       | 1.5.6.5 | 2.5.2 |
-| Jun 2009 | *Jun 2016*   |              | 3.1.0           |              | *10.04 Lucid* - 10.10 Maverick / *Squeeze* |
-| Sep 2009 |              |              |                 | 5.3          | *10.04 Lucid* |
-| Feb 2010 | *Oct 2012*   | 1.7.0        |                 |              | *10.04 Lucid* - *12.04 Precise* - 12.10 Quantal |
-| Mar 2010 |              |              |                 | 5.4          |
-| Apr 2010 |              |              |                 | 5.5          | 10.10 Maverick |
-| Apr 2010 | *Apr 2015*   |              |                 |              | *10.04 Lucid*        | 1.7.0.4  | 2.6.5 3.1.2  | 5.3 |
-| Jul 2010 | *Dec 2019*   |              | *2.7.0*         |              | 11.04 Natty - *<current>* |
-| Aug 2010 |              |              |                 | 5.6          |
-| Oct 2010 |              |              |                 |              | 10.10 Maverick       | 1.7.1    | 2.6.6 3.1.3  | 5.5 |
-| Jan 2011 |              |              |                 | 5.7          |
-| Feb 2011 |              |              |                 | 5.8          | 11.04 Natty |
-| Feb 2011 | *Feb 2016*   |              |                 |              | Debian 6 Squeeze     | 1.7.2.5  | 2.6.6 3.1.3  |
-| Apr 2011 |              |              |                 |              | 11.04 Natty          | 1.7.4    | 2.7.1 3.2.0  | 5.8 |
-| Sep 2011 |              |              |                 | 5.9          | *12.04 Precise* |
-| Oct 2011 | *Feb 2016*   |              | 3.2.0           |              | 11.04 Natty - 12.10 Quantal |
-| Oct 2011 |              |              |                 |              | 11.10 Ocelot         | 1.7.5.4  | 2.7.2 3.2.2  | 5.8 |
-| Apr 2012 |              |              |                 | 6.0          | 12.10 Quantal |
-| Apr 2012 | *Apr 2019*   |              |                 |              | *12.04 Precise*      | 1.7.9.5  | 2.7.3 3.2.3  | 5.9 |
-| Aug 2012 |              |              |                 | 6.1          | 13.04 Raring |
-| Sep 2012 | *Sep 2017*   |              | 3.3.0           |              | 13.04 Raring - 13.10 Saucy |
-| Oct 2012 | *Dec 2014*   | 1.8.0        |                 |              | 13.04 Raring - 13.10 Saucy |
-| Oct 2012 |              |              |                 |              | 12.10 Quantal        | 1.7.10.4 | 2.7.3 3.2.3  | 6.0 |
-| Mar 2013 |              |              |                 | 6.2          | 13.10 Saucy |
-| Apr 2013 |              |              |                 |              | 13.04 Raring         | 1.8.1.2  | 2.7.4 3.3.1  | 6.1 |
-| May 2013 | *May 2018*   |              |                 |              | Debian 7 Wheezy      | 1.7.10.4 | 2.7.3 3.2.3  |
-| Sep 2013 |              |              |                 | 6.3          |
-| Oct 2013 |              |              |                 |              | 13.10 Saucy          | 1.8.3.2  | 2.7.5 3.3.2  | 6.2 |
-| Nov 2013 |              |              |                 | 6.4          |
-| Jan 2014 |              |              |                 | 6.5          |
-| Feb 2014 | *Dec 2014*   | **1.9.0**    |                 |              | *14.04 Trusty* |
-| Mar 2014 | *Mar 2019*   |              | *3.4.0*         |              | *14.04 Trusty* - 15.10 Wily / *Jessie* |
-| Mar 2014 |              |              |                 | 6.6          | *14.04 Trusty* - 14.10 Utopic |
-| Apr 2014 | *Apr 2022*   |              |                 |              | *14.04 Trusty*       | 1.9.1    | 2.7.5 3.4.0  | 6.6 |
+| Feb 2009 | *Mar 2012*   |              |                 | Debian 5 Lenny       | 1.5.6.5 | 2.5.2 |
+| Jun 2009 | *Jun 2016*   |              | 3.1.0           | *10.04 Lucid* - 10.10 Maverick / *Squeeze* |
+| Feb 2010 | *Oct 2012*   | 1.7.0        |                 | *10.04 Lucid* - *12.04 Precise* - 12.10 Quantal |
+| Apr 2010 | *Apr 2015*   |              |                 | *10.04 Lucid*        | 1.7.0.4  | 2.6.5 3.1.2  |
+| Jul 2010 | *Dec 2019*   |              | **2.7.0**       | 11.04 Natty - **<current>** |
+| Oct 2010 |              |              |                 | 10.10 Maverick       | 1.7.1    | 2.6.6 3.1.3  |
+| Feb 2011 | *Feb 2016*   |              |                 | Debian 6 Squeeze     | 1.7.2.5  | 2.6.6 3.1.3  |
+| Apr 2011 |              |              |                 | 11.04 Natty          | 1.7.4    | 2.7.1 3.2.0  |
+| Oct 2011 | *Feb 2016*   |              | 3.2.0           | 11.04 Natty - 12.10 Quantal |
+| Oct 2011 |              |              |                 | 11.10 Ocelot         | 1.7.5.4  | 2.7.2 3.2.2  |
+| Apr 2012 | *Apr 2019*   |              |                 | *12.04 Precise*      | 1.7.9.5  | 2.7.3 3.2.3  |
+| Sep 2012 | *Sep 2017*   |              | 3.3.0           | 13.04 Raring - 13.10 Saucy |
+| Oct 2012 | *Dec 2014*   | 1.8.0        |                 | 13.04 Raring - 13.10 Saucy |
+| Oct 2012 |              |              |                 | 12.10 Quantal        | 1.7.10.4 | 2.7.3 3.2.3  |
+| Apr 2013 |              |              |                 | 13.04 Raring         | 1.8.1.2  | 2.7.4 3.3.1  |
+| May 2013 | *May 2018*   |              |                 | Debian 7 Wheezy      | 1.7.10.4 | 2.7.3 3.2.3  |
+| Oct 2013 |              |              |                 | 13.10 Saucy          | 1.8.3.2  | 2.7.5 3.3.2  |
+| Feb 2014 | *Dec 2014*   | **1.9.0**    |                 | **14.04 Trusty** |
+| Mar 2014 | *Mar 2019*   |              | **3.4.0**       | **14.04 Trusty** - 15.10 Wily / **Jessie** |
+| Apr 2014 | **Apr 2022** |              |                 | **14.04 Trusty**     | 1.9.1    | 2.7.5 3.4.0  |
 | May 2014 | *Dec 2014*   | 2.0.0        |
-| Aug 2014 | *Dec 2014*   | *2.1.0*      |                 |              | 14.10 Utopic - 15.04 Vivid / *Jessie* |
-| Oct 2014 |              |              |                 | 6.7          | 15.04 Vivid |
-| Oct 2014 |              |              |                 |              | 14.10 Utopic         | 2.1.0    | 2.7.8 3.4.2  | 6.6 |
+| Aug 2014 | *Dec 2014*   | **2.1.0**    |                 | 14.10 Utopic - 15.04 Vivid / **Jessie** |
+| Oct 2014 |              |              |                 | 14.10 Utopic         | 2.1.0    | 2.7.8 3.4.2  |
 | Nov 2014 | *Sep 2015*   | 2.2.0        |
 | Feb 2015 | *Sep 2015*   | 2.3.0        |
-| Mar 2015 |              |              |                 | 6.8          |
 | Apr 2015 | *May 2017*   | 2.4.0        |
-| Apr 2015 | *Jun 2020*   |              |                 |              | *Debian 8 Jessie*    | 2.1.4    | 2.7.9 3.4.2  |
-| Apr 2015 |              |              |                 |              | 15.04 Vivid          | 2.1.4    | 2.7.9 3.4.3  | 6.7 |
-| Jul 2015 | *May 2017*   | 2.5.0        |                 |              | 15.10 Wily |
-| Jul 2015 |              |              |                 | 6.9          | 15.10 Wily |
-| Aug 2015 |              |              |                 | 7.0          |
-| Aug 2015 |              |              |                 | 7.1          |
+| Apr 2015 | **Jun 2020** |              |                 | **Debian 8 Jessie**  | 2.1.4    | 2.7.9 3.4.2  |
+| Apr 2015 |              |              |                 | 15.04 Vivid          | 2.1.4    | 2.7.9 3.4.3  |
+| Jul 2015 | *May 2017*   | 2.5.0        |                 | 15.10 Wily |
 | Sep 2015 | *May 2017*   | 2.6.0        |
-| Sep 2015 | *Sep 2020*   |              | *3.5.0*         |              | *16.04 Xenial* - 17.04 Zesty / *Stretch* |
-| Oct 2015 |              |              |                 |              | 15.10 Wily           | 2.5.0    | 2.7.9 3.4.3  | 6.9 |
-| Jan 2016 | *Jul 2017*   | *2.7.0*      |                 |              | *16.04 Xenial* |
-| Feb 2016 |              |              |                 | 7.2          | *16.04 Xenial* |
+| Sep 2015 | **Sep 2020** |              | **3.5.0**       | **16.04 Xenial** - 17.04 Zesty / **Stretch** |
+| Oct 2015 |              |              |                 | 15.10 Wily           | 2.5.0    | 2.7.9 3.4.3  |
+| Jan 2016 | *Jul 2017*   | **2.7.0**    |                 | **16.04 Xenial** |
 | Mar 2016 | *Jul 2017*   | 2.8.0        |
-| Apr 2016 | *Apr 2024*   |              |                 |              | *16.04 Xenial*       | 2.7.4    | 2.7.11 3.5.1 | 7.2 |
-| Jun 2016 | *Jul 2017*   | 2.9.0        |                 |              | 16.10 Yakkety |
-| Jul 2016 |              |              |                 | 7.3          | 16.10 Yakkety |
+| Apr 2016 | **Apr 2024** |              |                 | **16.04 Xenial**     | 2.7.4    | 2.7.11 3.5.1 |
+| Jun 2016 | *Jul 2017*   | 2.9.0        |                 | 16.10 Yakkety |
 | Sep 2016 | *Sep 2017*   | 2.10.0       |
-| Oct 2016 |              |              |                 |              | 16.10 Yakkety        | 2.9.3    | 2.7.11 3.5.1 | 7.3 |
-| Nov 2016 | *Sep 2017*   | *2.11.0*     |                 |              | 17.04 Zesty / *Stretch* |
-| Dec 2016 | **Dec 2021** |              | **3.6.0**       |              | 17.10 Artful - **18.04 Bionic** - 18.10 Cosmic |
-| Dec 2016 |              |              |                 | 7.4          | 17.04 Zesty / *Debian 9 Stretch* |
+| Oct 2016 |              |              |                 | 16.10 Yakkety        | 2.9.3    | 2.7.11 3.5.1 |
+| Nov 2016 | *Sep 2017*   | **2.11.0**   |                 | 17.04 Zesty / **Stretch** |
+| Dec 2016 | **Dec 2021** |              | **3.6.0**       | 17.10 Artful - **18.04 Bionic** - 18.10 Cosmic |
 | Feb 2017 | *Sep 2017*   | 2.12.0       |
-| Mar 2017 |              |              |                 | 7.5          | 17.10 Artful |
-| Apr 2017 |              |              |                 |              | 17.04 Zesty          | 2.11.0   | 2.7.13 3.5.3 | 7.4 |
+| Apr 2017 |              |              |                 | 17.04 Zesty          | 2.11.0   | 2.7.13 3.5.3 |
 | May 2017 | *May 2018*   | 2.13.0       |
-| Jun 2017 | *Jun 2022*   |              |                 |              | *Debian 9 Stretch*   | 2.11.0   | 2.7.13 3.5.3 | 7.4 |
-| Aug 2017 | *Dec 2019*   | 2.14.0       |                 |              | 17.10 Artful |
+| Jun 2017 | **Jun 2022** |              |                 | **Debian 9 Stretch** | 2.11.0   | 2.7.13 3.5.3 |
+| Aug 2017 | *Dec 2019*   | 2.14.0       |                 | 17.10 Artful |
 | Oct 2017 | *Dec 2019*   | 2.15.0       |
-| Oct 2017 |              |              |                 | 7.6          | **18.04 Bionic** |
-| Oct 2017 |              |              |                 |              | 17.10 Artful         | 2.14.1   | 2.7.14 3.6.3 | 7.5 |
+| Oct 2017 |              |              |                 | 17.10 Artful         | 2.14.1   | 2.7.14 3.6.3 |
 | Jan 2018 | *Dec 2019*   | 2.16.0       |
-| Apr 2018 | *Mar 2021*   | **2.17.0**   |                 |              | **18.04 Bionic**     |
-| Apr 2018 |              |              |                 | 7.7          | 18.10 Cosmic |
-| Apr 2018 | **Apr 2028** |              |                 |              | **18.04 Bionic**     | 2.17.0   | 2.7.15 3.6.5 | 7.6 |
-| Jun 2018 | *Mar 2021*   | 2.18.0       |
-| Jun 2018 | **Jun 2023** |              | 3.7.0           |              | 19.04 Disco - **20.04 Focal** / **Buster** |
-| Aug 2018 |              |              |                 | 7.8          |
-| Sep 2018 | *Mar 2021*   | 2.19.0       |                 |              | 18.10 Cosmic |
-| Oct 2018 |              |              |                 | 7.9          | 19.04 Disco / **Buster** |
-| Oct 2018 |              |              |                 |              | 18.10 Cosmic         | 2.19.1   | 2.7.15 3.6.6 | 7.7 |
-| Dec 2018 | *Mar 2021*   | **2.20.0**   |                 |              | 19.04 Disco - 19.10 Eoan / **Buster** |
-| Feb 2019 | *Mar 2021*   | 2.21.0       |
-| Apr 2019 |              |              |                 | 8.0          | 19.10 Eoan |
-| Apr 2019 |              |              |                 |              | 19.04 Disco          | 2.20.1   | 2.7.16 3.7.3 | 7.9 |
+| Apr 2018 | *Dec 2019*   | 2.17.0       |                 | **18.04 Bionic**     |
+| Apr 2018 | **Apr 2028** |              |                 | **18.04 Bionic**     | 2.17.0   | 2.7.15 3.6.5 |
+| Jun 2018 | *Dec 2019*   | 2.18.0       |
+| Jun 2018 | **Jun 2023** |              | 3.7.0           | 19.04 Disco - **20.04 Focal** / **Buster** |
+| Sep 2018 | *Dec 2019*   | 2.19.0       |                 | 18.10 Cosmic |
+| Oct 2018 |              |              |                 | 18.10 Cosmic         | 2.19.1   | 2.7.15 3.6.6 |
+| Dec 2018 | *Dec 2019*   | **2.20.0**   |                 | 19.04 Disco / **Buster** |
+| Feb 2019 | *Dec 2019*   | 2.21.0       |
+| Apr 2019 |              |              |                 | 19.04 Disco          | 2.20.1   | 2.7.16 3.7.3 |
 | Jun 2019 |              | 2.22.0       |
-| Jul 2019 | **Jul 2024** |              |                 |              | **Debian 10 Buster** | 2.20.1   | 2.7.16 3.7.3 | 7.9 |
-| Aug 2019 | *Mar 2021*   | 2.23.0       |
-| Oct 2019 | **Oct 2024** |              | 3.8.0           |              | **20.04 Focal** - 20.10 Groovy |
-| Oct 2019 |              |              |                 | 8.1          |
-| Oct 2019 |              |              |                 |              | 19.10 Eoan           | 2.20.1   | 2.7.17 3.7.5 | 8.0 |
-| Nov 2019 | *Mar 2021*   | 2.24.0       |
-| Jan 2020 | *Mar 2021*   | 2.25.0       |                 |              | **20.04 Focal** |
-| Feb 2020 |              |              |                 | 8.2          | **20.04 Focal** |
-| Mar 2020 | *Mar 2021*   | 2.26.0       |
-| Apr 2020 | **Apr 2030** |              |                 |              | **20.04 Focal**      | 2.25.1   | 2.7.17 3.8.2 | 8.2 |
-| May 2020 | *Mar 2021*   | 2.27.0       |                 |              | 20.10 Groovy |
-| May 2020 |              |              |                 | 8.3          |
-| Jul 2020 | *Mar 2021*   | 2.28.0       |
-| Sep 2020 |              |              |                 | 8.4          | 21.04 Hirsute / **Bullseye** |
-| Oct 2020 | *Mar 2021*   | 2.29.0       |
-| Oct 2020 |              |              |                 |              | 20.10 Groovy         | 2.27.0   | 2.7.18 3.8.6 | 8.3 |
-| Oct 2020 | **Oct 2025** |              | 3.9.0           |              | 21.04 Hirsute / **Bullseye** |
-| Dec 2020 | *Mar 2021*   | 2.30.0       |                 |              | 21.04 Hirsute / **Bullseye** |
-| Mar 2021 |              | 2.31.0       |
-| Mar 2021 |              |              |                 | 8.5          |
-| Apr 2021 |              |              |                 | 8.6          |
-| Apr 2021 | *Jan 2022*   |              |                 |              | 21.04 Hirsute        | 2.30.2   | 2.7.18 3.9.4 | 8.4 |
-| Jun 2021 |              | 2.32.0       |
-| Aug 2021 |              | 2.33.0       |
-| Aug 2021 |              |              |                 | 8.7          |
-| Aug 2021 | **Aug 2026** |              |                 |              | **Debian 11 Bullseye** | 2.30.2 | 2.7.18 3.9.2 | 8.4 |
-| **Date** |   **EOL**    | **[Git][rel-g]** | **[Python][rel-p]** | **[SSH][rel-o]** | **[Ubuntu][rel-u] / [Debian][rel-d]** | **Git** | **Python** | **SSH** |
+| Jul 2019 | **Jul 2024** |              |                 | **Debian 10 Buster** | 2.20.1   | 2.7.16 3.7.3 |
+| Aug 2019 |              | 2.23.0       |
+| Oct 2019 | **Oct 2024** |              | 3.8.0           |
+| Oct 2019 |              |              |                 | 19.10 Eoan           | 2.20.1   | 2.7.17 3.7.5 |
+| Nov 2019 |              | 2.24.0       |
+| Jan 2020 |              | 2.25.0       |                 | **20.04 Focal** |
+| Apr 2020 | **Apr 2030** |              |                 | **20.04 Focal**      | 2.25.0   | 2.7.17 3.7.5 |
 
 
 [contact]: ../README.md#contact
 [rel-d]: https://en.wikipedia.org/wiki/Debian_version_history
 [rel-g]: https://en.wikipedia.org/wiki/Git#Releases
-[rel-o]: https://www.openssh.com/releasenotes.html
 [rel-p]: https://en.wikipedia.org/wiki/History_of_Python#Table_of_versions
 [rel-u]: https://en.wikipedia.org/wiki/Ubuntu_version_history#Table_of_versions
 [example announcement]: https://groups.google.com/d/topic/repo-discuss/UGBNismWo1M/discussion

docs/repo-hooks.md

@@ -1,5 +1,8 @@
 # repo hooks
 
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/docs/repo-hooks.md
+
 [TOC]
 
 Repo provides a mechanism to hook specific stages of the runtime with custom
@@ -27,7 +30,7 @@ repohooks project is updated and a hook is triggered.
 For the full syntax, see the [repo manifest format](./manifest-format.md).
 
 Here's a short example from
-[Android](https://android.googlesource.com/platform/manifest/+/HEAD/default.xml).
+[Android](https://android.googlesource.com/platform/manifest/+/master/default.xml).
 The `<project>` line checks out the repohooks git repo to the local
 `tools/repohooks/` path.  The `<repo-hooks>` line says to look in the project
 with the name `platform/tools/repohooks` for hooks to run during the

docs/windows.md

@@ -1,5 +1,8 @@
 # Microsoft Windows Details
 
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/docs/windows.md
+
 Repo is primarily developed on Linux with a lot of users on macOS.
 Windows is, unfortunately, not a common platform.
 There is support in repo for Windows, but there might be some rough edges.

editor.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import os
 import re
 import sys

error.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,12 +20,12 @@ class ManifestParseError(Exception):
   """
 
 
-class ManifestInvalidRevisionError(ManifestParseError):
+class ManifestInvalidRevisionError(Exception):
   """The revision value in a project is incorrect.
   """
 
 
-class ManifestInvalidPathError(ManifestParseError):
+class ManifestInvalidPathError(Exception):
   """A path used in <copyfile> or <linkfile> is incorrect.
   """
 
@@ -33,7 +35,7 @@ class NoManifestException(Exception):
   """
 
   def __init__(self, path, reason):
-    super().__init__(path, reason)
+    super(NoManifestException, self).__init__()
     self.path = path
     self.reason = reason
 
@@ -46,7 +48,7 @@ class EditorError(Exception):
   """
 
   def __init__(self, reason):
-    super().__init__(reason)
+    super(EditorError, self).__init__()
     self.reason = reason
 
   def __str__(self):
@@ -58,7 +60,7 @@ class GitError(Exception):
   """
 
   def __init__(self, command):
-    super().__init__(command)
+    super(GitError, self).__init__()
     self.command = command
 
   def __str__(self):
@@ -70,7 +72,7 @@ class UploadError(Exception):
   """
 
   def __init__(self, reason):
-    super().__init__(reason)
+    super(UploadError, self).__init__()
     self.reason = reason
 
   def __str__(self):
@@ -82,7 +84,7 @@ class DownloadError(Exception):
   """
 
   def __init__(self, reason):
-    super().__init__(reason)
+    super(DownloadError, self).__init__()
     self.reason = reason
 
   def __str__(self):
@@ -94,7 +96,7 @@ class NoSuchProjectError(Exception):
   """
 
   def __init__(self, name=None):
-    super().__init__(name)
+    super(NoSuchProjectError, self).__init__()
     self.name = name
 
   def __str__(self):
@@ -108,7 +110,7 @@ class InvalidProjectGroupsError(Exception):
   """
 
   def __init__(self, name=None):
-    super().__init__(name)
+    super(InvalidProjectGroupsError, self).__init__()
     self.name = name
 
   def __str__(self):
@@ -124,7 +126,7 @@ class RepoChangedException(Exception):
   """
 
   def __init__(self, extra_args=None):
-    super().__init__(extra_args)
+    super(RepoChangedException, self).__init__()
     self.extra_args = extra_args or []
 
 

event_log.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2017 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
+
 import json
 import multiprocessing
 

fetch.py

@@ -1,45 +0,0 @@
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""This module contains functions used to fetch files from various sources."""
-
-import subprocess
-import sys
-from urllib.parse import urlparse
-from urllib.request import urlopen
-
-
-def fetch_file(url, verbose=False):
-  """Fetch a file from the specified source using the appropriate protocol.
-
-  Returns:
-    The contents of the file as bytes.
-  """
-  scheme = urlparse(url).scheme
-  if scheme == 'gs':
-    cmd = ['gsutil', 'cat', url]
-    try:
-      result = subprocess.run(
-          cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-          check=True)
-      if result.stderr and verbose:
-        print('warning: non-fatal error running "gsutil": %s' % result.stderr,
-              file=sys.stderr)
-      return result.stdout
-    except subprocess.CalledProcessError as e:
-      print('fatal: error running "gsutil": %s' % e.stderr,
-            file=sys.stderr)
-    sys.exit(1)
-  with urlopen(url) as f:
-    return f.read()

git_command.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import functools
+from __future__ import print_function
 import os
+import re
 import sys
 import subprocess
+import tempfile
+from signal import SIGTERM
 
 from error import GitError
 from git_refs import HEAD
@@ -40,15 +45,101 @@ GIT_DIR = 'GIT_DIR'
 LAST_GITDIR = None
 LAST_CWD = None
 
+_ssh_proxy_path = None
+_ssh_sock_path = None
+_ssh_clients = []
+_ssh_version = None
+
+
+def _run_ssh_version():
+  """run ssh -V to display the version number"""
+  return subprocess.check_output(['ssh', '-V'], stderr=subprocess.STDOUT).decode()
+
+
+def _parse_ssh_version(ver_str=None):
+  """parse a ssh version string into a tuple"""
+  if ver_str is None:
+    ver_str = _run_ssh_version()
+  m = re.match(r'^OpenSSH_([0-9.]+)(p[0-9]+)?\s', ver_str)
+  if m:
+    return tuple(int(x) for x in m.group(1).split('.'))
+  else:
+    return ()
+
+
+def ssh_version():
+  """return ssh version as a tuple"""
+  global _ssh_version
+  if _ssh_version is None:
+    try:
+      _ssh_version = _parse_ssh_version()
+    except subprocess.CalledProcessError:
+      print('fatal: unable to detect ssh version', file=sys.stderr)
+      sys.exit(1)
+  return _ssh_version
+
+
+def ssh_sock(create=True):
+  global _ssh_sock_path
+  if _ssh_sock_path is None:
+    if not create:
+      return None
+    tmp_dir = '/tmp'
+    if not os.path.exists(tmp_dir):
+      tmp_dir = tempfile.gettempdir()
+    if ssh_version() < (6, 7):
+      tokens = '%r@%h:%p'
+    else:
+      tokens = '%C'  # hash of %l%h%p%r
+    _ssh_sock_path = os.path.join(
+        tempfile.mkdtemp('', 'ssh-', tmp_dir),
+        'master-' + tokens)
+  return _ssh_sock_path
+
+
+def _ssh_proxy():
+  global _ssh_proxy_path
+  if _ssh_proxy_path is None:
+    _ssh_proxy_path = os.path.join(
+        os.path.dirname(__file__),
+        'git_ssh')
+  return _ssh_proxy_path
+
+
+def _add_ssh_client(p):
+  _ssh_clients.append(p)
+
+
+def _remove_ssh_client(p):
+  try:
+    _ssh_clients.remove(p)
+  except ValueError:
+    pass
+
+
+def terminate_ssh_clients():
+  global _ssh_clients
+  for p in _ssh_clients:
+    try:
+      os.kill(p.pid, SIGTERM)
+      p.wait()
+    except OSError:
+      pass
+  _ssh_clients = []
+
+
+_git_version = None
+
 
 class _GitCall(object):
-  @functools.lru_cache(maxsize=None)
   def version_tuple(self):
-    ret = Wrapper().ParseGitVersion()
-    if ret is None:
-      print('fatal: unable to detect git version', file=sys.stderr)
-      sys.exit(1)
-    return ret
+    global _git_version
+    if _git_version is None:
+      _git_version = Wrapper().ParseGitVersion()
+      if _git_version is None:
+        print('fatal: unable to detect git version', file=sys.stderr)
+        sys.exit(1)
+    return _git_version
 
   def __getattr__(self, name):
     name = name.replace('_', '-')
@@ -74,11 +165,11 @@ def RepoSourceVersion():
 
     proj = os.path.dirname(os.path.abspath(__file__))
     env[GIT_DIR] = os.path.join(proj, '.git')
-    result = subprocess.run([GIT, 'describe', HEAD], stdout=subprocess.PIPE,
-                            stderr=subprocess.DEVNULL, encoding='utf-8',
-                            env=env, check=False)
-    if result.returncode == 0:
-      ver = result.stdout.strip()
+
+    p = subprocess.Popen([GIT, 'describe', HEAD], stdout=subprocess.PIPE,
+                         env=env)
+    if p.wait() == 0:
+      ver = p.stdout.read().strip().decode('utf-8')
       if ver.startswith('v'):
         ver = ver[1:]
     else:
@@ -162,22 +253,24 @@ class GitCommand(object):
                project,
                cmdv,
                bare=False,
-               input=None,
+               provide_stdin=False,
                capture_stdout=False,
                capture_stderr=False,
                merge_output=False,
                disable_editor=False,
-               ssh_proxy=None,
+               ssh_proxy=False,
                cwd=None,
-               gitdir=None,
-               objdir=None):
+               gitdir=None):
     env = self._GetBasicEnv()
 
+    # If we are not capturing std* then need to print it.
+    self.tee = {'stdout': not capture_stdout, 'stderr': not capture_stderr}
+
     if disable_editor:
       env['GIT_EDITOR'] = ':'
     if ssh_proxy:
-      env['REPO_SSH_SOCK'] = ssh_proxy.sock()
-      env['GIT_SSH'] = ssh_proxy.proxy
+      env['REPO_SSH_SOCK'] = ssh_sock()
+      env['GIT_SSH'] = _ssh_proxy()
       env['GIT_SSH_VARIANT'] = 'ssh'
     if 'http_proxy' in env and 'darwin' == sys.platform:
       s = "'http.proxy=%s'" % (env['http_proxy'],)
@@ -195,20 +288,6 @@ class GitCommand(object):
         cwd = project.worktree
       if not gitdir:
         gitdir = project.gitdir
-    # Git on Windows wants its paths only using / for reliability.
-    if platform_utils.isWindows():
-      if objdir:
-        objdir = objdir.replace('\\', '/')
-      if gitdir:
-        gitdir = gitdir.replace('\\', '/')
-
-    if objdir:
-      # Set to the place we want to save the objects.
-      env['GIT_OBJECT_DIRECTORY'] = objdir
-      if gitdir:
-        # Allow git to search the original place in case of local or unique refs
-        # that git will attempt to resolve even if we aren't fetching them.
-        env['GIT_ALTERNATE_OBJECT_DIRECTORIES'] = gitdir + '/objects'
 
     command = [GIT]
     if bare:
@@ -223,10 +302,13 @@ class GitCommand(object):
         command.append('--progress')
     command.extend(cmdv[1:])
 
-    stdin = subprocess.PIPE if input else None
-    stdout = subprocess.PIPE if capture_stdout else None
-    stderr = (subprocess.STDOUT if merge_output else
-              (subprocess.PIPE if capture_stderr else None))
+    if provide_stdin:
+      stdin = subprocess.PIPE
+    else:
+      stdin = None
+
+    stdout = subprocess.PIPE
+    stderr = subprocess.STDOUT if merge_output else subprocess.PIPE
 
     if IsTrace():
       global LAST_CWD
@@ -246,11 +328,6 @@ class GitCommand(object):
         dbg += ': export GIT_DIR=%s\n' % env[GIT_DIR]
         LAST_GITDIR = env[GIT_DIR]
 
-      if 'GIT_OBJECT_DIRECTORY' in env:
-        dbg += ': export GIT_OBJECT_DIRECTORY=%s\n' % env['GIT_OBJECT_DIRECTORY']
-      if 'GIT_ALTERNATE_OBJECT_DIRECTORIES' in env:
-        dbg += ': export GIT_ALTERNATE_OBJECT_DIRECTORIES=%s\n' % env['GIT_ALTERNATE_OBJECT_DIRECTORIES']
-
       dbg += ': '
       dbg += ' '.join(command)
       if stdin == subprocess.PIPE:
@@ -267,8 +344,6 @@ class GitCommand(object):
       p = subprocess.Popen(command,
                            cwd=cwd,
                            env=env,
-                           encoding='utf-8',
-                           errors='backslashreplace',
                            stdin=stdin,
                            stdout=stdout,
                            stderr=stderr)
@@ -276,21 +351,10 @@ class GitCommand(object):
       raise GitError('%s: %s' % (command[1], e))
 
     if ssh_proxy:
-      ssh_proxy.add_client(p)
+      _add_ssh_client(p)
 
     self.process = p
-    if input:
-      if isinstance(input, str):
-        input = input.encode('utf-8')
-      p.stdin.write(input)
-      p.stdin.close()
-
-    try:
-      self.stdout, self.stderr = p.communicate()
-    finally:
-      if ssh_proxy:
-        ssh_proxy.remove_client(p)
-    self.rc = p.wait()
+    self.stdin = p.stdin
 
   @staticmethod
   def _GetBasicEnv():
@@ -310,4 +374,36 @@ class GitCommand(object):
     return env
 
   def Wait(self):
-    return self.rc
+    try:
+      p = self.process
+      rc = self._CaptureOutput()
+    finally:
+      _remove_ssh_client(p)
+    return rc
+
+  def _CaptureOutput(self):
+    p = self.process
+    s_in = platform_utils.FileDescriptorStreams.create()
+    s_in.add(p.stdout, sys.stdout, 'stdout')
+    if p.stderr is not None:
+      s_in.add(p.stderr, sys.stderr, 'stderr')
+    self.stdout = ''
+    self.stderr = ''
+
+    while not s_in.is_done:
+      in_ready = s_in.select()
+      for s in in_ready:
+        buf = s.read()
+        if not buf:
+          s_in.remove(s)
+          continue
+        if not hasattr(buf, 'encode'):
+          buf = buf.decode()
+        if s.std_name == 'stdout':
+          self.stdout += buf
+        else:
+          self.stderr += buf
+        if self.tee[s.std_name]:
+          s.dest.write(buf)
+          s.dest.flush()
+    return p.wait()

git_config.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,28 +14,46 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
+
 import contextlib
-import datetime
 import errno
-from http.client import HTTPException
 import json
 import os
 import re
+import signal
 import ssl
 import subprocess
 import sys
-import urllib.error
-import urllib.request
+try:
+  import threading as _threading
+except ImportError:
+  import dummy_threading as _threading
+import time
+
+from pyversion import is_python3
+if is_python3():
+  import urllib.request
+  import urllib.error
+else:
+  import urllib2
+  import imp
+  urllib = imp.new_module('urllib')
+  urllib.request = urllib2
+  urllib.error = urllib2
 
 from error import GitError, UploadError
 import platform_utils
 from repo_trace import Trace
-from git_command import GitCommand
-from git_refs import R_CHANGES, R_HEADS, R_TAGS
+if is_python3():
+  from http.client import HTTPException
+else:
+  from httplib import HTTPException
 
-# Prefix that is prepended to all the keys of SyncAnalysisState's data
-# that is saved in the config.
-SYNC_STATE_PREFIX = 'repo.syncstate.'
+from git_command import GitCommand
+from git_command import ssh_sock
+from git_command import terminate_ssh_clients
+from git_refs import R_CHANGES, R_HEADS, R_TAGS
 
 ID_RE = re.compile(r'^[0-9a-f]{40}$')
 
@@ -70,15 +90,6 @@ class GitConfig(object):
 
   _USER_CONFIG = '~/.gitconfig'
 
-  _ForSystem = None
-  _SYSTEM_CONFIG = '/etc/gitconfig'
-
-  @classmethod
-  def ForSystem(cls):
-    if cls._ForSystem is None:
-      cls._ForSystem = cls(configfile=cls._SYSTEM_CONFIG)
-    return cls._ForSystem
-
   @classmethod
   def ForUser(cls):
     if cls._ForUser is None:
@@ -104,10 +115,6 @@ class GitConfig(object):
           os.path.dirname(self.file),
           '.repo_' + os.path.basename(self.file) + '.json')
 
-  def ClearCache(self):
-    """Clear the in-memory cache of config."""
-    self._cache_dict = None
-
   def Has(self, name, include_defaults=True):
     """Return true if this configuration file has the key.
     """
@@ -154,21 +161,6 @@ class GitConfig(object):
     except ValueError:
       return None
 
-  def DumpConfigDict(self):
-    """Returns the current configuration dict.
-
-    Configuration data is information only (e.g. logging) and
-    should not be considered a stable data-source.
-
-    Returns:
-      dict of {<key>, <value>} for git configuration cache.
-      <value> are strings converted by GetString.
-    """
-    config_dict = {}
-    for key in self._cache:
-      config_dict[key] = self.GetString(key)
-    return config_dict
-
   def GetBoolean(self, name):
     """Returns a boolean from the configuration file.
        None : The value was not defined, or is not a boolean.
@@ -185,12 +177,6 @@ class GitConfig(object):
       return False
     return None
 
-  def SetBoolean(self, name, value):
-    """Set the truthy value for a key."""
-    if value is not None:
-      value = 'true' if value else 'false'
-    self.SetString(name, value)
-
   def GetString(self, name, all_keys=False):
     """Get the first value for a key, or None if it is not defined.
 
@@ -271,22 +257,6 @@ class GitConfig(object):
       self._branches[b.name] = b
     return b
 
-  def GetSyncAnalysisStateData(self):
-    """Returns data to be logged for the analysis of sync performance."""
-    return {k: v for k, v in self.DumpConfigDict().items() if k.startswith(SYNC_STATE_PREFIX)}
-
-  def UpdateSyncAnalysisState(self, options, superproject_logging_data):
-    """Update Config's SYNC_STATE_PREFIX* data with the latest sync data.
-
-    Args:
-      options: Options passed to sync returned from optparse. See _Options().
-      superproject_logging_data: A dictionary of superproject data that is to be logged.
-
-    Returns:
-      SyncAnalysisState object.
-    """
-    return SyncAnalysisState(self, options, superproject_logging_data)
-
   def GetSubSections(self, section):
     """List all subsection names matching $section.*.*
     """
@@ -353,7 +323,7 @@ class GitConfig(object):
       with open(self._json) as fd:
         return json.load(fd)
     except (IOError, ValueError):
-      platform_utils.remove(self._json, missing_ok=True)
+      platform_utils.remove(self._json)
       return None
 
   def _SaveJson(self, cache):
@@ -361,7 +331,8 @@ class GitConfig(object):
       with open(self._json, 'w') as fd:
         json.dump(cache, fd, indent=2)
     except (IOError, TypeError):
-      platform_utils.remove(self._json, missing_ok=True)
+      if os.path.exists(self._json):
+        platform_utils.remove(self._json)
 
   def _ReadGit(self):
     """
@@ -371,10 +342,11 @@ class GitConfig(object):
 
     """
     c = {}
-    if not os.path.exists(self.file):
-      return c
-
     d = self._do('--null', '--list')
+    if d is None:
+      return c
+    if not is_python3():
+      d = d.decode('utf-8')
     for line in d.rstrip('\0').split('\0'):
       if '\n' in line:
         key, val = line.split('\n', 1)
@@ -390,10 +362,7 @@ class GitConfig(object):
     return c
 
   def _do(self, *args):
-    if self.file == self._SYSTEM_CONFIG:
-      command = ['config', '--system', '--includes']
-    else:
-      command = ['config', '--file', self.file, '--includes']
+    command = ['config', '--file', self.file, '--includes']
     command.extend(args)
 
     p = GitCommand(None,
@@ -403,7 +372,7 @@ class GitConfig(object):
     if p.Wait() == 0:
       return p.stdout
     else:
-      raise GitError('git config %s: %s' % (str(args), p.stderr))
+      GitError('git config %s: %s' % (str(args), p.stderr))
 
 
 class RepoConfig(GitConfig):
@@ -468,6 +437,127 @@ class RefSpec(object):
     return s
 
 
+_master_processes = []
+_master_keys = set()
+_ssh_master = True
+_master_keys_lock = None
+
+
+def init_ssh():
+  """Should be called once at the start of repo to init ssh master handling.
+
+  At the moment, all we do is to create our lock.
+  """
+  global _master_keys_lock
+  assert _master_keys_lock is None, "Should only call init_ssh once"
+  _master_keys_lock = _threading.Lock()
+
+
+def _open_ssh(host, port=None):
+  global _ssh_master
+
+  # Acquire the lock.  This is needed to prevent opening multiple masters for
+  # the same host when we're running "repo sync -jN" (for N > 1) _and_ the
+  # manifest <remote fetch="ssh://xyz"> specifies a different host from the
+  # one that was passed to repo init.
+  _master_keys_lock.acquire()
+  try:
+
+    # Check to see whether we already think that the master is running; if we
+    # think it's already running, return right away.
+    if port is not None:
+      key = '%s:%s' % (host, port)
+    else:
+      key = host
+
+    if key in _master_keys:
+      return True
+
+    if (not _ssh_master
+            or 'GIT_SSH' in os.environ
+            or sys.platform in ('win32', 'cygwin')):
+      # failed earlier, or cygwin ssh can't do this
+      #
+      return False
+
+    # We will make two calls to ssh; this is the common part of both calls.
+    command_base = ['ssh',
+                    '-o', 'ControlPath %s' % ssh_sock(),
+                    host]
+    if port is not None:
+      command_base[1:1] = ['-p', str(port)]
+
+    # Since the key wasn't in _master_keys, we think that master isn't running.
+    # ...but before actually starting a master, we'll double-check.  This can
+    # be important because we can't tell that that 'git@myhost.com' is the same
+    # as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file.
+    check_command = command_base + ['-O', 'check']
+    try:
+      Trace(': %s', ' '.join(check_command))
+      check_process = subprocess.Popen(check_command,
+                                       stdout=subprocess.PIPE,
+                                       stderr=subprocess.PIPE)
+      check_process.communicate()  # read output, but ignore it...
+      isnt_running = check_process.wait()
+
+      if not isnt_running:
+        # Our double-check found that the master _was_ infact running.  Add to
+        # the list of keys.
+        _master_keys.add(key)
+        return True
+    except Exception:
+      # Ignore excpetions.  We we will fall back to the normal command and print
+      # to the log there.
+      pass
+
+    command = command_base[:1] + ['-M', '-N'] + command_base[1:]
+    try:
+      Trace(': %s', ' '.join(command))
+      p = subprocess.Popen(command)
+    except Exception as e:
+      _ssh_master = False
+      print('\nwarn: cannot enable ssh control master for %s:%s\n%s'
+            % (host, port, str(e)), file=sys.stderr)
+      return False
+
+    time.sleep(1)
+    ssh_died = (p.poll() is not None)
+    if ssh_died:
+      return False
+
+    _master_processes.append(p)
+    _master_keys.add(key)
+    return True
+  finally:
+    _master_keys_lock.release()
+
+
+def close_ssh():
+  global _master_keys_lock
+
+  terminate_ssh_clients()
+
+  for p in _master_processes:
+    try:
+      os.kill(p.pid, signal.SIGTERM)
+      p.wait()
+    except OSError:
+      pass
+  del _master_processes[:]
+  _master_keys.clear()
+
+  d = ssh_sock(create=False)
+  if d:
+    try:
+      platform_utils.rmdir(os.path.dirname(d))
+    except OSError:
+      pass
+
+  # We're done with the lock, so we can delete it.
+  _master_keys_lock = None
+
+
+URI_SCP = re.compile(r'^([^@:]*@?[^:/]{1,}):')
 URI_ALL = re.compile(r'^([a-z][a-z+-]*)://([^@/]*@?[^/]*)/')
 
 
@@ -519,6 +609,27 @@ def GetUrlCookieFile(url, quiet):
   yield cookiefile, None
 
 
+def _preconnect(url):
+  m = URI_ALL.match(url)
+  if m:
+    scheme = m.group(1)
+    host = m.group(2)
+    if ':' in host:
+      host, port = host.split(':')
+    else:
+      port = None
+    if scheme in ('ssh', 'git+ssh', 'ssh+git'):
+      return _open_ssh(host, port)
+    return False
+
+  m = URI_SCP.match(url)
+  if m:
+    host = m.group(1)
+    return _open_ssh(host)
+
+  return False
+
+
 class Remote(object):
   """Configuration options related to a remote.
   """
@@ -555,23 +666,9 @@ class Remote(object):
 
     return self.url.replace(longest, longestUrl, 1)
 
-  def PreConnectFetch(self, ssh_proxy):
-    """Run any setup for this remote before we connect to it.
-
-    In practice, if the remote is using SSH, we'll attempt to create a new
-    SSH master session to it for reuse across projects.
-
-    Args:
-      ssh_proxy: The SSH settings for managing master sessions.
-
-    Returns:
-      Whether the preconnect phase for this remote was successful.
-    """
-    if not ssh_proxy:
-      return True
-
+  def PreConnectFetch(self):
     connectionUrl = self._InsteadOf()
-    return ssh_proxy.preconnect(connectionUrl)
+    return _preconnect(connectionUrl)
 
   def ReviewUrl(self, userEmail, validate_certs):
     if self._review_url is None:
@@ -742,70 +839,3 @@ class Branch(object):
   def _Get(self, key, all_keys=False):
     key = 'branch.%s.%s' % (self.name, key)
     return self._config.GetString(key, all_keys=all_keys)
-
-
-class SyncAnalysisState:
-  """Configuration options related to logging of sync state for analysis.
-
-  This object is versioned.
-  """
-  def __init__(self, config, options, superproject_logging_data):
-    """Initializes SyncAnalysisState.
-
-    Saves the following data into the |config| object.
-    - sys.argv, options, superproject's logging data.
-    - repo.*, branch.* and remote.* parameters from config object.
-    - Current time as synctime.
-    - Version number of the object.
-
-    All the keys saved by this object are prepended with SYNC_STATE_PREFIX.
-
-    Args:
-      config: GitConfig object to store all options.
-      options: Options passed to sync returned from optparse. See _Options().
-      superproject_logging_data: A dictionary of superproject data that is to be logged.
-    """
-    self._config = config
-    now = datetime.datetime.utcnow()
-    self._Set('main.synctime', now.isoformat() + 'Z')
-    self._Set('main.version', '1')
-    self._Set('sys.argv', sys.argv)
-    for key, value in superproject_logging_data.items():
-      self._Set(f'superproject.{key}', value)
-    for key, value in options.__dict__.items():
-      self._Set(f'options.{key}', value)
-    config_items = config.DumpConfigDict().items()
-    EXTRACT_NAMESPACES = {'repo', 'branch', 'remote'}
-    self._SetDictionary({k: v for k, v in config_items
-                         if not k.startswith(SYNC_STATE_PREFIX) and
-                         k.split('.', 1)[0] in EXTRACT_NAMESPACES})
-
-  def _SetDictionary(self, data):
-    """Save all key/value pairs of |data| dictionary.
-
-    Args:
-      data: A dictionary whose key/value are to be saved.
-    """
-    for key, value in data.items():
-      self._Set(key, value)
-
-  def _Set(self, key, value):
-    """Set the |value| for a |key| in the |_config| member.
-
-    |key| is prepended with the value of SYNC_STATE_PREFIX constant.
-
-    Args:
-      key: Name of the key.
-      value: |value| could be of any type. If it is 'bool', it will be saved
-             as a Boolean and for all other types, it will be saved as a String.
-    """
-    if value is None:
-      return
-    sync_key = f'{SYNC_STATE_PREFIX}{key}'
-    sync_key = sync_key.replace('_', '')
-    if isinstance(value, str):
-      self._config.SetString(sync_key, value)
-    elif isinstance(value, bool):
-      self._config.SetBoolean(sync_key, value)
-    else:
-      self._config.SetString(sync_key, str(value))

git_refs.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -131,14 +133,11 @@ class GitRefs(object):
     base = os.path.join(self._gitdir, prefix)
     for name in platform_utils.listdir(base):
       p = os.path.join(base, name)
-      # We don't implement the full ref validation algorithm, just the simple
-      # rules that would show up in local filesystems.
-      # https://git-scm.com/docs/git-check-ref-format
-      if name.startswith('.') or name.endswith('.lock'):
-        pass
-      elif platform_utils.isdir(p):
+      if platform_utils.isdir(p):
         self._mtime[prefix] = os.path.getmtime(base)
         self._ReadLoose(prefix + name + '/')
+      elif name.endswith('.lock'):
+        pass
       else:
         self._ReadLoose1(p, prefix + name)
 
@@ -147,7 +146,7 @@ class GitRefs(object):
       with open(path) as fd:
         mtime = os.path.getmtime(path)
         ref_id = fd.readline()
-    except (OSError, UnicodeError):
+    except (IOError, OSError):
       return
 
     try:

git_superproject.py

@@ -1,415 +0,0 @@
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Provide functionality to get all projects and their commit ids from Superproject.
-
-For more information on superproject, check out:
-https://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects
-
-Examples:
-  superproject = Superproject()
-  UpdateProjectsResult = superproject.UpdateProjectsRevisionId(projects)
-"""
-
-import hashlib
-import functools
-import os
-import sys
-import time
-from typing import NamedTuple
-
-from git_command import git_require, GitCommand
-from git_config import RepoConfig
-from git_refs import R_HEADS
-from manifest_xml import LOCAL_MANIFEST_GROUP_PREFIX
-
-_SUPERPROJECT_GIT_NAME = 'superproject.git'
-_SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml'
-
-
-class SyncResult(NamedTuple):
-  """Return the status of sync and whether caller should exit."""
-
-  # Whether the superproject sync was successful.
-  success: bool
-  # Whether the caller should exit.
-  fatal: bool
-
-
-class CommitIdsResult(NamedTuple):
-  """Return the commit ids and whether caller should exit."""
-
-  # A dictionary with the projects/commit ids on success, otherwise None.
-  commit_ids: dict
-  # Whether the caller should exit.
-  fatal: bool
-
-
-class UpdateProjectsResult(NamedTuple):
-  """Return the overriding manifest file and whether caller should exit."""
-
-  # Path name of the overriding manifest file if successful, otherwise None.
-  manifest_path: str
-  # Whether the caller should exit.
-  fatal: bool
-
-
-class Superproject(object):
-  """Get commit ids from superproject.
-
-  Initializes a local copy of a superproject for the manifest. This allows
-  lookup of commit ids for all projects. It contains _project_commit_ids which
-  is a dictionary with project/commit id entries.
-  """
-  def __init__(self, manifest, repodir, git_event_log,
-               superproject_dir='exp-superproject', quiet=False, print_messages=False):
-    """Initializes superproject.
-
-    Args:
-      manifest: A Manifest object that is to be written to a file.
-      repodir: Path to the .repo/ dir for holding all internal checkout state.
-          It must be in the top directory of the repo client checkout.
-      git_event_log: A git trace2 event log to log events.
-      superproject_dir: Relative path under |repodir| to checkout superproject.
-      quiet:  If True then only print the progress messages.
-      print_messages: if True then print error/warning messages.
-    """
-    self._project_commit_ids = None
-    self._manifest = manifest
-    self._git_event_log = git_event_log
-    self._quiet = quiet
-    self._print_messages = print_messages
-    self._branch = manifest.branch
-    self._repodir = os.path.abspath(repodir)
-    self._superproject_dir = superproject_dir
-    self._superproject_path = os.path.join(self._repodir, superproject_dir)
-    self._manifest_path = os.path.join(self._superproject_path,
-                                       _SUPERPROJECT_MANIFEST_NAME)
-    git_name = ''
-    if self._manifest.superproject:
-      remote = self._manifest.superproject['remote']
-      git_name = hashlib.md5(remote.name.encode('utf8')).hexdigest() + '-'
-      self._branch = self._manifest.superproject['revision']
-      self._remote_url = remote.url
-    else:
-      self._remote_url = None
-    self._work_git_name = git_name + _SUPERPROJECT_GIT_NAME
-    self._work_git = os.path.join(self._superproject_path, self._work_git_name)
-
-  @property
-  def project_commit_ids(self):
-    """Returns a dictionary of projects and their commit ids."""
-    return self._project_commit_ids
-
-  @property
-  def manifest_path(self):
-    """Returns the manifest path if the path exists or None."""
-    return self._manifest_path if os.path.exists(self._manifest_path) else None
-
-  def _LogMessage(self, message):
-    """Logs message to stderr and _git_event_log."""
-    if self._print_messages:
-      print(message, file=sys.stderr)
-    self._git_event_log.ErrorEvent(message, f'{message}')
-
-  def _LogMessagePrefix(self):
-    """Returns the prefix string to be logged in each log message"""
-    return f'repo superproject branch: {self._branch} url: {self._remote_url}'
-
-  def _LogError(self, message):
-    """Logs error message to stderr and _git_event_log."""
-    self._LogMessage(f'{self._LogMessagePrefix()} error: {message}')
-
-  def _LogWarning(self, message):
-    """Logs warning message to stderr and _git_event_log."""
-    self._LogMessage(f'{self._LogMessagePrefix()} warning: {message}')
-
-  def _Init(self):
-    """Sets up a local Git repository to get a copy of a superproject.
-
-    Returns:
-      True if initialization is successful, or False.
-    """
-    if not os.path.exists(self._superproject_path):
-      os.mkdir(self._superproject_path)
-    if not self._quiet and not os.path.exists(self._work_git):
-      print('%s: Performing initial setup for superproject; this might take '
-            'several minutes.' % self._work_git)
-    cmd = ['init', '--bare', self._work_git_name]
-    p = GitCommand(None,
-                   cmd,
-                   cwd=self._superproject_path,
-                   capture_stdout=True,
-                   capture_stderr=True)
-    retval = p.Wait()
-    if retval:
-      self._LogWarning(f'git init call failed, command: git {cmd}, '
-                       f'return code: {retval}, stderr: {p.stderr}')
-      return False
-    return True
-
-  def _Fetch(self):
-    """Fetches a local copy of a superproject for the manifest based on |_remote_url|.
-
-    Returns:
-      True if fetch is successful, or False.
-    """
-    if not os.path.exists(self._work_git):
-      self._LogWarning(f'git fetch missing directory: {self._work_git}')
-      return False
-    if not git_require((2, 28, 0)):
-      self._LogWarning('superproject requires a git version 2.28 or later')
-      return False
-    cmd = ['fetch', self._remote_url, '--depth', '1', '--force', '--no-tags',
-           '--filter', 'blob:none']
-    if self._branch:
-      cmd += [self._branch + ':' + self._branch]
-    p = GitCommand(None,
-                   cmd,
-                   cwd=self._work_git,
-                   capture_stdout=True,
-                   capture_stderr=True)
-    retval = p.Wait()
-    if retval:
-      self._LogWarning(f'git fetch call failed, command: git {cmd}, '
-                       f'return code: {retval}, stderr: {p.stderr}')
-      return False
-    return True
-
-  def _LsTree(self):
-    """Gets the commit ids for all projects.
-
-    Works only in git repositories.
-
-    Returns:
-      data: data returned from 'git ls-tree ...' instead of None.
-    """
-    if not os.path.exists(self._work_git):
-      self._LogWarning(f'git ls-tree missing directory: {self._work_git}')
-      return None
-    data = None
-    branch = 'HEAD' if not self._branch else self._branch
-    cmd = ['ls-tree', '-z', '-r', branch]
-
-    p = GitCommand(None,
-                   cmd,
-                   cwd=self._work_git,
-                   capture_stdout=True,
-                   capture_stderr=True)
-    retval = p.Wait()
-    if retval == 0:
-      data = p.stdout
-    else:
-      self._LogWarning(f'git ls-tree call failed, command: git {cmd}, '
-                       f'return code: {retval}, stderr: {p.stderr}')
-    return data
-
-  def Sync(self):
-    """Gets a local copy of a superproject for the manifest.
-
-    Returns:
-      SyncResult
-    """
-    if not self._manifest.superproject:
-      self._LogWarning(f'superproject tag is not defined in manifest: '
-                       f'{self._manifest.manifestFile}')
-      return SyncResult(False, False)
-
-    print('NOTICE: --use-superproject is in beta; report any issues to the '
-          'address described in `repo version`', file=sys.stderr)
-    should_exit = True
-    if not self._remote_url:
-      self._LogWarning(f'superproject URL is not defined in manifest: '
-                       f'{self._manifest.manifestFile}')
-      return SyncResult(False, should_exit)
-
-    if not self._Init():
-      return SyncResult(False, should_exit)
-    if not self._Fetch():
-      return SyncResult(False, should_exit)
-    if not self._quiet:
-      print('%s: Initial setup for superproject completed.' % self._work_git)
-    return SyncResult(True, False)
-
-  def _GetAllProjectsCommitIds(self):
-    """Get commit ids for all projects from superproject and save them in _project_commit_ids.
-
-    Returns:
-      CommitIdsResult
-    """
-    sync_result = self.Sync()
-    if not sync_result.success:
-      return CommitIdsResult(None, sync_result.fatal)
-
-    data = self._LsTree()
-    if not data:
-      self._LogWarning(f'git ls-tree failed to return data for manifest: '
-                       f'{self._manifest.manifestFile}')
-      return CommitIdsResult(None, True)
-
-    # Parse lines like the following to select lines starting with '160000' and
-    # build a dictionary with project path (last element) and its commit id (3rd element).
-    #
-    # 160000 commit 2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea\tart\x00
-    # 120000 blob acc2cbdf438f9d2141f0ae424cec1d8fc4b5d97f\tbootstrap.bash\x00
-    commit_ids = {}
-    for line in data.split('\x00'):
-      ls_data = line.split(None, 3)
-      if not ls_data:
-        break
-      if ls_data[0] == '160000':
-        commit_ids[ls_data[3]] = ls_data[2]
-
-    self._project_commit_ids = commit_ids
-    return CommitIdsResult(commit_ids, False)
-
-  def _WriteManifestFile(self):
-    """Writes manifest to a file.
-
-    Returns:
-      manifest_path: Path name of the file into which manifest is written instead of None.
-    """
-    if not os.path.exists(self._superproject_path):
-      self._LogWarning(f'missing superproject directory: {self._superproject_path}')
-      return None
-    manifest_str = self._manifest.ToXml(groups=self._manifest.GetGroupsStr()).toxml()
-    manifest_path = self._manifest_path
-    try:
-      with open(manifest_path, 'w', encoding='utf-8') as fp:
-        fp.write(manifest_str)
-    except IOError as e:
-      self._LogError(f'cannot write manifest to : {manifest_path} {e}')
-      return None
-    return manifest_path
-
-  def _SkipUpdatingProjectRevisionId(self, project):
-    """Checks if a project's revision id needs to be updated or not.
-
-    Revision id for projects from local manifest will not be updated.
-
-    Args:
-      project: project whose revision id is being updated.
-
-    Returns:
-      True if a project's revision id should not be updated, or False,
-    """
-    path = project.relpath
-    if not path:
-      return True
-    # Skip the project with revisionId.
-    if project.revisionId:
-      return True
-    # Skip the project if it comes from the local manifest.
-    return any(s.startswith(LOCAL_MANIFEST_GROUP_PREFIX) for s in project.groups)
-
-  def UpdateProjectsRevisionId(self, projects):
-    """Update revisionId of every project in projects with the commit id.
-
-    Args:
-      projects: List of projects whose revisionId needs to be updated.
-
-    Returns:
-      UpdateProjectsResult
-    """
-    commit_ids_result = self._GetAllProjectsCommitIds()
-    commit_ids = commit_ids_result.commit_ids
-    if not commit_ids:
-      return UpdateProjectsResult(None, commit_ids_result.fatal)
-
-    projects_missing_commit_ids = []
-    for project in projects:
-      if self._SkipUpdatingProjectRevisionId(project):
-        continue
-      path = project.relpath
-      commit_id = commit_ids.get(path)
-      if not commit_id:
-        projects_missing_commit_ids.append(path)
-
-    # If superproject doesn't have a commit id for a project, then report an
-    # error event and continue as if do not use superproject is specified.
-    if projects_missing_commit_ids:
-      self._LogWarning(f'please file a bug using {self._manifest.contactinfo.bugurl} '
-                       f'to report missing commit_ids for: {projects_missing_commit_ids}')
-      return UpdateProjectsResult(None, False)
-
-    for project in projects:
-      if not self._SkipUpdatingProjectRevisionId(project):
-        project.SetRevisionId(commit_ids.get(project.relpath))
-
-    manifest_path = self._WriteManifestFile()
-    return UpdateProjectsResult(manifest_path, False)
-
-
-@functools.lru_cache(maxsize=None)
-def _UseSuperprojectFromConfiguration():
-  """Returns the user choice of whether to use superproject."""
-  user_cfg = RepoConfig.ForUser()
-  time_now = int(time.time())
-
-  user_value = user_cfg.GetBoolean('repo.superprojectChoice')
-  if user_value is not None:
-    user_expiration = user_cfg.GetInt('repo.superprojectChoiceExpire')
-    if user_expiration is None or user_expiration <= 0 or user_expiration >= time_now:
-      # TODO(b/190688390) - Remove prompt when we are comfortable with the new
-      # default value.
-      if user_value:
-        print(('You are currently enrolled in Git submodules experiment '
-               '(go/android-submodules-quickstart).  Use --no-use-superproject '
-               'to override.\n'), file=sys.stderr)
-      else:
-        print(('You are not currently enrolled in Git submodules experiment '
-               '(go/android-submodules-quickstart).  Use --use-superproject '
-               'to override.\n'), file=sys.stderr)
-      return user_value
-
-  # We don't have an unexpired choice, ask for one.
-  system_cfg = RepoConfig.ForSystem()
-  system_value = system_cfg.GetBoolean('repo.superprojectChoice')
-  if system_value:
-    # The system configuration is proposing that we should enable the
-    # use of superproject. Treat the user as enrolled for two weeks.
-    #
-    # TODO(b/190688390) - Remove prompt when we are comfortable with the new
-    # default value.
-    userchoice = True
-    time_choiceexpire = time_now + (86400 * 14)
-    user_cfg.SetString('repo.superprojectChoiceExpire', str(time_choiceexpire))
-    user_cfg.SetBoolean('repo.superprojectChoice', userchoice)
-    print('You are automatically enrolled in Git submodules experiment '
-          '(go/android-submodules-quickstart) for another two weeks.\n',
-          file=sys.stderr)
-    return True
-
-  # For all other cases, we would not use superproject by default.
-  return False
-
-
-def PrintMessages(opt, manifest):
-  """Returns a boolean if error/warning messages are to be printed."""
-  return opt.use_superproject is not None or manifest.superproject
-
-
-def UseSuperproject(opt, manifest):
-  """Returns a boolean if use-superproject option is enabled."""
-
-  if opt.use_superproject is not None:
-    return opt.use_superproject
-  else:
-    client_value = manifest.manifestProject.config.GetBoolean('repo.superproject')
-    if client_value is not None:
-      return client_value
-    else:
-      if not manifest.superproject:
-        return False
-      return _UseSuperprojectFromConfiguration()

git_trace2_event_log.py

@@ -1,273 +0,0 @@
-# Copyright (C) 2020 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Provide event logging in the git trace2 EVENT format.
-
-The git trace2 EVENT format is defined at:
-https://www.kernel.org/pub/software/scm/git/docs/technical/api-trace2.html#_event_format
-https://git-scm.com/docs/api-trace2#_the_event_format_target
-
-  Usage:
-
-  git_trace_log = EventLog()
-  git_trace_log.StartEvent()
-  ...
-  git_trace_log.ExitEvent()
-  git_trace_log.Write()
-"""
-
-
-import datetime
-import json
-import os
-import sys
-import tempfile
-import threading
-
-from git_command import GitCommand, RepoSourceVersion
-
-
-class EventLog(object):
-  """Event log that records events that occurred during a repo invocation.
-
-  Events are written to the log as a consecutive JSON entries, one per line.
-  Entries follow the git trace2 EVENT format.
-
-  Each entry contains the following common keys:
-  - event: The event name
-  - sid: session-id - Unique string to allow process instance to be identified.
-  - thread: The thread name.
-  - time: is the UTC time of the event.
-
-  Valid 'event' names and event specific fields are documented here:
-  https://git-scm.com/docs/api-trace2#_event_format
-  """
-
-  def __init__(self, env=None):
-    """Initializes the event log."""
-    self._log = []
-    # Try to get session-id (sid) from environment (setup in repo launcher).
-    KEY = 'GIT_TRACE2_PARENT_SID'
-    if env is None:
-      env = os.environ
-
-    now = datetime.datetime.utcnow()
-
-    # Save both our sid component and the complete sid.
-    # We use our sid component (self._sid) as the unique filename prefix and
-    # the full sid (self._full_sid) in the log itself.
-    self._sid = 'repo-%s-P%08x' % (now.strftime('%Y%m%dT%H%M%SZ'), os.getpid())
-    parent_sid = env.get(KEY)
-    # Append our sid component to the parent sid (if it exists).
-    if parent_sid is not None:
-      self._full_sid = parent_sid + '/' + self._sid
-    else:
-      self._full_sid = self._sid
-
-    # Set/update the environment variable.
-    # Environment handling across systems is messy.
-    try:
-      env[KEY] = self._full_sid
-    except UnicodeEncodeError:
-      env[KEY] = self._full_sid.encode()
-
-    # Add a version event to front of the log.
-    self._AddVersionEvent()
-
-  @property
-  def full_sid(self):
-    return self._full_sid
-
-  def _AddVersionEvent(self):
-    """Adds a 'version' event at the beginning of current log."""
-    version_event = self._CreateEventDict('version')
-    version_event['evt'] = "2"
-    version_event['exe'] = RepoSourceVersion()
-    self._log.insert(0, version_event)
-
-  def _CreateEventDict(self, event_name):
-    """Returns a dictionary with the common keys/values for git trace2 events.
-
-    Args:
-      event_name: The event name.
-
-    Returns:
-      Dictionary with the common event fields populated.
-    """
-    return {
-        'event': event_name,
-        'sid': self._full_sid,
-        'thread': threading.currentThread().getName(),
-        'time': datetime.datetime.utcnow().isoformat() + 'Z',
-    }
-
-  def StartEvent(self):
-    """Append a 'start' event to the current log."""
-    start_event = self._CreateEventDict('start')
-    start_event['argv'] = sys.argv
-    self._log.append(start_event)
-
-  def ExitEvent(self, result):
-    """Append an 'exit' event to the current log.
-
-    Args:
-      result: Exit code of the event
-    """
-    exit_event = self._CreateEventDict('exit')
-
-    # Consider 'None' success (consistent with event_log result handling).
-    if result is None:
-      result = 0
-    exit_event['code'] = result
-    self._log.append(exit_event)
-
-  def CommandEvent(self, name, subcommands):
-    """Append a 'command' event to the current log.
-
-    Args:
-      name: Name of the primary command (ex: repo, git)
-      subcommands: List of the sub-commands (ex: version, init, sync)
-    """
-    command_event = self._CreateEventDict('command')
-    command_event['name'] = name
-    command_event['subcommands'] = subcommands
-    self._log.append(command_event)
-
-  def LogConfigEvents(self, config, event_dict_name):
-    """Append a |event_dict_name| event for each config key in |config|.
-
-    Args:
-      config: Configuration dictionary.
-      event_dict_name: Name of the event dictionary for items to be logged under.
-    """
-    for param, value in config.items():
-      event = self._CreateEventDict(event_dict_name)
-      event['param'] = param
-      event['value'] = value
-      self._log.append(event)
-
-  def DefParamRepoEvents(self, config):
-    """Append a 'def_param' event for each repo.* config key to the current log.
-
-    Args:
-      config: Repo configuration dictionary
-    """
-    # Only output the repo.* config parameters.
-    repo_config = {k: v for k, v in config.items() if k.startswith('repo.')}
-    self.LogConfigEvents(repo_config, 'def_param')
-
-  def GetDataEventName(self, value):
-    """Returns 'data-json' if the value is an array else returns 'data'."""
-    return 'data-json' if value[0] == '[' and value[-1] == ']' else 'data'
-
-  def LogDataConfigEvents(self, config, prefix):
-    """Append a 'data' event for each config key/value in |config| to the current log.
-
-    For each keyX and valueX of the config, "key" field of the event is '|prefix|/keyX'
-    and the "value" of the "key" field is valueX.
-
-    Args:
-      config: Configuration dictionary.
-      prefix: Prefix for each key that is logged.
-    """
-    for key, value in config.items():
-      event = self._CreateEventDict(self.GetDataEventName(value))
-      event['key'] = f'{prefix}/{key}'
-      event['value'] = value
-      self._log.append(event)
-
-  def ErrorEvent(self, msg, fmt):
-    """Append a 'error' event to the current log."""
-    error_event = self._CreateEventDict('error')
-    error_event['msg'] = msg
-    error_event['fmt'] = fmt
-    self._log.append(error_event)
-
-  def _GetEventTargetPath(self):
-    """Get the 'trace2.eventtarget' path from git configuration.
-
-    Returns:
-      path: git config's 'trace2.eventtarget' path if it exists, or None
-    """
-    path = None
-    cmd = ['config', '--get', 'trace2.eventtarget']
-    # TODO(https://crbug.com/gerrit/13706): Use GitConfig when it supports
-    # system git config variables.
-    p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True,
-                   bare=True)
-    retval = p.Wait()
-    if retval == 0:
-      # Strip trailing carriage-return in path.
-      path = p.stdout.rstrip('\n')
-    elif retval != 1:
-      # `git config --get` is documented to produce an exit status of `1` if
-      # the requested variable is not present in the configuration. Report any
-      # other return value as an error.
-      print("repo: error: 'git config --get' call failed with return code: %r, stderr: %r" % (
-          retval, p.stderr), file=sys.stderr)
-    return path
-
-  def Write(self, path=None):
-    """Writes the log out to a file.
-
-    Log is only written if 'path' or 'git config --get trace2.eventtarget'
-    provide a valid path to write logs to.
-
-    Logging filename format follows the git trace2 style of being a unique
-    (exclusive writable) file.
-
-    Args:
-      path: Path to where logs should be written.
-
-    Returns:
-      log_path: Path to the log file if log is written, otherwise None
-    """
-    log_path = None
-    # If no logging path is specified, get the path from 'trace2.eventtarget'.
-    if path is None:
-      path = self._GetEventTargetPath()
-
-    # If no logging path is specified, exit.
-    if path is None:
-      return None
-
-    if isinstance(path, str):
-      # Get absolute path.
-      path = os.path.abspath(os.path.expanduser(path))
-    else:
-      raise TypeError('path: str required but got %s.' % type(path))
-
-    # Git trace2 requires a directory to write log to.
-
-    # TODO(https://crbug.com/gerrit/13706): Support file (append) mode also.
-    if not os.path.isdir(path):
-      return None
-    # Use NamedTemporaryFile to generate a unique filename as required by git trace2.
-    try:
-      with tempfile.NamedTemporaryFile(mode='x', prefix=self._sid, dir=path,
-                                       delete=False) as f:
-        # TODO(https://crbug.com/gerrit/13706): Support writing events as they
-        # occur.
-        for e in self._log:
-          # Dump in compact encoding mode.
-          # See 'Compact encoding' in Python docs:
-          # https://docs.python.org/3/library/json.html#module-json
-          json.dump(e, f, indent=None, separators=(',', ':'))
-          f.write('\n')
-        log_path = f.name
-    except FileExistsError as err:
-      print('repo: warning: git trace2 logging failed: %r' % err,
-            file=sys.stderr)
-      return None
-    return log_path

gitc_utils.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2015 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import os
-import multiprocessing
 import platform
 import re
 import sys
@@ -36,15 +38,6 @@ def parse_clientdir(gitc_fs_path):
   return wrapper.Wrapper().gitc_parse_clientdir(gitc_fs_path)
 
 
-def _get_project_revision(args):
-  """Worker for _set_project_revisions to lookup one project remote."""
-  (i, url, expr) = args
-  gitcmd = git_command.GitCommand(
-      None, ['ls-remote', url, expr], capture_stdout=True, cwd='/tmp')
-  rc = gitcmd.Wait()
-  return (i, rc, gitcmd.stdout.split('\t', 1)[0])
-
-
 def _set_project_revisions(projects):
   """Sets the revisionExpr for a list of projects.
 
@@ -52,38 +45,49 @@ def _set_project_revisions(projects):
   should not be overly large. Recommend calling this function multiple times
   with each call not exceeding NUM_BATCH_RETRIEVE_REVISIONID projects.
 
-  Args:
-    projects: List of project objects to set the revionExpr for.
+  @param projects: List of project objects to set the revionExpr for.
   """
   # Retrieve the commit id for each project based off of it's current
   # revisionExpr and it is not already a commit id.
-  with multiprocessing.Pool(NUM_BATCH_RETRIEVE_REVISIONID) as pool:
-    results_iter = pool.imap_unordered(
-        _get_project_revision,
-        ((i, project.remote.url, project.revisionExpr)
-         for i, project in enumerate(projects)
-         if not git_config.IsId(project.revisionExpr)),
-        chunksize=8)
-    for (i, rc, revisionExpr) in results_iter:
-      project = projects[i]
-      if rc:
-        print('FATAL: Failed to retrieve revisionExpr for %s' % project.name)
-        pool.terminate()
-        sys.exit(1)
-      if not revisionExpr:
-        pool.terminate()
-        raise ManifestParseError('Invalid SHA-1 revision project %s (%s)' %
-                                 (project.remote.url, project.revisionExpr))
-      project.revisionExpr = revisionExpr
+  project_gitcmds = [(
+      project, git_command.GitCommand(None,
+                                      ['ls-remote',
+                                       project.remote.url,
+                                       project.revisionExpr],
+                                      capture_stdout=True, cwd='/tmp'))
+                     for project in projects if not git_config.IsId(project.revisionExpr)]
+  for proj, gitcmd in project_gitcmds:
+    if gitcmd.Wait():
+      print('FATAL: Failed to retrieve revisionExpr for %s' % proj)
+      sys.exit(1)
+    revisionExpr = gitcmd.stdout.split('\t')[0]
+    if not revisionExpr:
+      raise ManifestParseError('Invalid SHA-1 revision project %s (%s)' %
+                               (proj.remote.url, proj.revisionExpr))
+    proj.revisionExpr = revisionExpr
+
+
+def _manifest_groups(manifest):
+  """Returns the manifest group string that should be synced
+
+  This is the same logic used by Command.GetProjects(), which is used during
+  repo sync
+
+  @param manifest: The XmlManifest object
+  """
+  mp = manifest.manifestProject
+  groups = mp.config.GetString('manifest.groups')
+  if not groups:
+    groups = 'default,platform-' + platform.system().lower()
+  return groups
 
 
 def generate_gitc_manifest(gitc_manifest, manifest, paths=None):
   """Generate a manifest for shafsd to use for this GITC client.
 
-  Args:
-    gitc_manifest: Current gitc manifest, or None if there isn't one yet.
-    manifest: A GitcManifest object loaded with the current repo manifest.
-    paths: List of project paths we want to update.
+  @param gitc_manifest: Current gitc manifest, or None if there isn't one yet.
+  @param manifest: A GitcManifest object loaded with the current repo manifest.
+  @param paths: List of project paths we want to update.
   """
 
   print('Generating GITC Manifest by fetching revision SHAs for each '
@@ -91,7 +95,7 @@ def generate_gitc_manifest(gitc_manifest, manifest, paths=None):
   if paths is None:
     paths = list(manifest.paths.keys())
 
-  groups = [x for x in re.split(r'[,\s]+', manifest.GetGroupsStr()) if x]
+  groups = [x for x in re.split(r'[,\s]+', _manifest_groups(manifest)) if x]
 
   # Convert the paths to projects, and filter them to the matched groups.
   projects = [manifest.paths[p] for p in paths]
@@ -119,7 +123,11 @@ def generate_gitc_manifest(gitc_manifest, manifest, paths=None):
         else:
           proj.revisionExpr = gitc_proj.revisionExpr
 
-  _set_project_revisions(projects)
+  index = 0
+  while index < len(projects):
+    _set_project_revisions(
+        projects[index:(index + NUM_BATCH_RETRIEVE_REVISIONID)])
+    index += NUM_BATCH_RETRIEVE_REVISIONID
 
   if gitc_manifest is not None:
     for path, proj in gitc_manifest.paths.items():
@@ -141,16 +149,13 @@ def generate_gitc_manifest(gitc_manifest, manifest, paths=None):
 def save_manifest(manifest, client_dir=None):
   """Save the manifest file in the client_dir.
 
-  Args:
-    manifest: Manifest object to save.
-    client_dir: Client directory to save the manifest in.
+  @param client_dir: Client directory to save the manifest in.
+  @param manifest: Manifest object to save.
   """
   if not client_dir:
-    manifest_file = manifest.manifestFile
-  else:
-    manifest_file = os.path.join(client_dir, '.manifest')
-  with open(manifest_file, 'w') as f:
-    manifest.Save(f, groups=manifest.GetGroupsStr())
+    client_dir = manifest.gitc_client_dir
+  with open(os.path.join(client_dir, '.manifest'), 'w') as f:
+    manifest.Save(f, groups=_manifest_groups(manifest))
   # TODO(sbasi/jorg): Come up with a solution to remove the sleep below.
   # Give the GITC filesystem time to register the manifest changes.
   time.sleep(3)

hooks.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +14,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import errno
 import json
 import os
 import re
-import subprocess
 import sys
 import traceback
-import urllib.parse
 
 from error import HookError
 from git_refs import HEAD
 
+from pyversion import is_python3
+if is_python3():
+  import urllib.parse
+else:
+  import imp
+  import urlparse
+  urllib = imp.new_module('urllib')
+  urllib.parse = urlparse
+  input = raw_input  # noqa: F821
 
 class RepoHook(object):
   """A RepoHook contains information about a script to run as a hook.
@@ -37,29 +45,13 @@ class RepoHook(object):
 
   Hooks are always python.  When a hook is run, we will load the hook into the
   interpreter and execute its main() function.
-
-  Combinations of hook option flags:
-  - no-verify=False, verify=False (DEFAULT):
-    If stdout is a tty, can prompt about running hooks if needed.
-    If user denies running hooks, the action is cancelled. If stdout is
-    not a tty and we would need to prompt about hooks, action is
-    cancelled.
-  - no-verify=False, verify=True:
-    Always run hooks with no prompt.
-  - no-verify=True, verify=False:
-    Never run hooks, but run action anyway (AKA bypass hooks).
-  - no-verify=True, verify=True:
-    Invalid
   """
 
   def __init__(self,
                hook_type,
                hooks_project,
-               repo_topdir,
+               topdir,
                manifest_url,
-               bypass_hooks=False,
-               allow_all_hooks=False,
-               ignore_hooks=False,
                abort_if_user_denies=False):
     """RepoHook constructor.
 
@@ -67,27 +59,20 @@ class RepoHook(object):
       hook_type: A string representing the type of hook.  This is also used
           to figure out the name of the file containing the hook.  For
           example: 'pre-upload'.
-      hooks_project: The project containing the repo hooks.
-          If you have a manifest, this is manifest.repo_hooks_project.
-          OK if this is None, which will make the hook a no-op.
-      repo_topdir: The top directory of the repo client checkout.
-          This is the one containing the .repo directory. Scripts will
-          run with CWD as this directory.
-          If you have a manifest, this is manifest.topdir.
+      hooks_project: The project containing the repo hooks.  If you have a
+          manifest, this is manifest.repo_hooks_project.  OK if this is None,
+          which will make the hook a no-op.
+      topdir: Repo's top directory (the one containing the .repo directory).
+          Scripts will run with CWD as this directory.  If you have a manifest,
+          this is manifest.topdir
       manifest_url: The URL to the manifest git repo.
-      bypass_hooks: If True, then 'Do not run the hook'.
-      allow_all_hooks: If True, then 'Run the hook without prompting'.
-      ignore_hooks: If True, then 'Do not abort action if hooks fail'.
-      abort_if_user_denies: If True, we'll abort running the hook if the user
+      abort_if_user_denies: If True, we'll throw a HookError() if the user
           doesn't allow us to run the hook.
     """
     self._hook_type = hook_type
     self._hooks_project = hooks_project
-    self._repo_topdir = repo_topdir
     self._manifest_url = manifest_url
-    self._bypass_hooks = bypass_hooks
-    self._allow_all_hooks = allow_all_hooks
-    self._ignore_hooks = ignore_hooks
+    self._topdir = topdir
     self._abort_if_user_denies = abort_if_user_denies
 
     # Store the full path to the script for convenience.
@@ -123,7 +108,7 @@ class RepoHook(object):
     # NOTE: Local (non-committed) changes will not be factored into this hash.
     # I think this is OK, since we're really only worried about warning the user
     # about upstream changes.
-    return self._hooks_project.work_git.rev_parse(HEAD)
+    return self._hooks_project.work_git.rev_parse('HEAD')
 
   def _GetMustVerb(self):
     """Return 'must' if the hook is required; 'should' if not."""
@@ -362,7 +347,7 @@ context['main'](**kwargs)
 
     try:
       # Always run hooks with CWD as topdir.
-      os.chdir(self._repo_topdir)
+      os.chdir(self._topdir)
 
       # Put the hook dir as the first item of sys.path so hooks can do
       # relative imports.  We want to replace the repo dir as [0] so
@@ -412,12 +397,7 @@ context['main'](**kwargs)
       sys.path = orig_syspath
       os.chdir(orig_path)
 
-  def _CheckHook(self):
-    # Bail with a nice error if we can't find the hook.
-    if not os.path.isfile(self._script_fullpath):
-      raise HookError('Couldn\'t find repo hook: %s' % self._script_fullpath)
-
-  def Run(self, **kwargs):
+  def Run(self, user_allows_all_hooks, **kwargs):
     """Run the hook.
 
     If the hook doesn't exist (because there is no hooks project or because
@@ -430,80 +410,22 @@ context['main'](**kwargs)
           to the hook type.  For instance, pre-upload hooks will contain
           a project_list.
 
-    Returns:
-      True: On success or ignore hooks by user-request
-      False: The hook failed. The caller should respond with aborting the action.
-        Some examples in which False is returned:
-        * Finding the hook failed while it was enabled, or
-        * the user declined to run a required hook (from _CheckForHookApproval)
-        In all these cases the user did not pass the proper arguments to
-        ignore the result through the option combinations as listed in
-        AddHookOptionGroup().
+    Raises:
+      HookError: If there was a problem finding the hook or the user declined
+          to run a required hook (from _CheckForHookApproval).
     """
-    # Do not do anything in case bypass_hooks is set, or
-    # no-op if there is no hooks project or if hook is disabled.
-    if (self._bypass_hooks or
-        not self._hooks_project or
-        self._hook_type not in self._hooks_project.enabled_repo_hooks):
-      return True
+    # No-op if there is no hooks project or if hook is disabled.
+    if ((not self._hooks_project) or (self._hook_type not in
+                                      self._hooks_project.enabled_repo_hooks)):
+      return
 
-    passed = True
-    try:
-      self._CheckHook()
+    # Bail with a nice error if we can't find the hook.
+    if not os.path.isfile(self._script_fullpath):
+      raise HookError('Couldn\'t find repo hook: "%s"' % self._script_fullpath)
 
-      # Make sure the user is OK with running the hook.
-      if self._allow_all_hooks or self._CheckForHookApproval():
-        # Run the hook with the same version of python we're using.
-        self._ExecuteHook(**kwargs)
-    except SystemExit as e:
-      passed = False
-      print('ERROR: %s hooks exited with exit code: %s' % (self._hook_type, str(e)),
-            file=sys.stderr)
-    except HookError as e:
-      passed = False
-      print('ERROR: %s' % str(e), file=sys.stderr)
+    # Make sure the user is OK with running the hook.
+    if (not user_allows_all_hooks) and (not self._CheckForHookApproval()):
+      return
 
-    if not passed and self._ignore_hooks:
-      print('\nWARNING: %s hooks failed, but continuing anyways.' % self._hook_type,
-            file=sys.stderr)
-      passed = True
-
-    return passed
-
-  @classmethod
-  def FromSubcmd(cls, manifest, opt, *args, **kwargs):
-    """Method to construct the repo hook class
-
-    Args:
-      manifest: The current active manifest for this command from which we
-          extract a couple of fields.
-      opt: Contains the commandline options for the action of this hook.
-          It should contain the options added by AddHookOptionGroup() in which
-          we are interested in RepoHook execution.
-    """
-    for key in ('bypass_hooks', 'allow_all_hooks', 'ignore_hooks'):
-      kwargs.setdefault(key, getattr(opt, key))
-    kwargs.update({
-        'hooks_project': manifest.repo_hooks_project,
-        'repo_topdir': manifest.topdir,
-        'manifest_url': manifest.manifestProject.GetRemote('origin').url,
-    })
-    return cls(*args, **kwargs)
-
-  @staticmethod
-  def AddOptionGroup(parser, name):
-    """Help options relating to the various hooks."""
-
-    # Note that verify and no-verify are NOT opposites of each other, which
-    # is why they store to different locations. We are using them to match
-    # 'git commit' syntax.
-    group = parser.add_option_group(name + ' hooks')
-    group.add_option('--no-verify',
-                     dest='bypass_hooks', action='store_true',
-                     help='Do not run the %s hook.' % name)
-    group.add_option('--verify',
-                     dest='allow_all_hooks', action='store_true',
-                     help='Run the %s hook without prompting.' % name)
-    group.add_option('--ignore-hooks',
-                     action='store_true',
-                     help='Do not abort if %s hooks fail.' % name)
+    # Run the hook with the same version of python we're using.
+    self._ExecuteHook(**kwargs)

main.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@@ -20,6 +21,7 @@ People shouldn't run this directly; instead, they should use the `repo` wrapper
 which takes care of execing this entry point.
 """
 
+from __future__ import print_function
 import getpass
 import netrc
 import optparse
@@ -28,7 +30,15 @@ import shlex
 import sys
 import textwrap
 import time
-import urllib.request
+
+from pyversion import is_python3
+if is_python3():
+  import urllib.request
+else:
+  import imp
+  import urllib2
+  urllib = imp.new_module('urllib')
+  urllib.request = urllib2
 
 try:
   import kerberos
@@ -39,8 +49,7 @@ from color import SetDefaultColoring
 import event_log
 from repo_trace import SetTrace
 from git_command import user_agent
-from git_config import RepoConfig
-from git_trace2_event_log import EventLog
+from git_config import init_ssh, close_ssh, RepoConfig
 from command import InteractiveCommand
 from command import MirrorSafeCommand
 from command import GitcAvailableCommand, GitcClientCommand
@@ -54,12 +63,14 @@ from error import NoManifestException
 from error import NoSuchProjectError
 from error import RepoChangedException
 import gitc_utils
-from manifest_xml import GitcClient, RepoClient
+from manifest_xml import GitcManifest, XmlManifest
 from pager import RunPager, TerminatePager
 from wrapper import WrapperPath, Wrapper
 
 from subcmds import all_commands
 
+if not is_python3():
+  input = raw_input  # noqa: F821
 
 # NB: These do not need to be kept in sync with the repo launcher script.
 # These may be much newer as it allows the repo launcher to roll between
@@ -71,13 +82,12 @@ from subcmds import all_commands
 #
 # python-3.6 is in Ubuntu Bionic.
 MIN_PYTHON_VERSION_SOFT = (3, 6)
-MIN_PYTHON_VERSION_HARD = (3, 6)
+MIN_PYTHON_VERSION_HARD = (3, 4)
 
 if sys.version_info.major < 3:
-  print('repo: error: Python 2 is no longer supported; '
+  print('repo: warning: Python 2 is no longer supported; '
         'Please upgrade to Python {}.{}+.'.format(*MIN_PYTHON_VERSION_SOFT),
         file=sys.stderr)
-  sys.exit(1)
 else:
   if sys.version_info < MIN_PYTHON_VERSION_HARD:
     print('repo: error: Python 3 version is too old; '
@@ -95,8 +105,6 @@ global_options = optparse.OptionParser(
     add_help_option=False)
 global_options.add_option('-h', '--help', action='store_true',
                           help='show this help message and exit')
-global_options.add_option('--help-all', action='store_true',
-                          help='show this help message with all subcommands and exit')
 global_options.add_option('-p', '--paginate',
                           dest='pager', action='store_true',
                           help='display command output in the pager')
@@ -118,15 +126,9 @@ global_options.add_option('--time',
 global_options.add_option('--version',
                           dest='show_version', action='store_true',
                           help='display this version of repo')
-global_options.add_option('--show-toplevel',
-                          action='store_true',
-                          help='display the path of the top-level directory of '
-                               'the repo client checkout')
 global_options.add_option('--event-log',
                           dest='event_log', action='store',
                           help='filename of event log to append timeline to')
-global_options.add_option('--git-trace2-event-log', action='store',
-                          help='directory to write git trace2 event log to')
 
 
 class _Repo(object):
@@ -134,40 +136,34 @@ class _Repo(object):
     self.repodir = repodir
     self.commands = all_commands
 
-  def _PrintHelp(self, short: bool = False, all_commands: bool = False):
-    """Show --help screen."""
-    global_options.print_help()
-    print()
-    if short:
-      commands = ' '.join(sorted(self.commands))
-      wrapped_commands = textwrap.wrap(commands, width=77)
-      print('Available commands:\n  %s' % ('\n  '.join(wrapped_commands),))
-      print('\nRun `repo help <command>` for command-specific details.')
-      print('Bug reports:', Wrapper().BUG_URL)
-    else:
-      cmd = self.commands['help']()
-      if all_commands:
-        cmd.PrintAllCommandsBody()
-      else:
-        cmd.PrintCommonCommandsBody()
-
   def _ParseArgs(self, argv):
     """Parse the main `repo` command line options."""
-    for i, arg in enumerate(argv):
-      if not arg.startswith('-'):
-        name = arg
-        glob = argv[:i]
+    name = None
+    glob = []
+
+    for i in range(len(argv)):
+      if not argv[i].startswith('-'):
+        name = argv[i]
+        if i > 0:
+          glob = argv[:i]
         argv = argv[i + 1:]
         break
-    else:
-      name = None
+    if not name:
       glob = argv
+      name = 'help'
       argv = []
     gopts, _gargs = global_options.parse_args(glob)
 
-    if name:
-      name, alias_args = self._ExpandAlias(name)
-      argv = alias_args + argv
+    name, alias_args = self._ExpandAlias(name)
+    argv = alias_args + argv
+
+    if gopts.help:
+      global_options.print_help()
+      commands = ' '.join(sorted(self.commands))
+      wrapped_commands = textwrap.wrap(commands, width=77)
+      print('\nAvailable commands:\n  %s' % ('\n  '.join(wrapped_commands),))
+      print('\nRun `repo help <command>` for command-specific details.')
+      global_options.exit()
 
     return (name, gopts, argv)
 
@@ -198,45 +194,31 @@ class _Repo(object):
 
     if gopts.trace:
       SetTrace()
-
-    # Handle options that terminate quickly first.
-    if gopts.help or gopts.help_all:
-      self._PrintHelp(short=False, all_commands=gopts.help_all)
-      return 0
-    elif gopts.show_version:
-      # Always allow global --version regardless of subcommand validity.
-      name = 'version'
-    elif gopts.show_toplevel:
-      print(os.path.dirname(self.repodir))
-      return 0
-    elif not name:
-      # No subcommand specified, so show the help/subcommand.
-      self._PrintHelp(short=True)
-      return 1
+    if gopts.show_version:
+      if name == 'help':
+        name = 'version'
+      else:
+        print('fatal: invalid usage of --version', file=sys.stderr)
+        return 1
 
     SetDefaultColoring(gopts.color)
 
-    git_trace2_event_log = EventLog()
-    repo_client = RepoClient(self.repodir)
-    gitc_manifest = None
-    gitc_client_name = gitc_utils.parse_clientdir(os.getcwd())
-    if gitc_client_name:
-      gitc_manifest = GitcClient(self.repodir, gitc_client_name)
-      repo_client.isGitcClient = True
-
     try:
-      cmd = self.commands[name](
-          repodir=self.repodir,
-          client=repo_client,
-          manifest=repo_client.manifest,
-          gitc_manifest=gitc_manifest,
-          git_event_log=git_trace2_event_log)
+      cmd = self.commands[name]()
     except KeyError:
       print("repo: '%s' is not a repo command.  See 'repo help'." % name,
             file=sys.stderr)
       return 1
 
-    Editor.globalConfig = cmd.client.globalConfig
+    cmd.repodir = self.repodir
+    cmd.manifest = XmlManifest(cmd.repodir)
+    cmd.gitc_manifest = None
+    gitc_client_name = gitc_utils.parse_clientdir(os.getcwd())
+    if gitc_client_name:
+      cmd.gitc_manifest = GitcManifest(cmd.repodir, gitc_client_name)
+      cmd.manifest.isGitcClient = True
+
+    Editor.globalConfig = cmd.manifest.globalConfig
 
     if not isinstance(cmd, MirrorSafeCommand) and cmd.manifest.IsMirror:
       print("fatal: '%s' requires a working directory" % name,
@@ -264,7 +246,7 @@ class _Repo(object):
       return 1
 
     if gopts.pager is not False and not isinstance(cmd, InteractiveCommand):
-      config = cmd.client.globalConfig
+      config = cmd.manifest.globalConfig
       if gopts.pager:
         use_pager = True
       else:
@@ -277,11 +259,7 @@ class _Repo(object):
     start = time.time()
     cmd_event = cmd.event_log.Add(name, event_log.TASK_COMMAND, start)
     cmd.event_log.SetParent(cmd_event)
-    git_trace2_event_log.StartEvent()
-    git_trace2_event_log.CommandEvent(name='repo', subcommands=[name])
-
     try:
-      cmd.CommonValidateOptions(copts, cargs)
       cmd.ValidateOptions(copts, cargs)
       result = cmd.Execute(copts, cargs)
     except (DownloadError, ManifestInvalidRevisionError,
@@ -323,15 +301,10 @@ class _Repo(object):
 
       cmd.event_log.FinishEvent(cmd_event, finish,
                                 result is None or result == 0)
-      git_trace2_event_log.DefParamRepoEvents(
-          cmd.manifest.manifestProject.config.DumpConfigDict())
-      git_trace2_event_log.ExitEvent(result)
-
       if gopts.event_log:
         cmd.event_log.Write(os.path.abspath(
                             os.path.expanduser(gopts.event_log)))
 
-      git_trace2_event_log.Write(gopts.git_trace2_event_log)
     return result
 
 
@@ -615,16 +588,20 @@ def _Main(argv):
 
   repo = _Repo(opt.repodir)
   try:
-    init_http()
-    name, gopts, argv = repo._ParseArgs(argv)
-    run = lambda: repo._Run(name, gopts, argv) or 0
-    if gopts.trace_python:
-      import trace
-      tracer = trace.Trace(count=False, trace=True, timing=True,
-                           ignoredirs=set(sys.path[1:]))
-      result = tracer.runfunc(run)
-    else:
-      result = run()
+    try:
+      init_ssh()
+      init_http()
+      name, gopts, argv = repo._ParseArgs(argv)
+      run = lambda: repo._Run(name, gopts, argv) or 0
+      if gopts.trace_python:
+        import trace
+        tracer = trace.Trace(count=False, trace=True, timing=True,
+                             ignoredirs=set(sys.path[1:]))
+        result = tracer.runfunc(run)
+      else:
+        result = run()
+    finally:
+      close_ssh()
   except KeyboardInterrupt:
     print('aborted by user', file=sys.stderr)
     result = 1

man/repo-abandon.1

@@ -1,36 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo abandon" "Repo Manual"
-.SH NAME
-repo \- repo abandon - manual page for repo abandon
-.SH SYNOPSIS
-.B repo
-\fI\,abandon \/\fR[\fI\,--all | <branchname>\/\fR] [\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Permanently abandon a development branch
-.PP
-This subcommand permanently abandons a development branch by
-deleting it (and all its history) from your local repository.
-.PP
-It is equivalent to "git branch \fB\-D\fR <branchname>".
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-\-all\fR
-delete all branches in all projects
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help abandon` to view the detailed manual.

man/repo-branch.1

@@ -1 +0,0 @@
-.so man1/repo-branches.1

man/repo-branches.1

@@ -1,59 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo branches" "Repo Manual"
-.SH NAME
-repo \- repo branches - manual page for repo branches
-.SH SYNOPSIS
-.B repo
-\fI\,branches \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-View current topic branches
-.PP
-Summarizes the currently available topic branches.
-.PP
-# Branch Display
-.PP
-The branch display output by this command is organized into four
-columns of information; for example:
-.TP
-*P nocolor
-| in repo
-.TP
-repo2
-|
-.PP
-The first column contains a * if the branch is the currently
-checked out branch in any of the specified projects, or a blank
-if no project has the branch checked out.
-.PP
-The second column contains either blank, p or P, depending upon
-the upload status of the branch.
-.IP
-(blank): branch not yet published by repo upload
-.IP
-P: all commits were published by repo upload
-p: only some commits were published by repo upload
-.PP
-The third column contains the branch name.
-.PP
-The fourth column (after the | separator) lists the projects that
-the branch appears in, or does not appear in.  If no project list
-is shown, then the branch appears in all projects.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help branches` to view the detailed manual.

man/repo-checkout.1

@@ -1,36 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo checkout" "Repo Manual"
-.SH NAME
-repo \- repo checkout - manual page for repo checkout
-.SH SYNOPSIS
-.B repo
-\fI\,checkout <branchname> \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Checkout a branch for development
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help checkout` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo checkout' command checks out an existing branch that was previously
-created by 'repo start'.
-.PP
-The command is equivalent to:
-.IP
-repo forall [<project>...] \fB\-c\fR git checkout <branchname>

man/repo-cherry-pick.1

@@ -1,28 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo cherry-pick" "Repo Manual"
-.SH NAME
-repo \- repo cherry-pick - manual page for repo cherry-pick
-.SH SYNOPSIS
-.B repo
-\fI\,cherry-pick <sha1>\/\fR
-.SH DESCRIPTION
-Summary
-.PP
-Cherry\-pick a change.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help cherry\-pick` to view the detailed manual.
-.SH DETAILS
-.PP
-\&'repo cherry\-pick' cherry\-picks a change from one branch to another. The change
-id will be updated, and a reference to the old change id will be added.

man/repo-diff.1

@@ -1,35 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo diff" "Repo Manual"
-.SH NAME
-repo \- repo diff - manual page for repo diff
-.SH SYNOPSIS
-.B repo
-\fI\,diff \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Show changes between commit and working tree
-.PP
-The \fB\-u\fR option causes 'repo diff' to generate diff output with file paths
-relative to the repository root, so the output can be applied
-to the Unix 'patch' command.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-u\fR, \fB\-\-absolute\fR
-paths are relative to the repository root
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help diff` to view the detailed manual.

man/repo-diffmanifests.1

@@ -1,61 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo diffmanifests" "Repo Manual"
-.SH NAME
-repo \- repo diffmanifests - manual page for repo diffmanifests
-.SH SYNOPSIS
-.B repo
-\fI\,diffmanifests manifest1.xml \/\fR[\fI\,manifest2.xml\/\fR] [\fI\,options\/\fR]
-.SH DESCRIPTION
-Summary
-.PP
-Manifest diff utility
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-\-raw\fR
-display raw diff
-.TP
-\fB\-\-no\-color\fR
-does not display the diff in color
-.TP
-\fB\-\-pretty\-format=\fR<FORMAT>
-print the log using a custom git pretty format string
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help diffmanifests` to view the detailed manual.
-.SH DETAILS
-.PP
-The repo diffmanifests command shows differences between project revisions of
-manifest1 and manifest2. if manifest2 is not specified, current manifest.xml
-will be used instead. Both absolute and relative paths may be used for
-manifests. Relative paths start from project's ".repo/manifests" folder.
-.PP
-The \fB\-\-raw\fR option Displays the diff in a way that facilitates parsing, the
-project pattern will be <status> <path> <revision from> [<revision to>] and the
-commit pattern will be <status> <onelined log> with status values respectively :
-.IP
-A = Added project
-R = Removed project
-C = Changed project
-U = Project with unreachable revision(s) (revision(s) not found)
-.PP
-for project, and
-.IP
-A = Added commit
-R = Removed commit
-.PP
-for a commit.
-.PP
-Only changed projects may contain commits, and commit status always starts with
-a space, and are part of last printed project. Unreachable revisions may occur
-if project is not up to date or if repo has not been initialized with all the
-groups, in which case some projects won't be synced and their revisions won't be
-found.

man/repo-download.1

@@ -1,44 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo download" "Repo Manual"
-.SH NAME
-repo \- repo download - manual page for repo download
-.SH SYNOPSIS
-.B repo
-\fI\,download {\/\fR[\fI\,project\/\fR] \fI\,change\/\fR[\fI\,/patchset\/\fR]\fI\,}\/\fR...
-.SH DESCRIPTION
-Summary
-.PP
-Download and checkout a change
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-b\fR BRANCH, \fB\-\-branch\fR=\fI\,BRANCH\/\fR
-create a new branch first
-.TP
-\fB\-c\fR, \fB\-\-cherry\-pick\fR
-cherry\-pick instead of checkout
-.TP
-\fB\-x\fR, \fB\-\-record\-origin\fR
-pass \fB\-x\fR when cherry\-picking
-.TP
-\fB\-r\fR, \fB\-\-revert\fR
-revert instead of checkout
-.TP
-\fB\-f\fR, \fB\-\-ff\-only\fR
-force fast\-forward merge
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help download` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo download' command downloads a change from the review system and makes
-it available in your project's local working directory. If no project is
-specified try to use current directory as a project.

man/repo-forall.1

@@ -1,128 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo forall" "Repo Manual"
-.SH NAME
-repo \- repo forall - manual page for repo forall
-.SH SYNOPSIS
-.B repo
-\fI\,forall \/\fR[\fI\,<project>\/\fR...] \fI\,-c <command> \/\fR[\fI\,<arg>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Run a shell command in each project
-.PP
-repo forall \fB\-r\fR str1 [str2] ... \fB\-c\fR <command> [<arg>...]
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-r\fR, \fB\-\-regex\fR
-execute the command only on projects matching regex or
-wildcard expression
-.TP
-\fB\-i\fR, \fB\-\-inverse\-regex\fR
-execute the command only on projects not matching
-regex or wildcard expression
-.TP
-\fB\-g\fR GROUPS, \fB\-\-groups\fR=\fI\,GROUPS\/\fR
-execute the command only on projects matching the
-specified groups
-.TP
-\fB\-c\fR, \fB\-\-command\fR
-command (and arguments) to execute
-.TP
-\fB\-e\fR, \fB\-\-abort\-on\-errors\fR
-abort if a command exits unsuccessfully
-.TP
-\fB\-\-ignore\-missing\fR
-silently skip & do not exit non\-zero due missing
-checkouts
-.TP
-\fB\-\-interactive\fR
-force interactive usage
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.TP
-\fB\-p\fR
-show project headers before output
-.PP
-Run `repo help forall` to view the detailed manual.
-.SH DETAILS
-.PP
-Executes the same shell command in each project.
-.PP
-The \fB\-r\fR option allows running the command only on projects matching regex or
-wildcard expression.
-.PP
-By default, projects are processed non\-interactively in parallel. If you want to
-run interactive commands, make sure to pass \fB\-\-interactive\fR to force \fB\-\-jobs\fR 1.
-While the processing order of projects is not guaranteed, the order of project
-output is stable.
-.PP
-Output Formatting
-.PP
-The \fB\-p\fR option causes 'repo forall' to bind pipes to the command's stdin, stdout
-and stderr streams, and pipe all output into a continuous stream that is
-displayed in a single pager session. Project headings are inserted before the
-output of each command is displayed. If the command produces no output in a
-project, no heading is displayed.
-.PP
-The formatting convention used by \fB\-p\fR is very suitable for some types of
-searching, e.g. `repo forall \fB\-p\fR \fB\-c\fR git log \fB\-SFoo\fR` will print all commits that
-add or remove references to Foo.
-.PP
-The \fB\-v\fR option causes 'repo forall' to display stderr messages if a command
-produces output only on stderr. Normally the \fB\-p\fR option causes command output to
-be suppressed until the command produces at least one byte of output on stdout.
-.PP
-Environment
-.PP
-pwd is the project's working directory. If the current client is a mirror
-client, then pwd is the Git repository.
-.PP
-REPO_PROJECT is set to the unique name of the project.
-.PP
-REPO_PATH is the path relative the the root of the client.
-.PP
-REPO_REMOTE is the name of the remote system from the manifest.
-.PP
-REPO_LREV is the name of the revision from the manifest, translated to a local
-tracking branch. If you need to pass the manifest revision to a locally executed
-git command, use REPO_LREV.
-.PP
-REPO_RREV is the name of the revision from the manifest, exactly as written in
-the manifest.
-.PP
-REPO_COUNT is the total number of projects being iterated.
-.PP
-REPO_I is the current (1\-based) iteration count. Can be used in conjunction with
-REPO_COUNT to add a simple progress indicator to your command.
-.PP
-REPO__* are any extra environment variables, specified by the "annotation"
-element under any project element. This can be useful for differentiating trees
-based on user\-specific criteria, or simply annotating tree details.
-.PP
-shell positional arguments ($1, $2, .., $#) are set to any arguments following
-<command>.
-.PP
-Example: to list projects:
-.IP
-repo forall \fB\-c\fR 'echo $REPO_PROJECT'
-.PP
-Notice that $REPO_PROJECT is quoted to ensure it is expanded in the context of
-running <command> instead of in the calling shell.
-.PP
-Unless \fB\-p\fR is used, stdin, stdout, stderr are inherited from the terminal and are
-not redirected.
-.PP
-If \fB\-e\fR is used, when a command exits unsuccessfully, 'repo forall' will abort
-without iterating through the remaining projects.

man/repo-gitc-delete.1

@@ -1,31 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo gitc-delete" "Repo Manual"
-.SH NAME
-repo \- repo gitc-delete - manual page for repo gitc-delete
-.SH SYNOPSIS
-.B repo
-\fI\,gitc-delete\/\fR
-.SH DESCRIPTION
-Summary
-.PP
-Delete a GITC Client.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-force the deletion (no prompt)
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help gitc\-delete` to view the detailed manual.
-.SH DETAILS
-.PP
-This subcommand deletes the current GITC client, deleting the GITC manifest and
-all locally downloaded sources.

man/repo-gitc-init.1

@@ -1,151 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "November 2021" "repo gitc-init" "Repo Manual"
-.SH NAME
-repo \- repo gitc-init - manual page for repo gitc-init
-.SH SYNOPSIS
-.B repo
-\fI\,gitc-init \/\fR[\fI\,options\/\fR] [\fI\,client name\/\fR]
-.SH DESCRIPTION
-Summary
-.PP
-Initialize a GITC Client.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.SS Manifest options:
-.TP
-\fB\-u\fR URL, \fB\-\-manifest\-url\fR=\fI\,URL\/\fR
-manifest repository location
-.TP
-\fB\-b\fR REVISION, \fB\-\-manifest\-branch\fR=\fI\,REVISION\/\fR
-manifest branch or revision (use HEAD for default)
-.TP
-\fB\-m\fR NAME.xml, \fB\-\-manifest\-name\fR=\fI\,NAME\/\fR.xml
-initial manifest file
-.TP
-\fB\-g\fR GROUP, \fB\-\-groups\fR=\fI\,GROUP\/\fR
-restrict manifest projects to ones with specified
-group(s) [default|all|G1,G2,G3|G4,\-G5,\-G6]
-.TP
-\fB\-p\fR PLATFORM, \fB\-\-platform\fR=\fI\,PLATFORM\/\fR
-restrict manifest projects to ones with a specified
-platform group [auto|all|none|linux|darwin|...]
-.TP
-\fB\-\-submodules\fR
-sync any submodules associated with the manifest repo
-.TP
-\fB\-\-standalone\-manifest\fR
-download the manifest as a static file rather then
-create a git checkout of the manifest repo
-.SS Manifest (only) checkout options:
-.TP
-\fB\-\-current\-branch\fR
-fetch only current manifest branch from server
-.TP
-\fB\-\-no\-current\-branch\fR
-fetch all manifest branches from server
-.TP
-\fB\-\-tags\fR
-fetch tags in the manifest
-.TP
-\fB\-\-no\-tags\fR
-don't fetch tags in the manifest
-.SS Checkout modes:
-.TP
-\fB\-\-mirror\fR
-create a replica of the remote repositories rather
-than a client working directory
-.TP
-\fB\-\-archive\fR
-checkout an archive instead of a git repository for
-each project. See git archive.
-.TP
-\fB\-\-worktree\fR
-use git\-worktree to manage projects
-.SS Project checkout optimizations:
-.TP
-\fB\-\-reference\fR=\fI\,DIR\/\fR
-location of mirror directory
-.TP
-\fB\-\-dissociate\fR
-dissociate from reference mirrors after clone
-.TP
-\fB\-\-depth\fR=\fI\,DEPTH\/\fR
-create a shallow clone with given depth; see git clone
-.TP
-\fB\-\-partial\-clone\fR
-perform partial clone (https://gitscm.com/docs/gitrepositorylayout#_code_partialclone_code)
-.TP
-\fB\-\-no\-partial\-clone\fR
-disable use of partial clone (https://gitscm.com/docs/gitrepositorylayout#_code_partialclone_code)
-.TP
-\fB\-\-partial\-clone\-exclude\fR=\fI\,PARTIAL_CLONE_EXCLUDE\/\fR
-exclude the specified projects (a comma\-delimited
-project names) from partial clone (https://gitscm.com/docs/gitrepositorylayout#_code_partialclone_code)
-.TP
-\fB\-\-clone\-filter\fR=\fI\,CLONE_FILTER\/\fR
-filter for use with \fB\-\-partial\-clone\fR [default:
-blob:none]
-.TP
-\fB\-\-use\-superproject\fR
-use the manifest superproject to sync projects;
-implies \fB\-c\fR
-.TP
-\fB\-\-no\-use\-superproject\fR
-disable use of manifest superprojects
-.TP
-\fB\-\-clone\-bundle\fR
-enable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS (default if
-not \fB\-\-partial\-clone\fR)
-.TP
-\fB\-\-no\-clone\-bundle\fR
-disable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS (default if
-\fB\-\-partial\-clone\fR)
-.SS repo Version options:
-.TP
-\fB\-\-repo\-url\fR=\fI\,URL\/\fR
-repo repository location ($REPO_URL)
-.TP
-\fB\-\-repo\-rev\fR=\fI\,REV\/\fR
-repo branch or revision ($REPO_REV)
-.TP
-\fB\-\-no\-repo\-verify\fR
-do not verify repo source code
-.SS Other options:
-.TP
-\fB\-\-config\-name\fR
-Always prompt for name/e\-mail
-.SS GITC options:
-.TP
-\fB\-f\fR MANIFEST_FILE, \fB\-\-manifest\-file\fR=\fI\,MANIFEST_FILE\/\fR
-Optional manifest file to use for this GITC client.
-.TP
-\fB\-c\fR GITC_CLIENT, \fB\-\-gitc\-client\fR=\fI\,GITC_CLIENT\/\fR
-Name of the gitc_client instance to create or modify.
-.PP
-Run `repo help gitc\-init` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo gitc\-init' command is ran to initialize a new GITC client for use with
-the GITC file system.
-.PP
-This command will setup the client directory, initialize repo, just like repo
-init does, and then downloads the manifest collection and installs it in the
-\&.repo/directory of the GITC client.
-.PP
-Once this is done, a GITC manifest is generated by pulling the HEAD SHA for each
-project and generates the properly formatted XML file and installs it as
-\&.manifest in the GITC client directory.
-.PP
-The \fB\-c\fR argument is required to specify the GITC client name.
-.PP
-The optional \fB\-f\fR argument can be used to specify the manifest file to use for
-this GITC client.

man/repo-grep.1

@@ -1,119 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo grep" "Repo Manual"
-.SH NAME
-repo \- repo grep - manual page for repo grep
-.SH SYNOPSIS
-.B repo
-\fI\,grep {pattern | -e pattern} \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Print lines matching a pattern
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.SS Logging options:
-.TP
-\fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.SS Sources:
-.TP
-\fB\-\-cached\fR
-Search the index, instead of the work tree
-.TP
-\fB\-r\fR TREEish, \fB\-\-revision\fR=\fI\,TREEish\/\fR
-Search TREEish, instead of the work tree
-.SS Pattern:
-.TP
-\fB\-e\fR PATTERN
-Pattern to search for
-.TP
-\fB\-i\fR, \fB\-\-ignore\-case\fR
-Ignore case differences
-.TP
-\fB\-a\fR, \fB\-\-text\fR
-Process binary files as if they were text
-.TP
-\fB\-I\fR
-Don't match the pattern in binary files
-.TP
-\fB\-w\fR, \fB\-\-word\-regexp\fR
-Match the pattern only at word boundaries
-.TP
-\fB\-v\fR, \fB\-\-invert\-match\fR
-Select non\-matching lines
-.TP
-\fB\-G\fR, \fB\-\-basic\-regexp\fR
-Use POSIX basic regexp for patterns (default)
-.TP
-\fB\-E\fR, \fB\-\-extended\-regexp\fR
-Use POSIX extended regexp for patterns
-.TP
-\fB\-F\fR, \fB\-\-fixed\-strings\fR
-Use fixed strings (not regexp) for pattern
-.SS Pattern Grouping:
-.TP
-\fB\-\-all\-match\fR
-Limit match to lines that have all patterns
-.TP
-\fB\-\-and\fR, \fB\-\-or\fR, \fB\-\-not\fR
-Boolean operators to combine patterns
-.TP
-\-(, \-)
-Boolean operator grouping
-.SS Output:
-.TP
-\fB\-n\fR
-Prefix the line number to matching lines
-.TP
-\fB\-C\fR CONTEXT
-Show CONTEXT lines around match
-.TP
-\fB\-B\fR CONTEXT
-Show CONTEXT lines before match
-.TP
-\fB\-A\fR CONTEXT
-Show CONTEXT lines after match
-.TP
-\fB\-l\fR, \fB\-\-name\-only\fR, \fB\-\-files\-with\-matches\fR
-Show only file names containing matching lines
-.TP
-\fB\-L\fR, \fB\-\-files\-without\-match\fR
-Show only file names not containing matching lines
-.PP
-Run `repo help grep` to view the detailed manual.
-.SH DETAILS
-.PP
-Search for the specified patterns in all project files.
-.PP
-Boolean Options
-.PP
-The following options can appear as often as necessary to express the pattern to
-locate:
-.HP
-\fB\-e\fR PATTERN
-.HP
-\fB\-\-and\fR, \fB\-\-or\fR, \fB\-\-not\fR, \-(, \-)
-.PP
-Further, the \fB\-r\fR/\-\-revision option may be specified multiple times in order to
-scan multiple trees. If the same file matches in more than one tree, only the
-first result is reported, prefixed by the revision name it was found under.
-.PP
-Examples
-.PP
-Look for a line that has '#define' and either 'MAX_PATH or 'PATH_MAX':
-.IP
-repo grep \fB\-e\fR '#define' \fB\-\-and\fR \-\e( \fB\-e\fR MAX_PATH \fB\-e\fR PATH_MAX \e)
-.PP
-Look for a line that has 'NODE' or 'Unexpected' in files that contain a line
-that matches both expressions:
-.IP
-repo grep \fB\-\-all\-match\fR \fB\-e\fR NODE \fB\-e\fR Unexpected

man/repo-help.1

@@ -1,33 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo help" "Repo Manual"
-.SH NAME
-repo \- repo help - manual page for repo help
-.SH SYNOPSIS
-.B repo
-\fI\,help \/\fR[\fI\,--all|command\/\fR]
-.SH DESCRIPTION
-Summary
-.PP
-Display detailed help on a command
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-a\fR, \fB\-\-all\fR
-show the complete list of commands
-.TP
-\fB\-\-help\-all\fR
-show the \fB\-\-help\fR of all commands
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help help` to view the detailed manual.
-.SH DETAILS
-.PP
-Displays detailed usage information about a command.

man/repo-info.1

@@ -1,40 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo info" "Repo Manual"
-.SH NAME
-repo \- repo info - manual page for repo info
-.SH SYNOPSIS
-.B repo
-\fI\,info \/\fR[\fI\,-dl\/\fR] [\fI\,-o \/\fR[\fI\,-c\/\fR]] [\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Get info on the manifest branch, current branch or unmerged branches
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-d\fR, \fB\-\-diff\fR
-show full info and commit diff including remote
-branches
-.TP
-\fB\-o\fR, \fB\-\-overview\fR
-show overview of all local commits
-.TP
-\fB\-c\fR, \fB\-\-current\-branch\fR
-consider only checked out branches
-.TP
-\fB\-\-no\-current\-branch\fR
-consider all local branches
-.TP
-\fB\-l\fR, \fB\-\-local\-only\fR
-disable all remote operations
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help info` to view the detailed manual.

man/repo-init.1

@@ -1,171 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "November 2021" "repo init" "Repo Manual"
-.SH NAME
-repo \- repo init - manual page for repo init
-.SH SYNOPSIS
-.B repo
-\fI\,init \/\fR[\fI\,options\/\fR] [\fI\,manifest url\/\fR]
-.SH DESCRIPTION
-Summary
-.PP
-Initialize a repo client checkout in the current directory
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.SS Manifest options:
-.TP
-\fB\-u\fR URL, \fB\-\-manifest\-url\fR=\fI\,URL\/\fR
-manifest repository location
-.TP
-\fB\-b\fR REVISION, \fB\-\-manifest\-branch\fR=\fI\,REVISION\/\fR
-manifest branch or revision (use HEAD for default)
-.TP
-\fB\-m\fR NAME.xml, \fB\-\-manifest\-name\fR=\fI\,NAME\/\fR.xml
-initial manifest file
-.TP
-\fB\-g\fR GROUP, \fB\-\-groups\fR=\fI\,GROUP\/\fR
-restrict manifest projects to ones with specified
-group(s) [default|all|G1,G2,G3|G4,\-G5,\-G6]
-.TP
-\fB\-p\fR PLATFORM, \fB\-\-platform\fR=\fI\,PLATFORM\/\fR
-restrict manifest projects to ones with a specified
-platform group [auto|all|none|linux|darwin|...]
-.TP
-\fB\-\-submodules\fR
-sync any submodules associated with the manifest repo
-.TP
-\fB\-\-standalone\-manifest\fR
-download the manifest as a static file rather then
-create a git checkout of the manifest repo
-.SS Manifest (only) checkout options:
-.TP
-\fB\-c\fR, \fB\-\-current\-branch\fR
-fetch only current manifest branch from server
-.TP
-\fB\-\-no\-current\-branch\fR
-fetch all manifest branches from server
-.TP
-\fB\-\-tags\fR
-fetch tags in the manifest
-.TP
-\fB\-\-no\-tags\fR
-don't fetch tags in the manifest
-.SS Checkout modes:
-.TP
-\fB\-\-mirror\fR
-create a replica of the remote repositories rather
-than a client working directory
-.TP
-\fB\-\-archive\fR
-checkout an archive instead of a git repository for
-each project. See git archive.
-.TP
-\fB\-\-worktree\fR
-use git\-worktree to manage projects
-.SS Project checkout optimizations:
-.TP
-\fB\-\-reference\fR=\fI\,DIR\/\fR
-location of mirror directory
-.TP
-\fB\-\-dissociate\fR
-dissociate from reference mirrors after clone
-.TP
-\fB\-\-depth\fR=\fI\,DEPTH\/\fR
-create a shallow clone with given depth; see git clone
-.TP
-\fB\-\-partial\-clone\fR
-perform partial clone (https://gitscm.com/docs/gitrepositorylayout#_code_partialclone_code)
-.TP
-\fB\-\-no\-partial\-clone\fR
-disable use of partial clone (https://gitscm.com/docs/gitrepositorylayout#_code_partialclone_code)
-.TP
-\fB\-\-partial\-clone\-exclude\fR=\fI\,PARTIAL_CLONE_EXCLUDE\/\fR
-exclude the specified projects (a comma\-delimited
-project names) from partial clone (https://gitscm.com/docs/gitrepositorylayout#_code_partialclone_code)
-.TP
-\fB\-\-clone\-filter\fR=\fI\,CLONE_FILTER\/\fR
-filter for use with \fB\-\-partial\-clone\fR [default:
-blob:none]
-.TP
-\fB\-\-use\-superproject\fR
-use the manifest superproject to sync projects;
-implies \fB\-c\fR
-.TP
-\fB\-\-no\-use\-superproject\fR
-disable use of manifest superprojects
-.TP
-\fB\-\-clone\-bundle\fR
-enable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS (default if
-not \fB\-\-partial\-clone\fR)
-.TP
-\fB\-\-no\-clone\-bundle\fR
-disable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS (default if
-\fB\-\-partial\-clone\fR)
-.SS repo Version options:
-.TP
-\fB\-\-repo\-url\fR=\fI\,URL\/\fR
-repo repository location ($REPO_URL)
-.TP
-\fB\-\-repo\-rev\fR=\fI\,REV\/\fR
-repo branch or revision ($REPO_REV)
-.TP
-\fB\-\-no\-repo\-verify\fR
-do not verify repo source code
-.SS Other options:
-.TP
-\fB\-\-config\-name\fR
-Always prompt for name/e\-mail
-.PP
-Run `repo help init` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo init' command is run once to install and initialize repo. The latest
-repo source code and manifest collection is downloaded from the server and is
-installed in the .repo/ directory in the current working directory.
-.PP
-When creating a new checkout, the manifest URL is the only required setting. It
-may be specified using the \fB\-\-manifest\-url\fR option, or as the first optional
-argument.
-.PP
-The optional \fB\-b\fR argument can be used to select the manifest branch to checkout
-and use. If no branch is specified, the remote's default branch is used. This is
-equivalent to using \fB\-b\fR HEAD.
-.PP
-The optional \fB\-m\fR argument can be used to specify an alternate manifest to be
-used. If no manifest is specified, the manifest default.xml will be used.
-.PP
-If the \fB\-\-standalone\-manifest\fR argument is set, the manifest will be downloaded
-directly from the specified \fB\-\-manifest\-url\fR as a static file (rather than setting
-up a manifest git checkout). With \fB\-\-standalone\-manifest\fR, the manifest will be
-fully static and will not be re\-downloaded during subsesquent `repo init` and
-`repo sync` calls.
-.PP
-The \fB\-\-reference\fR option can be used to point to a directory that has the content
-of a \fB\-\-mirror\fR sync. This will make the working directory use as much data as
-possible from the local reference directory when fetching from the server. This
-will make the sync go a lot faster by reducing data traffic on the network.
-.PP
-The \fB\-\-dissociate\fR option can be used to borrow the objects from the directory
-specified with the \fB\-\-reference\fR option only to reduce network transfer, and stop
-borrowing from them after a first clone is made by making necessary local copies
-of borrowed objects.
-.PP
-The \fB\-\-no\-clone\-bundle\fR option disables any attempt to use \fI\,$URL/clone.bundle\/\fP to
-bootstrap a new Git repository from a resumeable bundle file on a content
-delivery network. This may be necessary if there are problems with the local
-Python HTTP client or proxy configuration, but the Git binary works.
-.PP
-Switching Manifest Branches
-.PP
-To switch to another manifest branch, `repo init \fB\-b\fR otherbranch` may be used in
-an existing client. However, as this only updates the manifest, a subsequent
-`repo sync` (or `repo sync \fB\-d\fR`) is necessary to update the working directory
-files.

man/repo-list.1

@@ -1,61 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo list" "Repo Manual"
-.SH NAME
-repo \- repo list - manual page for repo list
-.SH SYNOPSIS
-.B repo
-\fI\,list \/\fR[\fI\,-f\/\fR] [\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-List projects and their associated directories
-.PP
-repo list [\-f] \fB\-r\fR str1 [str2]...
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-r\fR, \fB\-\-regex\fR
-filter the project list based on regex or wildcard
-matching of strings
-.TP
-\fB\-g\fR GROUPS, \fB\-\-groups\fR=\fI\,GROUPS\/\fR
-filter the project list based on the groups the
-project is in
-.TP
-\fB\-a\fR, \fB\-\-all\fR
-show projects regardless of checkout state
-.TP
-\fB\-n\fR, \fB\-\-name\-only\fR
-display only the name of the repository
-.TP
-\fB\-p\fR, \fB\-\-path\-only\fR
-display only the path of the repository
-.TP
-\fB\-f\fR, \fB\-\-fullpath\fR
-display the full work tree path instead of the
-relative path
-.TP
-\fB\-\-relative\-to\fR=\fI\,PATH\/\fR
-display paths relative to this one (default: top of
-repo client checkout)
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help list` to view the detailed manual.
-.SH DETAILS
-.PP
-List all projects; pass '.' to list the project for the cwd.
-.PP
-By default, only projects that currently exist in the checkout are shown. If you
-want to list all projects (using the specified filter settings), use the \fB\-\-all\fR
-option. If you want to show all projects regardless of the manifest groups, then
-also pass \fB\-\-groups\fR all.
-.PP
-This is similar to running: repo forall \fB\-c\fR 'echo "$REPO_PATH : $REPO_PROJECT"'.

man/repo-manifest.1

@@ -1,559 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "November 2021" "repo manifest" "Repo Manual"
-.SH NAME
-repo \- repo manifest - manual page for repo manifest
-.SH SYNOPSIS
-.B repo
-\fI\,manifest \/\fR[\fI\,-o {-|NAME.xml}\/\fR] [\fI\,-m MANIFEST.xml\/\fR] [\fI\,-r\/\fR]
-.SH DESCRIPTION
-Summary
-.PP
-Manifest inspection utility
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-r\fR, \fB\-\-revision\-as\-HEAD\fR
-save revisions as current HEAD
-.TP
-\fB\-m\fR NAME.xml, \fB\-\-manifest\-name\fR=\fI\,NAME\/\fR.xml
-temporary manifest to use for this sync
-.TP
-\fB\-\-suppress\-upstream\-revision\fR
-if in \fB\-r\fR mode, do not write the upstream field (only
-of use if the branch names for a sha1 manifest are
-sensitive)
-.TP
-\fB\-\-suppress\-dest\-branch\fR
-if in \fB\-r\fR mode, do not write the dest\-branch field
-(only of use if the branch names for a sha1 manifest
-are sensitive)
-.TP
-\fB\-\-json\fR
-output manifest in JSON format (experimental)
-.TP
-\fB\-\-pretty\fR
-format output for humans to read
-.TP
-\fB\-\-no\-local\-manifests\fR
-ignore local manifests
-.TP
-\fB\-o\fR \-|NAME.xml, \fB\-\-output\-file\fR=\fI\,\-\/\fR|NAME.xml
-file to save the manifest to
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help manifest` to view the detailed manual.
-.SH DETAILS
-.PP
-With the \fB\-o\fR option, exports the current manifest for inspection. The manifest
-and (if present) local_manifests/ are combined together to produce a single
-manifest file. This file can be stored in a Git repository for use during future
-\&'repo init' invocations.
-.PP
-The \fB\-r\fR option can be used to generate a manifest file with project revisions set
-to the current commit hash. These are known as "revision locked manifests", as
-they don't follow a particular branch. In this case, the 'upstream' attribute is
-set to the ref we were on when the manifest was generated. The 'dest\-branch'
-attribute is set to indicate the remote ref to push changes to via 'repo
-upload'.
-.PP
-repo Manifest Format
-.PP
-A repo manifest describes the structure of a repo client; that is the
-directories that are visible and where they should be obtained from with git.
-.PP
-The basic structure of a manifest is a bare Git repository holding a single
-`default.xml` XML file in the top level directory.
-.PP
-Manifests are inherently version controlled, since they are kept within a Git
-repository. Updates to manifests are automatically obtained by clients during
-`repo sync`.
-.PP
-[TOC]
-.PP
-XML File Format
-.PP
-A manifest XML file (e.g. `default.xml`) roughly conforms to the following DTD:
-.PP
-```xml <!DOCTYPE manifest [
-.TP
-<!ELEMENT manifest (notice?,
-remote*,
-default?,
-manifest\-server?,
-remove\-project*,
-project*,
-extend\-project*,
-repo\-hooks?,
-superproject?,
-contactinfo?,
-include*)>
-.IP
-<!ELEMENT notice (#PCDATA)>
-.IP
-<!ELEMENT remote (annotation*)>
-<!ATTLIST remote name         ID    #REQUIRED>
-<!ATTLIST remote alias        CDATA #IMPLIED>
-<!ATTLIST remote fetch        CDATA #REQUIRED>
-<!ATTLIST remote pushurl      CDATA #IMPLIED>
-<!ATTLIST remote review       CDATA #IMPLIED>
-<!ATTLIST remote revision     CDATA #IMPLIED>
-.IP
-<!ELEMENT default EMPTY>
-<!ATTLIST default remote      IDREF #IMPLIED>
-<!ATTLIST default revision    CDATA #IMPLIED>
-<!ATTLIST default dest\-branch CDATA #IMPLIED>
-<!ATTLIST default upstream    CDATA #IMPLIED>
-<!ATTLIST default sync\-j      CDATA #IMPLIED>
-<!ATTLIST default sync\-c      CDATA #IMPLIED>
-<!ATTLIST default sync\-s      CDATA #IMPLIED>
-<!ATTLIST default sync\-tags   CDATA #IMPLIED>
-.IP
-<!ELEMENT manifest\-server EMPTY>
-<!ATTLIST manifest\-server url CDATA #REQUIRED>
-.TP
-<!ELEMENT project (annotation*,
-project*,
-copyfile*,
-linkfile*)>
-.TP
-<!ATTLIST project name
-CDATA #REQUIRED>
-.TP
-<!ATTLIST project path
-CDATA #IMPLIED>
-.TP
-<!ATTLIST project remote
-IDREF #IMPLIED>
-.TP
-<!ATTLIST project revision
-CDATA #IMPLIED>
-.IP
-<!ATTLIST project dest\-branch CDATA #IMPLIED>
-<!ATTLIST project groups      CDATA #IMPLIED>
-<!ATTLIST project sync\-c      CDATA #IMPLIED>
-<!ATTLIST project sync\-s      CDATA #IMPLIED>
-<!ATTLIST project sync\-tags   CDATA #IMPLIED>
-<!ATTLIST project upstream CDATA #IMPLIED>
-<!ATTLIST project clone\-depth CDATA #IMPLIED>
-<!ATTLIST project force\-path CDATA #IMPLIED>
-.IP
-<!ELEMENT annotation EMPTY>
-<!ATTLIST annotation name  CDATA #REQUIRED>
-<!ATTLIST annotation value CDATA #REQUIRED>
-<!ATTLIST annotation keep  CDATA "true">
-.IP
-<!ELEMENT copyfile EMPTY>
-<!ATTLIST copyfile src  CDATA #REQUIRED>
-<!ATTLIST copyfile dest CDATA #REQUIRED>
-.IP
-<!ELEMENT linkfile EMPTY>
-<!ATTLIST linkfile src CDATA #REQUIRED>
-<!ATTLIST linkfile dest CDATA #REQUIRED>
-.IP
-<!ELEMENT extend\-project EMPTY>
-<!ATTLIST extend\-project name CDATA #REQUIRED>
-<!ATTLIST extend\-project path CDATA #IMPLIED>
-<!ATTLIST extend\-project dest\-path CDATA #IMPLIED>
-<!ATTLIST extend\-project groups CDATA #IMPLIED>
-<!ATTLIST extend\-project revision CDATA #IMPLIED>
-<!ATTLIST extend\-project remote CDATA #IMPLIED>
-.IP
-<!ELEMENT remove\-project EMPTY>
-<!ATTLIST remove\-project name  CDATA #REQUIRED>
-<!ATTLIST remove\-project optional  CDATA #IMPLIED>
-.IP
-<!ELEMENT repo\-hooks EMPTY>
-<!ATTLIST repo\-hooks in\-project CDATA #REQUIRED>
-<!ATTLIST repo\-hooks enabled\-list CDATA #REQUIRED>
-.IP
-<!ELEMENT superproject EMPTY>
-<!ATTLIST superproject name     CDATA #REQUIRED>
-<!ATTLIST superproject remote   IDREF #IMPLIED>
-<!ATTLIST superproject revision CDATA #IMPLIED>
-.IP
-<!ELEMENT contactinfo EMPTY>
-<!ATTLIST contactinfo bugurl  CDATA #REQUIRED>
-.IP
-<!ELEMENT include EMPTY>
-<!ATTLIST include name   CDATA #REQUIRED>
-<!ATTLIST include groups CDATA #IMPLIED>
-.PP
-]>
-```
-.PP
-For compatibility purposes across repo releases, all unknown elements are
-silently ignored. However, repo reserves all possible names for itself for
-future use. If you want to use custom elements, the `x\-*` namespace is reserved
-for that purpose, and repo guarantees to never allocate any corresponding names.
-.PP
-A description of the elements and their attributes follows.
-.PP
-Element manifest
-.PP
-The root element of the file.
-.PP
-Element notice
-.PP
-Arbitrary text that is displayed to users whenever `repo sync` finishes. The
-content is simply passed through as it exists in the manifest.
-.PP
-Element remote
-.PP
-One or more remote elements may be specified. Each remote element specifies a
-Git URL shared by one or more projects and (optionally) the Gerrit review server
-those projects upload changes through.
-.PP
-Attribute `name`: A short name unique to this manifest file. The name specified
-here is used as the remote name in each project's .git/config, and is therefore
-automatically available to commands like `git fetch`, `git remote`, `git pull`
-and `git push`.
-.PP
-Attribute `alias`: The alias, if specified, is used to override `name` to be set
-as the remote name in each project's .git/config. Its value can be duplicated
-while attribute `name` has to be unique in the manifest file. This helps each
-project to be able to have same remote name which actually points to different
-remote url.
-.PP
-Attribute `fetch`: The Git URL prefix for all projects which use this remote.
-Each project's name is appended to this prefix to form the actual URL used to
-clone the project.
-.PP
-Attribute `pushurl`: The Git "push" URL prefix for all projects which use this
-remote. Each project's name is appended to this prefix to form the actual URL
-used to "git push" the project. This attribute is optional; if not specified
-then "git push" will use the same URL as the `fetch` attribute.
-.PP
-Attribute `review`: Hostname of the Gerrit server where reviews are uploaded to
-by `repo upload`. This attribute is optional; if not specified then `repo
-upload` will not function.
-.PP
-Attribute `revision`: Name of a Git branch (e.g. `main` or `refs/heads/main`).
-Remotes with their own revision will override the default revision.
-.PP
-Element default
-.PP
-At most one default element may be specified. Its remote and revision attributes
-are used when a project element does not specify its own remote or revision
-attribute.
-.PP
-Attribute `remote`: Name of a previously defined remote element. Project
-elements lacking a remote attribute of their own will use this remote.
-.PP
-Attribute `revision`: Name of a Git branch (e.g. `main` or `refs/heads/main`).
-Project elements lacking their own revision attribute will use this revision.
-.PP
-Attribute `dest\-branch`: Name of a Git branch (e.g. `main`). Project elements
-not setting their own `dest\-branch` will inherit this value. If this value is
-not set, projects will use `revision` by default instead.
-.PP
-Attribute `upstream`: Name of the Git ref in which a sha1 can be found. Used
-when syncing a revision locked manifest in \fB\-c\fR mode to avoid having to sync the
-entire ref space. Project elements not setting their own `upstream` will inherit
-this value.
-.PP
-Attribute `sync\-j`: Number of parallel jobs to use when synching.
-.PP
-Attribute `sync\-c`: Set to true to only sync the given Git branch (specified in
-the `revision` attribute) rather than the whole ref space. Project elements
-lacking a sync\-c element of their own will use this value.
-.PP
-Attribute `sync\-s`: Set to true to also sync sub\-projects.
-.PP
-Attribute `sync\-tags`: Set to false to only sync the given Git branch (specified
-in the `revision` attribute) rather than the other ref tags.
-.PP
-Element manifest\-server
-.PP
-At most one manifest\-server may be specified. The url attribute is used to
-specify the URL of a manifest server, which is an XML RPC service.
-.PP
-The manifest server should implement the following RPC methods:
-.IP
-GetApprovedManifest(branch, target)
-.PP
-Return a manifest in which each project is pegged to a known good revision for
-the current branch and target. This is used by repo sync when the \fB\-\-smart\-sync\fR
-option is given.
-.PP
-The target to use is defined by environment variables TARGET_PRODUCT and
-TARGET_BUILD_VARIANT. These variables are used to create a string of the form
-$TARGET_PRODUCT\-$TARGET_BUILD_VARIANT, e.g. passion\-userdebug. If one of those
-variables or both are not present, the program will call GetApprovedManifest
-without the target parameter and the manifest server should choose a reasonable
-default target.
-.IP
-GetManifest(tag)
-.PP
-Return a manifest in which each project is pegged to the revision at the
-specified tag. This is used by repo sync when the \fB\-\-smart\-tag\fR option is given.
-.PP
-Element project
-.PP
-One or more project elements may be specified. Each element describes a single
-Git repository to be cloned into the repo client workspace. You may specify
-Git\-submodules by creating a nested project. Git\-submodules will be
-automatically recognized and inherit their parent's attributes, but those may be
-overridden by an explicitly specified project element.
-.PP
-Attribute `name`: A unique name for this project. The project's name is appended
-onto its remote's fetch URL to generate the actual URL to configure the Git
-remote with. The URL gets formed as:
-.IP
-${remote_fetch}/${project_name}.git
-.PP
-where ${remote_fetch} is the remote's fetch attribute and ${project_name} is the
-project's name attribute. The suffix ".git" is always appended as repo assumes
-the upstream is a forest of bare Git repositories. If the project has a parent
-element, its name will be prefixed by the parent's.
-.PP
-The project name must match the name Gerrit knows, if Gerrit is being used for
-code reviews.
-.PP
-"name" must not be empty, and may not be an absolute path or use "." or ".."
-path components. It is always interpreted relative to the remote's fetch
-settings, so if a different base path is needed, declare a different remote with
-the new settings needed. These restrictions are not enforced for [Local
-Manifests].
-.PP
-Attribute `path`: An optional path relative to the top directory of the repo
-client where the Git working directory for this project should be placed. If not
-supplied the project "name" is used. If the project has a parent element, its
-path will be prefixed by the parent's.
-.PP
-"path" may not be an absolute path or use "." or ".." path components. These
-restrictions are not enforced for [Local Manifests].
-.PP
-If you want to place files into the root of the checkout (e.g. a README or
-Makefile or another build script), use the [copyfile] or [linkfile] elements
-instead.
-.PP
-Attribute `remote`: Name of a previously defined remote element. If not supplied
-the remote given by the default element is used.
-.PP
-Attribute `revision`: Name of the Git branch the manifest wants to track for
-this project. Names can be relative to refs/heads (e.g. just "main") or absolute
-(e.g. "refs/heads/main"). Tags and/or explicit SHA\-1s should work in theory, but
-have not been extensively tested. If not supplied the revision given by the
-remote element is used if applicable, else the default element is used.
-.PP
-Attribute `dest\-branch`: Name of a Git branch (e.g. `main`). When using `repo
-upload`, changes will be submitted for code review on this branch. If
-unspecified both here and in the default element, `revision` is used instead.
-.PP
-Attribute `groups`: List of groups to which this project belongs, whitespace or
-comma separated. All projects belong to the group "all", and each project
-automatically belongs to a group of its name:`name` and path:`path`. E.g. for
-`<project name="monkeys" path="barrel\-of"/>`, that project definition is
-implicitly in the following manifest groups: default, name:monkeys, and
-path:barrel\-of. If you place a project in the group "notdefault", it will not be
-automatically downloaded by repo. If the project has a parent element, the
-`name` and `path` here are the prefixed ones.
-.PP
-Attribute `sync\-c`: Set to true to only sync the given Git branch (specified in
-the `revision` attribute) rather than the whole ref space.
-.PP
-Attribute `sync\-s`: Set to true to also sync sub\-projects.
-.PP
-Attribute `upstream`: Name of the Git ref in which a sha1 can be found. Used
-when syncing a revision locked manifest in \fB\-c\fR mode to avoid having to sync the
-entire ref space.
-.PP
-Attribute `clone\-depth`: Set the depth to use when fetching this project. If
-specified, this value will override any value given to repo init with the
-\fB\-\-depth\fR option on the command line.
-.PP
-Attribute `force\-path`: Set to true to force this project to create the local
-mirror repository according to its `path` attribute (if supplied) rather than
-the `name` attribute. This attribute only applies to the local mirrors syncing,
-it will be ignored when syncing the projects in a client working directory.
-.PP
-Element extend\-project
-.PP
-Modify the attributes of the named project.
-.PP
-This element is mostly useful in a local manifest file, to modify the attributes
-of an existing project without completely replacing the existing project
-definition. This makes the local manifest more robust against changes to the
-original manifest.
-.PP
-Attribute `path`: If specified, limit the change to projects checked out at the
-specified path, rather than all projects with the given name.
-.PP
-Attribute `dest\-path`: If specified, a path relative to the top directory of the
-repo client where the Git working directory for this project should be placed.
-This is used to move a project in the checkout by overriding the existing `path`
-setting.
-.PP
-Attribute `groups`: List of additional groups to which this project belongs.
-Same syntax as the corresponding element of `project`.
-.PP
-Attribute `revision`: If specified, overrides the revision of the original
-project. Same syntax as the corresponding element of `project`.
-.PP
-Attribute `remote`: If specified, overrides the remote of the original project.
-Same syntax as the corresponding element of `project`.
-.PP
-Element annotation
-.PP
-Zero or more annotation elements may be specified as children of a project or
-remote element. Each element describes a name\-value pair. For projects, this
-name\-value pair will be exported into each project's environment during a
-\&'forall' command, prefixed with `REPO__`. In addition, there is an optional
-attribute "keep" which accepts the case insensitive values "true" (default) or
-"false". This attribute determines whether or not the annotation will be kept
-when exported with the manifest subcommand.
-.PP
-Element copyfile
-.PP
-Zero or more copyfile elements may be specified as children of a project
-element. Each element describes a src\-dest pair of files; the "src" file will be
-copied to the "dest" place during `repo sync` command.
-.PP
-"src" is project relative, "dest" is relative to the top of the tree. Copying
-from paths outside of the project or to paths outside of the repo client is not
-allowed.
-.PP
-"src" and "dest" must be files. Directories or symlinks are not allowed.
-Intermediate paths must not be symlinks either.
-.PP
-Parent directories of "dest" will be automatically created if missing.
-.PP
-Element linkfile
-.PP
-It's just like copyfile and runs at the same time as copyfile but instead of
-copying it creates a symlink.
-.PP
-The symlink is created at "dest" (relative to the top of the tree) and points to
-the path specified by "src" which is a path in the project.
-.PP
-Parent directories of "dest" will be automatically created if missing.
-.PP
-The symlink target may be a file or directory, but it may not point outside of
-the repo client.
-.PP
-Element remove\-project
-.PP
-Deletes the named project from the internal manifest table, possibly allowing a
-subsequent project element in the same manifest file to replace the project with
-a different source.
-.PP
-This element is mostly useful in a local manifest file, where the user can
-remove a project, and possibly replace it with their own definition.
-.PP
-Attribute `optional`: Set to true to ignore remove\-project elements with no
-matching `project` element.
-.PP
-Element repo\-hooks
-.PP
-NB: See the [practical documentation](./repo\-hooks.md) for using repo hooks.
-.PP
-Only one repo\-hooks element may be specified at a time. Attempting to redefine
-it will fail to parse.
-.PP
-Attribute `in\-project`: The project where the hooks are defined. The value must
-match the `name` attribute (**not** the `path` attribute) of a previously
-defined `project` element.
-.PP
-Attribute `enabled\-list`: List of hooks to use, whitespace or comma separated.
-.PP
-Element superproject
-.PP
-*** *Note*: This is currently a WIP. ***
-.PP
-NB: See the [git superprojects documentation](
-https://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects) for background
-information.
-.PP
-This element is used to specify the URL of the superproject. It has "name" and
-"remote" as atrributes. Only "name" is required while the others have reasonable
-defaults. At most one superproject may be specified. Attempting to redefine it
-will fail to parse.
-.PP
-Attribute `name`: A unique name for the superproject. This attribute has the
-same meaning as project's name attribute. See the [element
-project](#element\-project) for more information.
-.PP
-Attribute `remote`: Name of a previously defined remote element. If not supplied
-the remote given by the default element is used.
-.PP
-Attribute `revision`: Name of the Git branch the manifest wants to track for
-this superproject. If not supplied the revision given by the remote element is
-used if applicable, else the default element is used.
-.PP
-Element contactinfo
-.PP
-*** *Note*: This is currently a WIP. ***
-.PP
-This element is used to let manifest authors self\-register contact info. It has
-"bugurl" as a required atrribute. This element can be repeated, and any later
-entries will clobber earlier ones. This would allow manifest authors who extend
-manifests to specify their own contact info.
-.PP
-Attribute `bugurl`: The URL to file a bug against the manifest owner.
-.PP
-Element include
-.PP
-This element provides the capability of including another manifest file into the
-originating manifest. Normal rules apply for the target manifest to include \- it
-must be a usable manifest on its own.
-.PP
-Attribute `name`: the manifest to include, specified relative to the manifest
-repository's root.
-.PP
-"name" may not be an absolute path or use "." or ".." path components. These
-restrictions are not enforced for [Local Manifests].
-.PP
-Attribute `groups`: List of additional groups to which all projects in the
-included manifest belong. This appends and recurses, meaning all projects in
-sub\-manifests carry all parent include groups. Same syntax as the corresponding
-element of `project`.
-.PP
-Local Manifests
-.PP
-Additional remotes and projects may be added through local manifest files stored
-in `$TOP_DIR/.repo/local_manifests/*.xml`.
-.PP
-For example:
-.IP
-\f(CW$ ls .repo/local_manifests\fR
-.IP
-local_manifest.xml
-another_local_manifest.xml
-.IP
-\f(CW$ cat .repo/local_manifests/local_manifest.xml\fR
-.IP
-<?xml version="1.0" encoding="UTF\-8"?>
-<manifest>
-.IP
-<project path="manifest"
-.IP
-name="tools/manifest" />
-.IP
-<project path="platform\-manifest"
-.IP
-name="platform/manifest" />
-.IP
-</manifest>
-.PP
-Users may add projects to the local manifest(s) prior to a `repo sync`
-invocation, instructing repo to automatically download and manage these extra
-projects.
-.PP
-Manifest files stored in `$TOP_DIR/.repo/local_manifests/*.xml` will be loaded
-in alphabetical order.
-.PP
-Projects from local manifest files are added into local::<local manifest
-filename> group.
-.PP
-The legacy `$TOP_DIR/.repo/local_manifest.xml` path is no longer supported.
-.SS [copyfile]: #Element\-copyfile [linkfile]: #Element\-linkfile [Local Manifests]:
-.PP
-#local\-manifests

man/repo-overview.1

@@ -1,39 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo overview" "Repo Manual"
-.SH NAME
-repo \- repo overview - manual page for repo overview
-.SH SYNOPSIS
-.B repo
-\fI\,overview \/\fR[\fI\,--current-branch\/\fR] [\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Display overview of unmerged project branches
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-c\fR, \fB\-\-current\-branch\fR
-consider only checked out branches
-.TP
-\fB\-\-no\-current\-branch\fR
-consider all local branches
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help overview` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo overview' command is used to display an overview of the projects
-branches, and list any local commits that have not yet been merged into the
-project.
-.PP
-The \fB\-c\fR/\-\-current\-branch option can be used to restrict the output to only
-branches currently checked out in each project. By default, all branches are
-displayed.

man/repo-prune.1

@@ -1,28 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo prune" "Repo Manual"
-.SH NAME
-repo \- repo prune - manual page for repo prune
-.SH SYNOPSIS
-.B repo
-\fI\,prune \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Prune (delete) already merged topics
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help prune` to view the detailed manual.

man/repo-rebase.1

@@ -1,55 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo rebase" "Repo Manual"
-.SH NAME
-repo \- repo rebase - manual page for repo rebase
-.SH SYNOPSIS
-.B repo
-\fI\,rebase {\/\fR[\fI\,<project>\/\fR...] \fI\,| -i <project>\/\fR...\fI\,}\/\fR
-.SH DESCRIPTION
-Summary
-.PP
-Rebase local branches on upstream branch
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-\-fail\-fast\fR
-stop rebasing after first error is hit
-.TP
-\fB\-f\fR, \fB\-\-force\-rebase\fR
-pass \fB\-\-force\-rebase\fR to git rebase
-.TP
-\fB\-\-no\-ff\fR
-pass \fB\-\-no\-ff\fR to git rebase
-.TP
-\fB\-\-autosquash\fR
-pass \fB\-\-autosquash\fR to git rebase
-.TP
-\fB\-\-whitespace\fR=\fI\,WS\/\fR
-pass \fB\-\-whitespace\fR to git rebase
-.TP
-\fB\-\-auto\-stash\fR
-stash local modifications before starting
-.TP
-\fB\-m\fR, \fB\-\-onto\-manifest\fR
-rebase onto the manifest version instead of upstream
-HEAD (this helps to make sure the local tree stays
-consistent if you previously synced to a manifest)
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.TP
-\fB\-i\fR, \fB\-\-interactive\fR
-interactive rebase (single project only)
-.PP
-Run `repo help rebase` to view the detailed manual.
-.SH DETAILS
-.PP
-\&'repo rebase' uses git rebase to move local changes in the current topic branch
-to the HEAD of the upstream history, useful when you have made commits in a
-topic branch but need to incorporate new upstream changes "underneath" them.

man/repo-selfupdate.1

@@ -1,35 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo selfupdate" "Repo Manual"
-.SH NAME
-repo \- repo selfupdate - manual page for repo selfupdate
-.SH SYNOPSIS
-.B repo
-\fI\,selfupdate\/\fR
-.SH DESCRIPTION
-Summary
-.PP
-Update repo to the latest version
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.SS repo Version options:
-.TP
-\fB\-\-no\-repo\-verify\fR
-do not verify repo source code
-.PP
-Run `repo help selfupdate` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo selfupdate' command upgrades repo to the latest version, if a newer
-version is available.
-.PP
-Normally this is done automatically by 'repo sync' and does not need to be
-performed by an end\-user.

man/repo-smartsync.1

@@ -1,123 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "November 2021" "repo smartsync" "Repo Manual"
-.SH NAME
-repo \- repo smartsync - manual page for repo smartsync
-.SH SYNOPSIS
-.B repo
-\fI\,smartsync \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Update working tree to the latest known good revision
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-\-jobs\-network\fR=\fI\,JOBS\/\fR
-number of network jobs to run in parallel (defaults to
-\fB\-\-jobs\fR)
-.TP
-\fB\-\-jobs\-checkout\fR=\fI\,JOBS\/\fR
-number of local checkout jobs to run in parallel
-(defaults to \fB\-\-jobs\fR)
-.TP
-\fB\-f\fR, \fB\-\-force\-broken\fR
-obsolete option (to be deleted in the future)
-.TP
-\fB\-\-fail\-fast\fR
-stop syncing after first error is hit
-.TP
-\fB\-\-force\-sync\fR
-overwrite an existing git directory if it needs to
-point to a different object directory. WARNING: this
-may cause loss of data
-.TP
-\fB\-\-force\-remove\-dirty\fR
-force remove projects with uncommitted modifications
-if projects no longer exist in the manifest. WARNING:
-this may cause loss of data
-.TP
-\fB\-l\fR, \fB\-\-local\-only\fR
-only update working tree, don't fetch
-.TP
-\fB\-\-no\-manifest\-update\fR, \fB\-\-nmu\fR
-use the existing manifest checkout as\-is. (do not
-update to the latest revision)
-.TP
-\fB\-n\fR, \fB\-\-network\-only\fR
-fetch only, don't update working tree
-.TP
-\fB\-d\fR, \fB\-\-detach\fR
-detach projects back to manifest revision
-.TP
-\fB\-c\fR, \fB\-\-current\-branch\fR
-fetch only current branch from server
-.TP
-\fB\-\-no\-current\-branch\fR
-fetch all branches from server
-.TP
-\fB\-m\fR NAME.xml, \fB\-\-manifest\-name\fR=\fI\,NAME\/\fR.xml
-temporary manifest to use for this sync
-.TP
-\fB\-\-clone\-bundle\fR
-enable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS
-.TP
-\fB\-\-no\-clone\-bundle\fR
-disable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS
-.TP
-\fB\-u\fR MANIFEST_SERVER_USERNAME, \fB\-\-manifest\-server\-username\fR=\fI\,MANIFEST_SERVER_USERNAME\/\fR
-username to authenticate with the manifest server
-.TP
-\fB\-p\fR MANIFEST_SERVER_PASSWORD, \fB\-\-manifest\-server\-password\fR=\fI\,MANIFEST_SERVER_PASSWORD\/\fR
-password to authenticate with the manifest server
-.TP
-\fB\-\-fetch\-submodules\fR
-fetch submodules from server
-.TP
-\fB\-\-use\-superproject\fR
-use the manifest superproject to sync projects;
-implies \fB\-c\fR
-.TP
-\fB\-\-no\-use\-superproject\fR
-disable use of manifest superprojects
-.TP
-\fB\-\-tags\fR
-fetch tags
-.TP
-\fB\-\-no\-tags\fR
-don't fetch tags (default)
-.TP
-\fB\-\-optimized\-fetch\fR
-only fetch projects fixed to sha1 if revision does not
-exist locally
-.TP
-\fB\-\-retry\-fetches\fR=\fI\,RETRY_FETCHES\/\fR
-number of times to retry fetches on transient errors
-.TP
-\fB\-\-prune\fR
-delete refs that no longer exist on the remote
-(default)
-.TP
-\fB\-\-no\-prune\fR
-do not delete refs that no longer exist on the remote
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.SS repo Version options:
-.TP
-\fB\-\-no\-repo\-verify\fR
-do not verify repo source code
-.PP
-Run `repo help smartsync` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo smartsync' command is a shortcut for sync \fB\-s\fR.

man/repo-stage.1

@@ -1,30 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo stage" "Repo Manual"
-.SH NAME
-repo \- repo stage - manual page for repo stage
-.SH SYNOPSIS
-.B repo
-\fI\,stage -i \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Stage file(s) for commit
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.TP
-\fB\-i\fR, \fB\-\-interactive\fR
-use interactive staging
-.PP
-Run `repo help stage` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo stage' command stages files to prepare the next commit.

man/repo-start.1

@@ -1,41 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo start" "Repo Manual"
-.SH NAME
-repo \- repo start - manual page for repo start
-.SH SYNOPSIS
-.B repo
-\fI\,start <newbranchname> \/\fR[\fI\,--all | <project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Start a new branch for development
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-\-all\fR
-begin branch in all projects
-.TP
-\fB\-r\fR REVISION, \fB\-\-rev\fR=\fI\,REVISION\/\fR, \fB\-\-revision\fR=\fI\,REVISION\/\fR
-point branch at this revision instead of upstream
-.TP
-\fB\-\-head\fR, \fB\-\-HEAD\fR
-abbreviation for \fB\-\-rev\fR HEAD
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help start` to view the detailed manual.
-.SH DETAILS
-.PP
-\&'repo start' begins a new branch of development, starting from the revision
-specified in the manifest.

man/repo-status.1

@@ -1,98 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo status" "Repo Manual"
-.SH NAME
-repo \- repo status - manual page for repo status
-.SH SYNOPSIS
-.B repo
-\fI\,status \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Show the working tree status
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-o\fR, \fB\-\-orphans\fR
-include objects in working directory outside of repo
-projects
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help status` to view the detailed manual.
-.SH DETAILS
-.PP
-\&'repo status' compares the working tree to the staging area (aka index), and the
-most recent commit on this branch (HEAD), in each project specified. A summary
-is displayed, one line per file where there is a difference between these three
-states.
-.PP
-The \fB\-j\fR/\-\-jobs option can be used to run multiple status queries in parallel.
-.PP
-The \fB\-o\fR/\-\-orphans option can be used to show objects that are in the working
-directory, but not associated with a repo project. This includes unmanaged
-top\-level files and directories, but also includes deeper items. For example, if
-dir/subdir/proj1 and dir/subdir/proj2 are repo projects, dir/subdir/proj3 will
-be shown if it is not known to repo.
-.PP
-Status Display
-.PP
-The status display is organized into three columns of information, for example
-if the file 'subcmds/status.py' is modified in the project 'repo' on branch
-\&'devwork':
-.TP
-project repo/
-branch devwork
-.TP
-\fB\-m\fR
-subcmds/status.py
-.PP
-The first column explains how the staging area (index) differs from the last
-commit (HEAD). Its values are always displayed in upper case and have the
-following meanings:
-.TP
-\-:
-no difference
-.TP
-A:
-added         (not in HEAD,     in index                     )
-.TP
-M:
-modified      (    in HEAD,     in index, different content  )
-.TP
-D:
-deleted       (    in HEAD, not in index                     )
-.TP
-R:
-renamed       (not in HEAD,     in index, path changed       )
-.TP
-C:
-copied        (not in HEAD,     in index, copied from another)
-.TP
-T:
-mode changed  (    in HEAD,     in index, same content       )
-.TP
-U:
-unmerged; conflict resolution required
-.PP
-The second column explains how the working directory differs from the index. Its
-values are always displayed in lower case and have the following meanings:
-.TP
-\-:
-new / unknown (not in index,     in work tree                )
-.TP
-m:
-modified      (    in index,     in work tree, modified      )
-.TP
-d:
-deleted       (    in index, not in work tree                )

man/repo-sync.1

@@ -1,214 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "November 2021" "repo sync" "Repo Manual"
-.SH NAME
-repo \- repo sync - manual page for repo sync
-.SH SYNOPSIS
-.B repo
-\fI\,sync \/\fR[\fI\,<project>\/\fR...]
-.SH DESCRIPTION
-Summary
-.PP
-Update working tree to the latest revision
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-\-jobs\-network\fR=\fI\,JOBS\/\fR
-number of network jobs to run in parallel (defaults to
-\fB\-\-jobs\fR)
-.TP
-\fB\-\-jobs\-checkout\fR=\fI\,JOBS\/\fR
-number of local checkout jobs to run in parallel
-(defaults to \fB\-\-jobs\fR)
-.TP
-\fB\-f\fR, \fB\-\-force\-broken\fR
-obsolete option (to be deleted in the future)
-.TP
-\fB\-\-fail\-fast\fR
-stop syncing after first error is hit
-.TP
-\fB\-\-force\-sync\fR
-overwrite an existing git directory if it needs to
-point to a different object directory. WARNING: this
-may cause loss of data
-.TP
-\fB\-\-force\-remove\-dirty\fR
-force remove projects with uncommitted modifications
-if projects no longer exist in the manifest. WARNING:
-this may cause loss of data
-.TP
-\fB\-l\fR, \fB\-\-local\-only\fR
-only update working tree, don't fetch
-.TP
-\fB\-\-no\-manifest\-update\fR, \fB\-\-nmu\fR
-use the existing manifest checkout as\-is. (do not
-update to the latest revision)
-.TP
-\fB\-n\fR, \fB\-\-network\-only\fR
-fetch only, don't update working tree
-.TP
-\fB\-d\fR, \fB\-\-detach\fR
-detach projects back to manifest revision
-.TP
-\fB\-c\fR, \fB\-\-current\-branch\fR
-fetch only current branch from server
-.TP
-\fB\-\-no\-current\-branch\fR
-fetch all branches from server
-.TP
-\fB\-m\fR NAME.xml, \fB\-\-manifest\-name\fR=\fI\,NAME\/\fR.xml
-temporary manifest to use for this sync
-.TP
-\fB\-\-clone\-bundle\fR
-enable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS
-.TP
-\fB\-\-no\-clone\-bundle\fR
-disable use of \fI\,/clone.bundle\/\fP on HTTP/HTTPS
-.TP
-\fB\-u\fR MANIFEST_SERVER_USERNAME, \fB\-\-manifest\-server\-username\fR=\fI\,MANIFEST_SERVER_USERNAME\/\fR
-username to authenticate with the manifest server
-.TP
-\fB\-p\fR MANIFEST_SERVER_PASSWORD, \fB\-\-manifest\-server\-password\fR=\fI\,MANIFEST_SERVER_PASSWORD\/\fR
-password to authenticate with the manifest server
-.TP
-\fB\-\-fetch\-submodules\fR
-fetch submodules from server
-.TP
-\fB\-\-use\-superproject\fR
-use the manifest superproject to sync projects;
-implies \fB\-c\fR
-.TP
-\fB\-\-no\-use\-superproject\fR
-disable use of manifest superprojects
-.TP
-\fB\-\-tags\fR
-fetch tags
-.TP
-\fB\-\-no\-tags\fR
-don't fetch tags (default)
-.TP
-\fB\-\-optimized\-fetch\fR
-only fetch projects fixed to sha1 if revision does not
-exist locally
-.TP
-\fB\-\-retry\-fetches\fR=\fI\,RETRY_FETCHES\/\fR
-number of times to retry fetches on transient errors
-.TP
-\fB\-\-prune\fR
-delete refs that no longer exist on the remote
-(default)
-.TP
-\fB\-\-no\-prune\fR
-do not delete refs that no longer exist on the remote
-.TP
-\fB\-s\fR, \fB\-\-smart\-sync\fR
-smart sync using manifest from the latest known good
-build
-.TP
-\fB\-t\fR SMART_TAG, \fB\-\-smart\-tag\fR=\fI\,SMART_TAG\/\fR
-smart sync using manifest from a known tag
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.SS repo Version options:
-.TP
-\fB\-\-no\-repo\-verify\fR
-do not verify repo source code
-.PP
-Run `repo help sync` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo sync' command synchronizes local project directories with the remote
-repositories specified in the manifest. If a local project does not yet exist,
-it will clone a new local directory from the remote repository and set up
-tracking branches as specified in the manifest. If the local project already
-exists, 'repo sync' will update the remote branches and rebase any new local
-changes on top of the new remote changes.
-.PP
-\&'repo sync' will synchronize all projects listed at the command line. Projects
-can be specified either by name, or by a relative or absolute path to the
-project's local directory. If no projects are specified, 'repo sync' will
-synchronize all projects listed in the manifest.
-.PP
-The \fB\-d\fR/\-\-detach option can be used to switch specified projects back to the
-manifest revision. This option is especially helpful if the project is currently
-on a topic branch, but the manifest revision is temporarily needed.
-.PP
-The \fB\-s\fR/\-\-smart\-sync option can be used to sync to a known good build as
-specified by the manifest\-server element in the current manifest. The
-\fB\-t\fR/\-\-smart\-tag option is similar and allows you to specify a custom tag/label.
-.PP
-The \fB\-u\fR/\-\-manifest\-server\-username and \fB\-p\fR/\-\-manifest\-server\-password options can
-be used to specify a username and password to authenticate with the manifest
-server when using the \fB\-s\fR or \fB\-t\fR option.
-.PP
-If \fB\-u\fR and \fB\-p\fR are not specified when using the \fB\-s\fR or \fB\-t\fR option, 'repo sync' will
-attempt to read authentication credentials for the manifest server from the
-user's .netrc file.
-.PP
-\&'repo sync' will not use authentication credentials from \fB\-u\fR/\-p or .netrc if the
-manifest server specified in the manifest file already includes credentials.
-.PP
-By default, all projects will be synced. The \fB\-\-fail\-fast\fR option can be used to
-halt syncing as soon as possible when the first project fails to sync.
-.PP
-The \fB\-\-force\-sync\fR option can be used to overwrite existing git directories if
-they have previously been linked to a different object directory. WARNING: This
-may cause data to be lost since refs may be removed when overwriting.
-.PP
-The \fB\-\-force\-remove\-dirty\fR option can be used to remove previously used projects
-with uncommitted changes. WARNING: This may cause data to be lost since
-uncommitted changes may be removed with projects that no longer exist in the
-manifest.
-.PP
-The \fB\-\-no\-clone\-bundle\fR option disables any attempt to use \fI\,$URL/clone.bundle\/\fP to
-bootstrap a new Git repository from a resumeable bundle file on a content
-delivery network. This may be necessary if there are problems with the local
-Python HTTP client or proxy configuration, but the Git binary works.
-.PP
-The \fB\-\-fetch\-submodules\fR option enables fetching Git submodules of a project from
-server.
-.PP
-The \fB\-c\fR/\-\-current\-branch option can be used to only fetch objects that are on the
-branch specified by a project's revision.
-.PP
-The \fB\-\-optimized\-fetch\fR option can be used to only fetch projects that are fixed
-to a sha1 revision if the sha1 revision does not already exist locally.
-.PP
-The \fB\-\-prune\fR option can be used to remove any refs that no longer exist on the
-remote.
-.PP
-SSH Connections
-.PP
-If at least one project remote URL uses an SSH connection (ssh://, git+ssh://,
-or user@host:path syntax) repo will automatically enable the SSH ControlMaster
-option when connecting to that host. This feature permits other projects in the
-same 'repo sync' session to reuse the same SSH tunnel, saving connection setup
-overheads.
-.PP
-To disable this behavior on UNIX platforms, set the GIT_SSH environment variable
-to 'ssh'. For example:
-.IP
-export GIT_SSH=ssh
-repo sync
-.PP
-Compatibility
-.PP
-This feature is automatically disabled on Windows, due to the lack of UNIX
-domain socket support.
-.PP
-This feature is not compatible with url.insteadof rewrites in the user's
-~/.gitconfig. 'repo sync' is currently not able to perform the rewrite early
-enough to establish the ControlMaster tunnel.
-.PP
-If the remote SSH daemon is Gerrit Code Review, version 2.0.10 or later is
-required to fix a server side protocol bug.

man/repo-upload.1

@@ -1,175 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo upload" "Repo Manual"
-.SH NAME
-repo \- repo upload - manual page for repo upload
-.SH SYNOPSIS
-.B repo
-\fI\,upload \/\fR[\fI\,--re --cc\/\fR] [\fI\,<project>\/\fR]...
-.SH DESCRIPTION
-Summary
-.PP
-Upload changes for code review
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-j\fR JOBS, \fB\-\-jobs\fR=\fI\,JOBS\/\fR
-number of jobs to run in parallel (default: based on
-number of CPU cores)
-.TP
-\fB\-t\fR
-send local branch name to Gerrit Code Review
-.TP
-\fB\-\-hashtag\fR=\fI\,HASHTAGS\/\fR, \fB\-\-ht\fR=\fI\,HASHTAGS\/\fR
-add hashtags (comma delimited) to the review
-.TP
-\fB\-\-hashtag\-branch\fR, \fB\-\-htb\fR
-add local branch name as a hashtag
-.TP
-\fB\-l\fR LABELS, \fB\-\-label\fR=\fI\,LABELS\/\fR
-add a label when uploading
-.TP
-\fB\-\-re\fR=\fI\,REVIEWERS\/\fR, \fB\-\-reviewers\fR=\fI\,REVIEWERS\/\fR
-request reviews from these people
-.TP
-\fB\-\-cc\fR=\fI\,CC\/\fR
-also send email to these email addresses
-.TP
-\fB\-\-br\fR=\fI\,BRANCH\/\fR, \fB\-\-branch\fR=\fI\,BRANCH\/\fR
-(local) branch to upload
-.TP
-\fB\-c\fR, \fB\-\-current\-branch\fR
-upload current git branch
-.TP
-\fB\-\-no\-current\-branch\fR
-upload all git branches
-.TP
-\fB\-\-ne\fR, \fB\-\-no\-emails\fR
-do not send e\-mails on upload
-.TP
-\fB\-p\fR, \fB\-\-private\fR
-upload as a private change (deprecated; use \fB\-\-wip\fR)
-.TP
-\fB\-w\fR, \fB\-\-wip\fR
-upload as a work\-in\-progress change
-.TP
-\fB\-o\fR PUSH_OPTIONS, \fB\-\-push\-option\fR=\fI\,PUSH_OPTIONS\/\fR
-additional push options to transmit
-.TP
-\fB\-D\fR BRANCH, \fB\-\-destination\fR=\fI\,BRANCH\/\fR, \fB\-\-dest\fR=\fI\,BRANCH\/\fR
-submit for review on this target branch
-.TP
-\fB\-n\fR, \fB\-\-dry\-run\fR
-do everything except actually upload the CL
-.TP
-\fB\-y\fR, \fB\-\-yes\fR
-answer yes to all safe prompts
-.TP
-\fB\-\-no\-cert\-checks\fR
-disable verifying ssl certs (unsafe)
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.SS pre\-upload hooks:
-.TP
-\fB\-\-no\-verify\fR
-Do not run the pre\-upload hook.
-.TP
-\fB\-\-verify\fR
-Run the pre\-upload hook without prompting.
-.TP
-\fB\-\-ignore\-hooks\fR
-Do not abort if pre\-upload hooks fail.
-.PP
-Run `repo help upload` to view the detailed manual.
-.SH DETAILS
-.PP
-The 'repo upload' command is used to send changes to the Gerrit Code Review
-system. It searches for topic branches in local projects that have not yet been
-published for review. If multiple topic branches are found, 'repo upload' opens
-an editor to allow the user to select which branches to upload.
-.PP
-\&'repo upload' searches for uploadable changes in all projects listed at the
-command line. Projects can be specified either by name, or by a relative or
-absolute path to the project's local directory. If no projects are specified,
-\&'repo upload' will search for uploadable changes in all projects listed in the
-manifest.
-.PP
-If the \fB\-\-reviewers\fR or \fB\-\-cc\fR options are passed, those emails are added to the
-respective list of users, and emails are sent to any new users. Users passed as
-\fB\-\-reviewers\fR must already be registered with the code review system, or the
-upload will fail.
-.PP
-Configuration
-.PP
-review.URL.autoupload:
-.PP
-To disable the "Upload ... (y/N)?" prompt, you can set a per\-project or global
-Git configuration option. If review.URL.autoupload is set to "true" then repo
-will assume you always answer "y" at the prompt, and will not prompt you
-further. If it is set to "false" then repo will assume you always answer "n",
-and will abort.
-.PP
-review.URL.autoreviewer:
-.PP
-To automatically append a user or mailing list to reviews, you can set a
-per\-project or global Git option to do so.
-.PP
-review.URL.autocopy:
-.PP
-To automatically copy a user or mailing list to all uploaded reviews, you can
-set a per\-project or global Git option to do so. Specifically,
-review.URL.autocopy can be set to a comma separated list of reviewers who you
-always want copied on all uploads with a non\-empty \fB\-\-re\fR argument.
-.PP
-review.URL.username:
-.PP
-Override the username used to connect to Gerrit Code Review. By default the
-local part of the email address is used.
-.PP
-The URL must match the review URL listed in the manifest XML file, or in the
-\&.git/config within the project. For example:
-.IP
-[remote "origin"]
-.IP
-url = git://git.example.com/project.git
-review = http://review.example.com/
-.IP
-[review "http://review.example.com/"]
-.IP
-autoupload = true
-autocopy = johndoe@company.com,my\-team\-alias@company.com
-.PP
-review.URL.uploadtopic:
-.PP
-To add a topic branch whenever uploading a commit, you can set a per\-project or
-global Git option to do so. If review.URL.uploadtopic is set to "true" then repo
-will assume you always want the equivalent of the \fB\-t\fR option to the repo command.
-If unset or set to "false" then repo will make use of only the command line
-option.
-.PP
-review.URL.uploadhashtags:
-.PP
-To add hashtags whenever uploading a commit, you can set a per\-project or global
-Git option to do so. The value of review.URL.uploadhashtags will be used as
-comma delimited hashtags like the \fB\-\-hashtag\fR option.
-.PP
-review.URL.uploadlabels:
-.PP
-To add labels whenever uploading a commit, you can set a per\-project or global
-Git option to do so. The value of review.URL.uploadlabels will be used as comma
-delimited labels like the \fB\-\-label\fR option.
-.PP
-review.URL.uploadnotify:
-.PP
-Control e\-mail notifications when uploading.
-https://gerrit\-review.googlesource.com/Documentation/user\-upload.html#notify
-.PP
-References
-.PP
-Gerrit Code Review: https://www.gerritcodereview.com/

man/repo-version.1

@@ -1,24 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "July 2021" "repo version" "Repo Manual"
-.SH NAME
-repo \- repo version - manual page for repo version
-.SH SYNOPSIS
-.B repo
-\fI\,version\/\fR
-.SH DESCRIPTION
-Summary
-.PP
-Display the version of repo
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.SS Logging options:
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show all output
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-only show errors
-.PP
-Run `repo help version` to view the detailed manual.

man/repo.1

@@ -1,133 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH REPO "1" "November 2021" "repo" "Repo Manual"
-.SH NAME
-repo \- repository management tool built on top of git
-.SH SYNOPSIS
-.B repo
-[\fI\,-p|--paginate|--no-pager\/\fR] \fI\,COMMAND \/\fR[\fI\,ARGS\/\fR]
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-\-help\-all\fR
-show this help message with all subcommands and exit
-.TP
-\fB\-p\fR, \fB\-\-paginate\fR
-display command output in the pager
-.TP
-\fB\-\-no\-pager\fR
-disable the pager
-.TP
-\fB\-\-color\fR=\fI\,COLOR\/\fR
-control color usage: auto, always, never
-.TP
-\fB\-\-trace\fR
-trace git command execution (REPO_TRACE=1)
-.TP
-\fB\-\-trace\-python\fR
-trace python command execution
-.TP
-\fB\-\-time\fR
-time repo command execution
-.TP
-\fB\-\-version\fR
-display this version of repo
-.TP
-\fB\-\-show\-toplevel\fR
-display the path of the top\-level directory of the
-repo client checkout
-.TP
-\fB\-\-event\-log\fR=\fI\,EVENT_LOG\/\fR
-filename of event log to append timeline to
-.TP
-\fB\-\-git\-trace2\-event\-log\fR=\fI\,GIT_TRACE2_EVENT_LOG\/\fR
-directory to write git trace2 event log to
-.SS "The complete list of recognized repo commands is:"
-.TP
-abandon
-Permanently abandon a development branch
-.TP
-branch
-View current topic branches
-.TP
-branches
-View current topic branches
-.TP
-checkout
-Checkout a branch for development
-.TP
-cherry\-pick
-Cherry\-pick a change.
-.TP
-diff
-Show changes between commit and working tree
-.TP
-diffmanifests
-Manifest diff utility
-.TP
-download
-Download and checkout a change
-.TP
-forall
-Run a shell command in each project
-.TP
-gitc\-delete
-Delete a GITC Client.
-.TP
-gitc\-init
-Initialize a GITC Client.
-.TP
-grep
-Print lines matching a pattern
-.TP
-help
-Display detailed help on a command
-.TP
-info
-Get info on the manifest branch, current branch or unmerged branches
-.TP
-init
-Initialize a repo client checkout in the current directory
-.TP
-list
-List projects and their associated directories
-.TP
-manifest
-Manifest inspection utility
-.TP
-overview
-Display overview of unmerged project branches
-.TP
-prune
-Prune (delete) already merged topics
-.TP
-rebase
-Rebase local branches on upstream branch
-.TP
-selfupdate
-Update repo to the latest version
-.TP
-smartsync
-Update working tree to the latest known good revision
-.TP
-stage
-Stage file(s) for commit
-.TP
-start
-Start a new branch for development
-.TP
-status
-Show the working tree status
-.TP
-sync
-Update working tree to the latest revision
-.TP
-upload
-Upload changes for code review
-.TP
-version
-Display the version of repo
-.PP
-See 'repo help <command>' for more information on a specific command.
-Bug reports: https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue

manifest_xml.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,34 +14,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import collections
+from __future__ import print_function
 import itertools
 import os
-import platform
 import re
 import sys
 import xml.dom.minidom
-import urllib.parse
+
+from pyversion import is_python3
+if is_python3():
+  import urllib.parse
+else:
+  import imp
+  import urlparse
+  urllib = imp.new_module('urllib')
+  urllib.parse = urlparse
 
 import gitc_utils
 from git_config import GitConfig, IsId
 from git_refs import R_HEADS, HEAD
 import platform_utils
-from project import Annotation, RemoteSpec, Project, MetaProject
+from project import RemoteSpec, Project, MetaProject
 from error import (ManifestParseError, ManifestInvalidPathError,
                    ManifestInvalidRevisionError)
-from wrapper import Wrapper
 
 MANIFEST_FILE_NAME = 'manifest.xml'
 LOCAL_MANIFEST_NAME = 'local_manifest.xml'
 LOCAL_MANIFESTS_DIR_NAME = 'local_manifests'
 
-# Add all projects from local manifest into a group.
-LOCAL_MANIFEST_GROUP_PREFIX = 'local:'
-
-# ContactInfo has the self-registered bug url, supplied by the manifest authors.
-ContactInfo = collections.namedtuple('ContactInfo', 'bugurl')
-
 # urljoin gets confused if the scheme is not known.
 urllib.parse.uses_relative.extend([
     'ssh',
@@ -122,13 +124,9 @@ class _Default(object):
   sync_tags = True
 
   def __eq__(self, other):
-    if not isinstance(other, _Default):
-      return False
     return self.__dict__ == other.__dict__
 
   def __ne__(self, other):
-    if not isinstance(other, _Default):
-      return True
     return self.__dict__ != other.__dict__
 
 
@@ -149,22 +147,14 @@ class _XmlRemote(object):
     self.reviewUrl = review
     self.revision = revision
     self.resolvedFetchUrl = self._resolveFetchUrl()
-    self.annotations = []
 
   def __eq__(self, other):
-    if not isinstance(other, _XmlRemote):
-      return False
-    return (sorted(self.annotations) == sorted(other.annotations) and
-      self.name == other.name and self.fetchUrl == other.fetchUrl and
-      self.pushUrl == other.pushUrl and self.remoteAlias == other.remoteAlias
-      and self.reviewUrl == other.reviewUrl and self.revision == other.revision)
+    return self.__dict__ == other.__dict__
 
   def __ne__(self, other):
-    return not self.__eq__(other)
+    return self.__dict__ != other.__dict__
 
   def _resolveFetchUrl(self):
-    if self.fetchUrl is None:
-      return ''
     url = self.fetchUrl.rstrip('/')
     manifestUrl = self.manifestUrl.rstrip('/')
     # urljoin will gets confused over quite a few things.  The ones we care
@@ -193,31 +183,16 @@ class _XmlRemote(object):
                       orig_name=self.name,
                       fetchUrl=self.fetchUrl)
 
-  def AddAnnotation(self, name, value, keep):
-    self.annotations.append(Annotation(name, value, keep))
-
 
 class XmlManifest(object):
   """manages the repo configuration file"""
 
-  def __init__(self, repodir, manifest_file, local_manifests=None):
-    """Initialize.
-
-    Args:
-      repodir: Path to the .repo/ dir for holding all internal checkout state.
-          It must be in the top directory of the repo client checkout.
-      manifest_file: Full path to the manifest file to parse.  This will usually
-          be |repodir|/|MANIFEST_FILE_NAME|.
-      local_manifests: Full path to the directory of local override manifests.
-          This will usually be |repodir|/|LOCAL_MANIFESTS_DIR_NAME|.
-    """
-    # TODO(vapier): Move this out of this class.
-    self.globalConfig = GitConfig.ForUser()
-
+  def __init__(self, repodir):
     self.repodir = os.path.abspath(repodir)
     self.topdir = os.path.dirname(self.repodir)
-    self.manifestFile = manifest_file
-    self.local_manifests = local_manifests
+    self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME)
+    self.globalConfig = GitConfig.ForUser()
+    self.isGitcClient = False
     self._load_local_manifests = True
 
     self.repoProject = MetaProject(self, 'repo',
@@ -270,7 +245,8 @@ class XmlManifest(object):
     self.Override(name)
 
     # Old versions of repo would generate symlinks we need to clean up.
-    platform_utils.remove(self.manifestFile, missing_ok=True)
+    if os.path.lexists(self.manifestFile):
+      platform_utils.remove(self.manifestFile)
     # This file is interpreted as if it existed inside the manifest repo.
     # That allows us to use <include> with the relative file name.
     with open(self.manifestFile, 'w') as fp:
@@ -304,28 +280,18 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     if r.revision is not None:
       e.setAttribute('revision', r.revision)
 
-    for a in r.annotations:
-      if a.keep == 'true':
-        ae = doc.createElement('annotation')
-        ae.setAttribute('name', a.name)
-        ae.setAttribute('value', a.value)
-        e.appendChild(ae)
+  def _ParseGroups(self, groups):
+    return [x for x in re.split(r'[,\s]+', groups) if x]
 
-  def _ParseList(self, field):
-    """Parse fields that contain flattened lists.
-
-    These are whitespace & comma separated.  Empty elements will be discarded.
+  def Save(self, fd, peg_rev=False, peg_rev_upstream=True, peg_rev_dest_branch=True, groups=None):
+    """Write the current manifest out to the given file descriptor.
     """
-    return [x for x in re.split(r'[,\s]+', field) if x]
-
-  def ToXml(self, peg_rev=False, peg_rev_upstream=True, peg_rev_dest_branch=True, groups=None):
-    """Return the current manifest XML."""
     mp = self.manifestProject
 
     if groups is None:
       groups = mp.config.GetString('manifest.groups')
     if groups:
-      groups = self._ParseList(groups)
+      groups = self._ParseGroups(groups)
 
     doc = xml.dom.minidom.Document()
     root = doc.createElement('manifest')
@@ -433,8 +399,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
         revision = self.remotes[p.remote.orig_name].revision or d.revisionExpr
         if not revision or revision != p.revisionExpr:
           e.setAttribute('revision', p.revisionExpr)
-        elif p.revisionId:
-          e.setAttribute('revision', p.revisionId)
         if (p.upstream and (p.upstream != p.revisionExpr or
                             p.upstream != d.upstreamExpr)):
           e.setAttribute('upstream', p.upstream)
@@ -495,84 +459,11 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
                      ' '.join(self._repo_hooks_project.enabled_repo_hooks))
       root.appendChild(e)
 
-    if self._superproject:
-      root.appendChild(doc.createTextNode(''))
-      e = doc.createElement('superproject')
-      e.setAttribute('name', self._superproject['name'])
-      remoteName = None
-      if d.remote:
-        remoteName = d.remote.name
-      remote = self._superproject.get('remote')
-      if not d.remote or remote.orig_name != remoteName:
-        remoteName = remote.orig_name
-        e.setAttribute('remote', remoteName)
-      revision = remote.revision or d.revisionExpr
-      if not revision or revision != self._superproject['revision']:
-        e.setAttribute('revision', self._superproject['revision'])
-      root.appendChild(e)
-
-    if self._contactinfo.bugurl != Wrapper().BUG_URL:
-      root.appendChild(doc.createTextNode(''))
-      e = doc.createElement('contactinfo')
-      e.setAttribute('bugurl', self._contactinfo.bugurl)
-      root.appendChild(e)
-
-    return doc
-
-  def ToDict(self, **kwargs):
-    """Return the current manifest as a dictionary."""
-    # Elements that may only appear once.
-    SINGLE_ELEMENTS = {
-        'notice',
-        'default',
-        'manifest-server',
-        'repo-hooks',
-        'superproject',
-        'contactinfo',
-    }
-    # Elements that may be repeated.
-    MULTI_ELEMENTS = {
-        'remote',
-        'remove-project',
-        'project',
-        'extend-project',
-        'include',
-        # These are children of 'project' nodes.
-        'annotation',
-        'project',
-        'copyfile',
-        'linkfile',
-    }
-
-    doc = self.ToXml(**kwargs)
-    ret = {}
-
-    def append_children(ret, node):
-      for child in node.childNodes:
-        if child.nodeType == xml.dom.Node.ELEMENT_NODE:
-          attrs = child.attributes
-          element = dict((attrs.item(i).localName, attrs.item(i).value)
-                         for i in range(attrs.length))
-          if child.nodeName in SINGLE_ELEMENTS:
-            ret[child.nodeName] = element
-          elif child.nodeName in MULTI_ELEMENTS:
-            ret.setdefault(child.nodeName, []).append(element)
-          else:
-            raise ManifestParseError('Unhandled element "%s"' % (child.nodeName,))
-
-          append_children(element, child)
-
-    append_children(ret, doc.firstChild)
-
-    return ret
-
-  def Save(self, fd, **kwargs):
-    """Write the current manifest out to the given file descriptor."""
-    doc = self.ToXml(**kwargs)
     doc.writexml(fd, '', '  ', '\n', 'UTF-8')
 
   def _output_manifest_project_extras(self, p, e):
     """Manifests can modify e if they support extra project attributes."""
+    pass
 
   @property
   def paths(self):
@@ -599,16 +490,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     self._Load()
     return self._repo_hooks_project
 
-  @property
-  def superproject(self):
-    self._Load()
-    return self._superproject
-
-  @property
-  def contactinfo(self):
-    self._Load()
-    return self._contactinfo
-
   @property
   def notice(self):
     self._Load()
@@ -633,23 +514,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
       return self.manifestProject.config.GetString('repo.clonefilter')
     return None
 
-  @property
-  def PartialCloneExclude(self):
-    exclude = self.manifest.manifestProject.config.GetString(
-        'repo.partialcloneexclude') or ''
-    return set(x.strip() for x in exclude.split(','))
-
-  @property
-  def UseLocalManifests(self):
-    return self._load_local_manifests
-
-  def SetUseLocalManifests(self, value):
-    self._load_local_manifests = value
-
-  @property
-  def HasLocalManifests(self):
-    return self._load_local_manifests and self.local_manifests
-
   @property
   def IsMirror(self):
     return self.manifestProject.config.GetBoolean('repo.mirror')
@@ -666,21 +530,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
   def HasSubmodules(self):
     return self.manifestProject.config.GetBoolean('repo.submodules')
 
-  @property
-  def EnableGitLfs(self):
-    return self.manifestProject.config.GetBoolean('repo.git-lfs')
-
-  def GetDefaultGroupsStr(self):
-    """Returns the default group string for the platform."""
-    return 'default,platform-' + platform.system().lower()
-
-  def GetGroupsStr(self):
-    """Returns the manifest group string that should be synced."""
-    groups = self.manifestProject.config.GetString('manifest.groups')
-    if not groups:
-      groups = self.GetDefaultGroupsStr()
-    return groups
-
   def _Unload(self):
     self._loaded = False
     self._projects = {}
@@ -688,8 +537,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     self._remotes = {}
     self._default = None
     self._repo_hooks_project = None
-    self._superproject = {}
-    self._contactinfo = ContactInfo(Wrapper().BUG_URL)
     self._notice = None
     self.branch = None
     self._manifest_server = None
@@ -702,24 +549,25 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
         b = b[len(R_HEADS):]
       self.branch = b
 
-      # The manifestFile was specified by the user which is why we allow include
-      # paths to point anywhere.
       nodes = []
-      nodes.append(self._ParseManifestXml(
-          self.manifestFile, self.manifestProject.worktree,
-          restrict_includes=False))
+      nodes.append(self._ParseManifestXml(self.manifestFile,
+                                          self.manifestProject.worktree))
 
-      if self._load_local_manifests and self.local_manifests:
+      if self._load_local_manifests:
+        if os.path.exists(os.path.join(self.repodir, LOCAL_MANIFEST_NAME)):
+          print('error: %s is not supported; put local manifests in `%s`'
+                'instead' % (LOCAL_MANIFEST_NAME,
+                             os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
+                file=sys.stderr)
+          sys.exit(1)
+
+        local_dir = os.path.abspath(os.path.join(self.repodir,
+                                                 LOCAL_MANIFESTS_DIR_NAME))
         try:
-          for local_file in sorted(platform_utils.listdir(self.local_manifests)):
+          for local_file in sorted(platform_utils.listdir(local_dir)):
             if local_file.endswith('.xml'):
-              local = os.path.join(self.local_manifests, local_file)
-              # Since local manifests are entirely managed by the user, allow
-              # them to point anywhere the user wants.
-              nodes.append(self._ParseManifestXml(
-                  local, self.repodir,
-                  parent_groups=f'{LOCAL_MANIFEST_GROUP_PREFIX}:{local_file[:-4]}',
-                  restrict_includes=False))
+              local = os.path.join(local_dir, local_file)
+              nodes.append(self._ParseManifestXml(local, self.repodir))
         except OSError:
           pass
 
@@ -737,19 +585,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
 
       self._loaded = True
 
-  def _ParseManifestXml(self, path, include_root, parent_groups='',
-                        restrict_includes=True):
-    """Parse a manifest XML and return the computed nodes.
-
-    Args:
-      path: The XML file to read & parse.
-      include_root: The path to interpret include "name"s relative to.
-      parent_groups: The groups to apply to this projects.
-      restrict_includes: Whether to constrain the "name" attribute of includes.
-
-    Returns:
-      List of XML nodes.
-    """
+  def _ParseManifestXml(self, path, include_root):
     try:
       root = xml.dom.minidom.parse(path)
     except (OSError, xml.parsers.expat.ExpatError) as e:
@@ -768,35 +604,20 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     for node in manifest.childNodes:
       if node.nodeName == 'include':
         name = self._reqatt(node, 'name')
-        if restrict_includes:
-          msg = self._CheckLocalPath(name)
-          if msg:
-            raise ManifestInvalidPathError(
-                '<include> invalid "name": %s: %s' % (name, msg))
-        include_groups = ''
-        if parent_groups:
-          include_groups = parent_groups
-        if node.hasAttribute('groups'):
-          include_groups = node.getAttribute('groups') + ',' + include_groups
         fp = os.path.join(include_root, name)
         if not os.path.isfile(fp):
-          raise ManifestParseError("include [%s/]%s doesn't exist or isn't a file"
-                                   % (include_root, name))
+          raise ManifestParseError("include %s doesn't exist or isn't a file"
+                                   % (name,))
         try:
-          nodes.extend(self._ParseManifestXml(fp, include_root, include_groups))
+          nodes.extend(self._ParseManifestXml(fp, include_root))
         # should isolate this to the exact exception, but that's
         # tricky.  actual parsing implementation may vary.
-        except (KeyboardInterrupt, RuntimeError, SystemExit, ManifestParseError):
+        except (KeyboardInterrupt, RuntimeError, SystemExit):
           raise
         except Exception as e:
           raise ManifestParseError(
               "failed parsing included manifest %s: %s" % (name, e))
       else:
-        if parent_groups and node.nodeName == 'project':
-          nodeGroups = parent_groups
-          if node.hasAttribute('groups'):
-            nodeGroups = node.getAttribute('groups') + ',' + nodeGroups
-          node.setAttribute('groups', nodeGroups)
         nodes.append(node)
     return nodes
 
@@ -816,10 +637,9 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     for node in itertools.chain(*node_list):
       if node.nodeName == 'default':
         new_default = self._ParseDefault(node)
-        emptyDefault = not node.hasAttributes() and not node.hasChildNodes()
         if self._default is None:
           self._default = new_default
-        elif not emptyDefault and new_default != self._default:
+        elif new_default != self._default:
           raise ManifestParseError('duplicate default in %s' %
                                    (self.manifestFile))
 
@@ -858,8 +678,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
       for subproject in project.subprojects:
         recursively_add_projects(subproject)
 
-    repo_hooks_project = None
-    enabled_repo_hooks = None
     for node in itertools.chain(*node_list):
       if node.nodeName == 'project':
         project = self._ParseProject(node)
@@ -872,108 +690,69 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
                                    'project: %s' % name)
 
         path = node.getAttribute('path')
-        dest_path = node.getAttribute('dest-path')
         groups = node.getAttribute('groups')
         if groups:
-          groups = self._ParseList(groups)
+          groups = self._ParseGroups(groups)
         revision = node.getAttribute('revision')
         remote = node.getAttribute('remote')
         if remote:
           remote = self._get_remote(node)
 
-        named_projects = self._projects[name]
-        if dest_path and not path and len(named_projects) > 1:
-          raise ManifestParseError('extend-project cannot use dest-path when '
-                                   'matching multiple projects: %s' % name)
         for p in self._projects[name]:
           if path and p.relpath != path:
             continue
           if groups:
             p.groups.extend(groups)
           if revision:
-            p.SetRevision(revision)
-
+            p.revisionExpr = revision
+            if IsId(revision):
+              p.revisionId = revision
+            else:
+              p.revisionId = None
           if remote:
             p.remote = remote.ToRemoteSpec(name)
-
-          if dest_path:
-            del self._paths[p.relpath]
-            relpath, worktree, gitdir, objdir, _ = self.GetProjectPaths(name, dest_path)
-            p.UpdatePaths(relpath, worktree, gitdir, objdir)
-            self._paths[p.relpath] = p
-
       if node.nodeName == 'repo-hooks':
+        # Get the name of the project and the (space-separated) list of enabled.
+        repo_hooks_project = self._reqatt(node, 'in-project')
+        enabled_repo_hooks = self._reqatt(node, 'enabled-list').split()
+
         # Only one project can be the hooks project
-        if repo_hooks_project is not None:
+        if self._repo_hooks_project is not None:
           raise ManifestParseError(
               'duplicate repo-hooks in %s' %
               (self.manifestFile))
 
-        # Get the name of the project and the (space-separated) list of enabled.
-        repo_hooks_project = self._reqatt(node, 'in-project')
-        enabled_repo_hooks = self._ParseList(self._reqatt(node, 'enabled-list'))
-      if node.nodeName == 'superproject':
-        name = self._reqatt(node, 'name')
-        # There can only be one superproject.
-        if self._superproject.get('name'):
+        # Store a reference to the Project.
+        try:
+          repo_hooks_projects = self._projects[repo_hooks_project]
+        except KeyError:
           raise ManifestParseError(
-              'duplicate superproject in %s' %
-              (self.manifestFile))
-        self._superproject['name'] = name
-        remote_name = node.getAttribute('remote')
-        if not remote_name:
-          remote = self._default.remote
-        else:
-          remote = self._get_remote(node)
-        if remote is None:
-          raise ManifestParseError("no remote for superproject %s within %s" %
-                                   (name, self.manifestFile))
-        self._superproject['remote'] = remote.ToRemoteSpec(name)
-        revision = node.getAttribute('revision') or remote.revision
-        if not revision:
-          revision = self._default.revisionExpr
-        if not revision:
-          raise ManifestParseError('no revision for superproject %s within %s' %
-                                   (name, self.manifestFile))
-        self._superproject['revision'] = revision
-      if node.nodeName == 'contactinfo':
-        bugurl = self._reqatt(node, 'bugurl')
-        # This element can be repeated, later entries will clobber earlier ones.
-        self._contactinfo = ContactInfo(bugurl)
+              'project %s not found for repo-hooks' %
+              (repo_hooks_project))
 
+        if len(repo_hooks_projects) != 1:
+          raise ManifestParseError(
+              'internal error parsing repo-hooks in %s' %
+              (self.manifestFile))
+        self._repo_hooks_project = repo_hooks_projects[0]
+
+        # Store the enabled hooks in the Project object.
+        self._repo_hooks_project.enabled_repo_hooks = enabled_repo_hooks
       if node.nodeName == 'remove-project':
         name = self._reqatt(node, 'name')
 
-        if name in self._projects:
-          for p in self._projects[name]:
-            del self._paths[p.relpath]
-          del self._projects[name]
-
-          # If the manifest removes the hooks project, treat it as if it deleted
-          # the repo-hooks element too.
-          if repo_hooks_project == name:
-            repo_hooks_project = None
-        elif not XmlBool(node, 'optional', False):
+        if name not in self._projects:
           raise ManifestParseError('remove-project element specifies non-existent '
                                    'project: %s' % name)
 
-    # Store repo hooks project information.
-    if repo_hooks_project:
-      # Store a reference to the Project.
-      try:
-        repo_hooks_projects = self._projects[repo_hooks_project]
-      except KeyError:
-        raise ManifestParseError(
-            'project %s not found for repo-hooks' %
-            (repo_hooks_project))
+        for p in self._projects[name]:
+          del self._paths[p.relpath]
+        del self._projects[name]
 
-      if len(repo_hooks_projects) != 1:
-        raise ManifestParseError(
-            'internal error parsing repo-hooks in %s' %
-            (self.manifestFile))
-      self._repo_hooks_project = repo_hooks_projects[0]
-      # Store the enabled hooks in the Project object.
-      self._repo_hooks_project.enabled_repo_hooks = enabled_repo_hooks
+        # If the manifest removes the hooks project, treat it as if it deleted
+        # the repo-hooks element too.
+        if self._repo_hooks_project and (self._repo_hooks_project.name == name):
+          self._repo_hooks_project = None
 
   def _AddMetaProjectMirror(self, m):
     name = None
@@ -1032,14 +811,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     if revision == '':
       revision = None
     manifestUrl = self.manifestProject.config.GetString('remote.origin.url')
-
-    remote = _XmlRemote(name, alias, fetch, pushUrl, manifestUrl, review, revision)
-
-    for n in node.childNodes:
-      if n.nodeName == 'annotation':
-        self._ParseAnnotation(remote, n)
-
-    return remote
+    return _XmlRemote(name, alias, fetch, pushUrl, manifestUrl, review, revision)
 
   def _ParseDefault(self, node):
     """
@@ -1114,10 +886,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     reads a <project> element from the manifest file
     """
     name = self._reqatt(node, 'name')
-    msg = self._CheckLocalPath(name, dir_ok=True)
-    if msg:
-      raise ManifestInvalidPathError(
-          '<project> invalid "name": %s: %s' % (name, msg))
     if parent:
       name = self._JoinName(parent.name, name)
 
@@ -1138,12 +906,9 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     path = node.getAttribute('path')
     if not path:
       path = name
-    else:
-      # NB: The "." project is handled specially in Project.Sync_LocalHalf.
-      msg = self._CheckLocalPath(path, dir_ok=True, cwd_dot_ok=True)
-      if msg:
-        raise ManifestInvalidPathError(
-            '<project> invalid "path": %s: %s' % (path, msg))
+    if path.startswith('/'):
+      raise ManifestParseError("project %s path cannot be absolute in %s" %
+                               (name, self.manifestFile))
 
     rebase = XmlBool(node, 'rebase', True)
     sync_c = XmlBool(node, 'sync-c', False)
@@ -1162,7 +927,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     groups = ''
     if node.hasAttribute('groups'):
       groups = node.getAttribute('groups')
-    groups = self._ParseList(groups)
+    groups = self._ParseGroups(groups)
 
     if parent is None:
       relpath, worktree, gitdir, objdir, use_git_worktrees = \
@@ -1263,38 +1028,11 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     return relpath, worktree, gitdir, objdir
 
   @staticmethod
-  def _CheckLocalPath(path, dir_ok=False, cwd_dot_ok=False):
-    """Verify |path| is reasonable for use in filesystem paths.
-
-    Used with <copyfile> & <linkfile> & <project> elements.
-
-    This only validates the |path| in isolation: it does not check against the
-    current filesystem state.  Thus it is suitable as a first-past in a parser.
-
-    It enforces a number of constraints:
-    * No empty paths.
-    * No "~" in paths.
-    * No Unicode codepoints that filesystems might elide when normalizing.
-    * No relative path components like "." or "..".
-    * No absolute paths.
-    * No ".git" or ".repo*" path components.
-
-    Args:
-      path: The path name to validate.
-      dir_ok: Whether |path| may force a directory (e.g. end in a /).
-      cwd_dot_ok: Whether |path| may be just ".".
-
-    Returns:
-      None if |path| is OK, a failure message otherwise.
-    """
-    if not path:
-      return 'empty paths not allowed'
-
+  def _CheckLocalPath(path, symlink=False):
+    """Verify |path| is reasonable for use in <copyfile> & <linkfile>."""
     if '~' in path:
       return '~ not allowed (due to 8.3 filenames on Windows filesystems)'
 
-    path_codepoints = set(path)
-
     # Some filesystems (like Apple's HFS+) try to normalize Unicode codepoints
     # which means there are alternative names for ".git".  Reject paths with
     # these in it as there shouldn't be any reasonable need for them here.
@@ -1318,17 +1056,10 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
         u'\u206F',  # NOMINAL DIGIT SHAPES
         u'\uFEFF',  # ZERO WIDTH NO-BREAK SPACE
     }
-    if BAD_CODEPOINTS & path_codepoints:
+    if BAD_CODEPOINTS & set(path):
       # This message is more expansive than reality, but should be fine.
       return 'Unicode combining characters not allowed'
 
-    # Reject newlines as there shouldn't be any legitmate use for them, they'll
-    # be confusing to users, and they can easily break tools that expect to be
-    # able to iterate over newline delimited lists.  This even applies to our
-    # own code like .repo/project.list.
-    if {'\r', '\n'} & path_codepoints:
-      return 'Newlines not allowed'
-
     # Assume paths might be used on case-insensitive filesystems.
     path = path.lower()
 
@@ -1337,18 +1068,16 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     # our constructed logic here.  Especially since manifest authors only use
     # / in their paths.
     resep = re.compile(r'[/%s]' % re.escape(os.path.sep))
-    # Strip off trailing slashes as those only produce '' elements, and we use
-    # parts to look for individual bad components.
-    parts = resep.split(path.rstrip('/'))
+    parts = resep.split(path)
 
     # Some people use src="." to create stable links to projects.  Lets allow
     # that but reject all other uses of "." to keep things simple.
-    if not cwd_dot_ok or parts != ['.']:
+    if parts != ['.']:
       for part in set(parts):
         if part in {'.', '..', '.git'} or part.startswith('.repo'):
           return 'bad component: %s' % (part,)
 
-    if not dir_ok and resep.match(path[-1]):
+    if not symlink and resep.match(path[-1]):
       return 'dirs not allowed'
 
     # NB: The two abspath checks here are to handle platforms with multiple
@@ -1380,8 +1109,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
 
     # |src| is the file we read from or path we point to for symlinks.
     # It is relative to the top of the git project checkout.
-    is_linkfile = element == 'linkfile'
-    msg = cls._CheckLocalPath(src, dir_ok=is_linkfile, cwd_dot_ok=is_linkfile)
+    msg = cls._CheckLocalPath(src, symlink=element == 'linkfile')
     if msg:
       raise ManifestInvalidPathError(
           '<%s> invalid "src": %s: %s' % (element, src, msg))
@@ -1406,7 +1134,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
       self._ValidateFilePaths('linkfile', src, dest)
       project.AddLinkFile(src, dest, self.topdir)
 
-  def _ParseAnnotation(self, element, node):
+  def _ParseAnnotation(self, project, node):
     name = self._reqatt(node, 'name')
     value = self._reqatt(node, 'value')
     try:
@@ -1416,7 +1144,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
     if keep != "true" and keep != "false":
       raise ManifestParseError('optional "keep" attribute must be '
                                '"true" or "false"')
-    element.AddAnnotation(name, value, keep)
+    project.AddAnnotation(name, value, keep)
 
   def _get_remote(self, node):
     name = node.getAttribute('remote')
@@ -1476,48 +1204,22 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
 
 
 class GitcManifest(XmlManifest):
-  """Parser for GitC (git-in-the-cloud) manifests."""
+
+  def __init__(self, repodir, gitc_client_name):
+    """Initialize the GitcManifest object."""
+    super(GitcManifest, self).__init__(repodir)
+    self.isGitcClient = True
+    self.gitc_client_name = gitc_client_name
+    self.gitc_client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
+                                        gitc_client_name)
+    self.manifestFile = os.path.join(self.gitc_client_dir, '.manifest')
 
   def _ParseProject(self, node, parent=None):
     """Override _ParseProject and add support for GITC specific attributes."""
-    return super()._ParseProject(
+    return super(GitcManifest, self)._ParseProject(
         node, parent=parent, old_revision=node.getAttribute('old-revision'))
 
   def _output_manifest_project_extras(self, p, e):
     """Output GITC Specific Project attributes"""
     if p.old_revision:
       e.setAttribute('old-revision', str(p.old_revision))
-
-
-class RepoClient(XmlManifest):
-  """Manages a repo client checkout."""
-
-  def __init__(self, repodir, manifest_file=None):
-    self.isGitcClient = False
-
-    if os.path.exists(os.path.join(repodir, LOCAL_MANIFEST_NAME)):
-      print('error: %s is not supported; put local manifests in `%s` instead' %
-            (LOCAL_MANIFEST_NAME, os.path.join(repodir, LOCAL_MANIFESTS_DIR_NAME)),
-            file=sys.stderr)
-      sys.exit(1)
-
-    if manifest_file is None:
-      manifest_file = os.path.join(repodir, MANIFEST_FILE_NAME)
-    local_manifests = os.path.abspath(os.path.join(repodir, LOCAL_MANIFESTS_DIR_NAME))
-    super().__init__(repodir, manifest_file, local_manifests)
-
-    # TODO: Completely separate manifest logic out of the client.
-    self.manifest = self
-
-
-class GitcClient(RepoClient, GitcManifest):
-  """Manages a GitC client checkout."""
-
-  def __init__(self, repodir, gitc_client_name):
-    """Initialize the GitcManifest object."""
-    self.gitc_client_name = gitc_client_name
-    self.gitc_client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
-                                        gitc_client_name)
-
-    super().__init__(repodir, os.path.join(self.gitc_client_dir, '.manifest'))
-    self.isGitcClient = True

pager.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import os
 import select
 import subprocess

platform_utils.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +17,18 @@
 import errno
 import os
 import platform
+import select
 import shutil
 import stat
 
+from pyversion import is_python3
+if is_python3():
+  from queue import Queue
+else:
+  from Queue import Queue
+
+from threading import Thread
+
 
 def isWindows():
   """ Returns True when running with the native port of Python for Windows,
@@ -28,6 +39,161 @@ def isWindows():
   return platform.system() == "Windows"
 
 
+class FileDescriptorStreams(object):
+  """ Platform agnostic abstraction enabling non-blocking I/O over a
+  collection of file descriptors. This abstraction is required because
+  fctnl(os.O_NONBLOCK) is not supported on Windows.
+  """
+  @classmethod
+  def create(cls):
+    """ Factory method: instantiates the concrete class according to the
+    current platform.
+    """
+    if isWindows():
+      return _FileDescriptorStreamsThreads()
+    else:
+      return _FileDescriptorStreamsNonBlocking()
+
+  def __init__(self):
+    self.streams = []
+
+  def add(self, fd, dest, std_name):
+    """ Wraps an existing file descriptor as a stream.
+    """
+    self.streams.append(self._create_stream(fd, dest, std_name))
+
+  def remove(self, stream):
+    """ Removes a stream, when done with it.
+    """
+    self.streams.remove(stream)
+
+  @property
+  def is_done(self):
+    """ Returns True when all streams have been processed.
+    """
+    return len(self.streams) == 0
+
+  def select(self):
+    """ Returns the set of streams that have data available to read.
+    The returned streams each expose a read() and a close() method.
+    When done with a stream, call the remove(stream) method.
+    """
+    raise NotImplementedError
+
+  def _create_stream(self, fd, dest, std_name):
+    """ Creates a new stream wrapping an existing file descriptor.
+    """
+    raise NotImplementedError
+
+
+class _FileDescriptorStreamsNonBlocking(FileDescriptorStreams):
+  """ Implementation of FileDescriptorStreams for platforms that support
+  non blocking I/O.
+  """
+  def __init__(self):
+    super(_FileDescriptorStreamsNonBlocking, self).__init__()
+    self._poll = select.poll()
+    self._fd_to_stream = {}
+
+  class Stream(object):
+    """ Encapsulates a file descriptor """
+
+    def __init__(self, fd, dest, std_name):
+      self.fd = fd
+      self.dest = dest
+      self.std_name = std_name
+      self.set_non_blocking()
+
+    def set_non_blocking(self):
+      import fcntl
+      flags = fcntl.fcntl(self.fd, fcntl.F_GETFL)
+      fcntl.fcntl(self.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
+
+    def fileno(self):
+      return self.fd.fileno()
+
+    def read(self):
+      return self.fd.read(4096)
+
+    def close(self):
+      self.fd.close()
+
+  def _create_stream(self, fd, dest, std_name):
+    stream = self.Stream(fd, dest, std_name)
+    self._fd_to_stream[stream.fileno()] = stream
+    self._poll.register(stream, select.POLLIN)
+    return stream
+
+  def remove(self, stream):
+    self._poll.unregister(stream)
+    del self._fd_to_stream[stream.fileno()]
+    super(_FileDescriptorStreamsNonBlocking, self).remove(stream)
+
+  def select(self):
+    return [self._fd_to_stream[fd] for fd, _ in self._poll.poll()]
+
+
+class _FileDescriptorStreamsThreads(FileDescriptorStreams):
+  """ Implementation of FileDescriptorStreams for platforms that don't support
+  non blocking I/O. This implementation requires creating threads issuing
+  blocking read operations on file descriptors.
+  """
+
+  def __init__(self):
+    super(_FileDescriptorStreamsThreads, self).__init__()
+    # The queue is shared accross all threads so we can simulate the
+    # behavior of the select() function
+    self.queue = Queue(10)  # Limit incoming data from streams
+
+  def _create_stream(self, fd, dest, std_name):
+    return self.Stream(fd, dest, std_name, self.queue)
+
+  def select(self):
+    # Return only one stream at a time, as it is the most straighforward
+    # thing to do and it is compatible with the select() function.
+    item = self.queue.get()
+    stream = item.stream
+    stream.data = item.data
+    return [stream]
+
+  class QueueItem(object):
+    """ Item put in the shared queue """
+
+    def __init__(self, stream, data):
+      self.stream = stream
+      self.data = data
+
+  class Stream(object):
+    """ Encapsulates a file descriptor """
+
+    def __init__(self, fd, dest, std_name, queue):
+      self.fd = fd
+      self.dest = dest
+      self.std_name = std_name
+      self.queue = queue
+      self.data = None
+      self.thread = Thread(target=self.read_to_queue)
+      self.thread.daemon = True
+      self.thread.start()
+
+    def close(self):
+      self.fd.close()
+
+    def read(self):
+      data = self.data
+      self.data = None
+      return data
+
+    def read_to_queue(self):
+      """ The thread function: reads everything from the file descriptor into
+      the shared queue and terminates when reaching EOF.
+      """
+      for line in iter(self.fd.readline, b''):
+        self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, line))
+      self.fd.close()
+      self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, b''))
+
+
 def symlink(source, link_name):
   """Creates a symbolic link pointing to source named link_name.
   Note: On Windows, source must exist on disk, as the implementation needs
@@ -124,30 +290,31 @@ def rename(src, dst):
       else:
         raise
   else:
-    shutil.move(src, dst)
+    os.rename(src, dst)
 
 
-def remove(path, missing_ok=False):
+def remove(path):
   """Remove (delete) the file path. This is a replacement for os.remove that
   allows deleting read-only files on Windows, with support for long paths and
   for deleting directory symbolic links.
 
   Availability: Unix, Windows."""
-  longpath = _makelongpath(path) if isWindows() else path
-  try:
-    os.remove(longpath)
-  except OSError as e:
-    if e.errno == errno.EACCES:
-      os.chmod(longpath, stat.S_IWRITE)
-      # Directory symbolic links must be deleted with 'rmdir'.
-      if islink(longpath) and isdir(longpath):
-        os.rmdir(longpath)
+  if isWindows():
+    longpath = _makelongpath(path)
+    try:
+      os.remove(longpath)
+    except OSError as e:
+      if e.errno == errno.EACCES:
+        os.chmod(longpath, stat.S_IWRITE)
+        # Directory symbolic links must be deleted with 'rmdir'.
+        if islink(longpath) and isdir(longpath):
+          os.rmdir(longpath)
+        else:
+          os.remove(longpath)
       else:
-        os.remove(longpath)
-    elif missing_ok and e.errno == errno.ENOENT:
-      pass
-    else:
-      raise
+        raise
+  else:
+    os.remove(path)
 
 
 def walk(top, topdown=True, onerror=None, followlinks=False):

platform_utils_win32.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,10 +16,18 @@
 
 import errno
 
+from pyversion import is_python3
 from ctypes import WinDLL, get_last_error, FormatError, WinError, addressof
-from ctypes import c_buffer, c_ubyte, Structure, Union, byref
+from ctypes import c_buffer
 from ctypes.wintypes import BOOL, BOOLEAN, LPCWSTR, DWORD, HANDLE
-from ctypes.wintypes import WCHAR, USHORT, LPVOID, ULONG, LPDWORD
+from ctypes.wintypes import WCHAR, USHORT, LPVOID, ULONG
+if is_python3():
+  from ctypes import c_ubyte, Structure, Union, byref
+  from ctypes.wintypes import LPDWORD
+else:
+  # For legacy Python2 different imports are needed.
+  from ctypes.wintypes import POINTER, c_ubyte, Structure, Union, byref
+  LPDWORD = POINTER(DWORD)
 
 kernel32 = WinDLL('kernel32', use_last_error=True)
 
@@ -194,15 +204,26 @@ def readlink(path):
         'Error reading symbolic link \"%s\"'.format(path))
   rdb = REPARSE_DATA_BUFFER.from_buffer(target_buffer)
   if rdb.ReparseTag == IO_REPARSE_TAG_SYMLINK:
-    return rdb.SymbolicLinkReparseBuffer.PrintName
+    return _preserve_encoding(path, rdb.SymbolicLinkReparseBuffer.PrintName)
   elif rdb.ReparseTag == IO_REPARSE_TAG_MOUNT_POINT:
-    return rdb.MountPointReparseBuffer.PrintName
+    return _preserve_encoding(path, rdb.MountPointReparseBuffer.PrintName)
   # Unsupported reparse point type
   _raise_winerror(
       ERROR_NOT_SUPPORTED,
       'Error reading symbolic link \"%s\"'.format(path))
 
 
+def _preserve_encoding(source, target):
+  """Ensures target is the same string type (i.e. unicode or str) as source."""
+
+  if is_python3():
+    return target
+
+  if isinstance(source, unicode):  # noqa: F821
+    return unicode(target)  # noqa: F821
+  return str(target)
+
+
 def _raise_winerror(code, error_desc):
   win_error_desc = FormatError(code).strip()
   error_desc = "%s: %s".format(error_desc, win_error_desc)

progress.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,52 +27,18 @@ _NOT_TTY = not os.isatty(2)
 CSI_ERASE_LINE = '\x1b[2K'
 
 
-def duration_str(total):
-  """A less noisy timedelta.__str__.
-
-  The default timedelta stringification contains a lot of leading zeros and
-  uses microsecond resolution.  This makes for noisy output.
-  """
-  hours, rem = divmod(total, 3600)
-  mins, secs = divmod(rem, 60)
-  ret = '%.3fs' % (secs,)
-  if mins:
-    ret = '%im%s' % (mins, ret)
-  if hours:
-    ret = '%ih%s' % (hours, ret)
-  return ret
-
-
 class Progress(object):
-  def __init__(self, title, total=0, units='', print_newline=False, delay=True,
-               quiet=False):
+  def __init__(self, title, total=0, units='', print_newline=False,
+               always_print_percentage=False):
     self._title = title
     self._total = total
     self._done = 0
+    self._lastp = -1
     self._start = time()
-    self._show = not delay
+    self._show = False
     self._units = units
     self._print_newline = print_newline
-    # Only show the active jobs section if we run more than one in parallel.
-    self._show_jobs = False
-    self._active = 0
-
-    # When quiet, never show any output.  It's a bit hacky, but reusing the
-    # existing logic that delays initial output keeps the rest of the class
-    # clean.  Basically we set the start time to years in the future.
-    if quiet:
-      self._show = False
-      self._start += 2**32
-
-  def start(self, name):
-    self._active += 1
-    if not self._show_jobs:
-      self._show_jobs = self._active > 1
-    self.update(inc=0, msg='started ' + name)
-
-  def finish(self, name):
-    self.update(msg='finished ' + name)
-    self._active -= 1
+    self._always_print_percentage = always_print_percentage
 
   def update(self, inc=1, msg=''):
     self._done += inc
@@ -92,40 +60,35 @@ class Progress(object):
       sys.stderr.flush()
     else:
       p = (100 * self._done) / self._total
-      if self._show_jobs:
-        jobs = '[%d job%s] ' % (self._active, 's' if self._active > 1 else '')
-      else:
-        jobs = ''
-      sys.stderr.write('%s\r%s: %2d%% %s(%d%s/%d%s)%s%s%s' % (
-          CSI_ERASE_LINE,
-          self._title,
-          p,
-          jobs,
-          self._done, self._units,
-          self._total, self._units,
-          ' ' if msg else '', msg,
-          '\n' if self._print_newline else ''))
-      sys.stderr.flush()
+
+      if self._lastp != p or self._always_print_percentage:
+        self._lastp = p
+        sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s)%s%s%s' % (
+            CSI_ERASE_LINE,
+            self._title,
+            p,
+            self._done, self._units,
+            self._total, self._units,
+            ' ' if msg else '', msg,
+            "\n" if self._print_newline else ""))
+        sys.stderr.flush()
 
   def end(self):
     if _NOT_TTY or IsTrace() or not self._show:
       return
 
-    duration = duration_str(time() - self._start)
     if self._total <= 0:
-      sys.stderr.write('%s\r%s: %d, done in %s\n' % (
+      sys.stderr.write('%s\r%s: %d, done.\n' % (
           CSI_ERASE_LINE,
           self._title,
-          self._done,
-          duration))
+          self._done))
       sys.stderr.flush()
     else:
       p = (100 * self._done) / self._total
-      sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s), done in %s\n' % (
+      sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s), done.\n' % (
           CSI_ERASE_LINE,
           self._title,
           p,
           self._done, self._units,
-          self._total, self._units,
-          duration))
+          self._total, self._units))
       sys.stderr.flush()

pyversion.py

@@ -0,0 +1,21 @@
+# -*- coding:utf-8 -*-
+#
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+
+
+def is_python3():
+  return sys.version_info[0] == 3

release/README.md

@@ -1,2 +1,5 @@
+> **Warning: The "master" branch is no longer used.  Use "main" instead.**<br>
+> https://gerrit.googlesource.com/git-repo/+/HEAD/release/README.md
+
 These are helper tools for managing official releases.
 See the [release process](../docs/release-process.md) document for more details.

release/sign-launcher.py

@@ -20,7 +20,6 @@ This is intended to be run only by the official Repo release managers.
 
 import argparse
 import os
-import re
 import subprocess
 import sys
 
@@ -50,37 +49,18 @@ def check(opts):
   util.run(opts, ['gpg', '--verify', f'{opts.launcher}.asc'])
 
 
-def get_version(opts):
-  """Get the version from |launcher|."""
-  # Make sure we don't search $PATH when signing the "repo" file in the cwd.
-  launcher = os.path.join('.', opts.launcher)
-  cmd = [launcher, '--version']
-  ret = util.run(opts, cmd, encoding='utf-8', stdout=subprocess.PIPE)
-  m = re.search(r'repo launcher version ([0-9.]+)', ret.stdout)
-  if not m:
-    sys.exit(f'{opts.launcher}: unable to detect repo version')
-  return m.group(1)
-
-
-def postmsg(opts, version):
+def postmsg(opts):
   """Helpful info to show at the end for release manager."""
   print(f"""
 Repo launcher bucket:
   gs://git-repo-downloads/
 
-You should first upload it with a specific version:
-  gsutil cp -a public-read {opts.launcher} gs://git-repo-downloads/repo-{version}
-  gsutil cp -a public-read {opts.launcher}.asc gs://git-repo-downloads/repo-{version}.asc
+To upload this launcher directly:
+  gsutil cp -a public-read {opts.launcher} {opts.launcher}.asc gs://git-repo-downloads/
 
-Then to make it the public default:
-  gsutil cp -a public-read gs://git-repo-downloads/repo-{version} gs://git-repo-downloads/repo
-  gsutil cp -a public-read gs://git-repo-downloads/repo-{version}.asc gs://git-repo-downloads/repo.asc
-
-NB: If a rollback is necessary, the GS bucket archives old versions, and may be
-    accessed by specifying their unique id number.
-  gsutil ls -la gs://git-repo-downloads/repo gs://git-repo-downloads/repo.asc
-  gsutil cp -a public-read gs://git-repo-downloads/repo#<unique id> gs://git-repo-downloads/repo
-  gsutil cp -a public-read gs://git-repo-downloads/repo.asc#<unique id> gs://git-repo-downloads/repo.asc
+NB: You probably want to upload it with a specific version first, e.g.:
+  gsutil cp -a public-read {opts.launcher} gs://git-repo-downloads/repo-3.0
+  gsutil cp -a public-read {opts.launcher}.asc gs://git-repo-downloads/repo-3.0.asc
 """)
 
 
@@ -123,10 +103,9 @@ def main(argv):
     opts.keys = [util.KEYID_DSA, util.KEYID_RSA, util.KEYID_ECC]
     util.import_release_key(opts)
 
-  version = get_version(opts)
   sign(opts)
   check(opts)
-  postmsg(opts, version)
+  postmsg(opts)
 
   return 0
 

release/update-manpages

@@ -1,102 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Helper tool for generating manual page for all repo commands.
-
-This is intended to be run before every official Repo release.
-"""
-
-from pathlib import Path
-from functools import partial
-import argparse
-import multiprocessing
-import os
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-
-TOPDIR = Path(__file__).resolve().parent.parent
-MANDIR = TOPDIR.joinpath('man')
-
-# Load repo local modules.
-sys.path.insert(0, str(TOPDIR))
-from git_command import RepoSourceVersion
-import subcmds
-
-def worker(cmd, **kwargs):
-  subprocess.run(cmd, **kwargs)
-
-def main(argv):
-  parser = argparse.ArgumentParser(description=__doc__)
-  opts = parser.parse_args(argv)
-
-  if not shutil.which('help2man'):
-    sys.exit('Please install help2man to continue.')
-
-  # Let repo know we're generating man pages so it can avoid some dynamic
-  # behavior (like probing active number of CPUs).  We use a weird name &
-  # value to make it less likely for users to set this var themselves.
-  os.environ['_REPO_GENERATE_MANPAGES_'] = ' indeed! '
-
-  # "repo branch" is an alias for "repo branches".
-  del subcmds.all_commands['branch']
-  (MANDIR / 'repo-branch.1').write_text('.so man1/repo-branches.1')
-
-  version = RepoSourceVersion()
-  cmdlist = [['help2man', '-N', '-n', f'repo {cmd} - manual page for repo {cmd}',
-    '-S', f'repo {cmd}', '-m', 'Repo Manual', f'--version-string={version}',
-    '-o', MANDIR.joinpath(f'repo-{cmd}.1.tmp'), TOPDIR.joinpath('repo'),
-    '-h', f'help {cmd}'] for cmd in subcmds.all_commands]
-  cmdlist.append(['help2man', '-N', '-n', 'repository management tool built on top of git',
-    '-S', 'repo', '-m', 'Repo Manual', f'--version-string={version}',
-    '-o', MANDIR.joinpath('repo.1.tmp'), TOPDIR.joinpath('repo'),
-    '-h', '--help-all'])
-
-  with tempfile.TemporaryDirectory() as tempdir:
-    repo_dir = Path(tempdir) / '.repo'
-    repo_dir.mkdir()
-    (repo_dir / 'repo').symlink_to(TOPDIR)
-
-    # Run all cmd in parallel, and wait for them to finish.
-    with multiprocessing.Pool() as pool:
-      pool.map(partial(worker, cwd=tempdir, check=True), cmdlist)
-
-  regex = (
-      (r'(It was generated by help2man) [0-9.]+', '\g<1>.'),
-      (r'^\.IP\n(.*:)\n', '.SS \g<1>\n'),
-      (r'^\.PP\nDescription', '.SH DETAILS'),
-  )
-  for tmp_path in MANDIR.glob('*.1.tmp'):
-    path = tmp_path.parent / tmp_path.stem
-    old_data = path.read_text() if path.exists() else ''
-
-    data = tmp_path.read_text()
-    tmp_path.unlink()
-
-    for pattern, replacement in regex:
-      data = re.sub(pattern, replacement, data, flags=re.M)
-
-    # If the only thing that changed was the date, don't refresh.  This avoids
-    # a lot of noise when only one file actually updates.
-    old_data = re.sub(r'^(\.TH REPO "1" ")([^"]+)', r'\1', old_data, flags=re.M)
-    new_data = re.sub(r'^(\.TH REPO "1" ")([^"]+)', r'\1', data, flags=re.M)
-    if old_data != new_data:
-      path.write_text(data)
-
-
-if __name__ == '__main__':
-  sys.exit(main(sys.argv[1:]))

repo

@@ -32,13 +32,6 @@ import subprocess
 import sys
 
 
-# These should never be newer than the main.py version since this needs to be a
-# bit more flexible with older systems.  See that file for more details on the
-# versions we select.
-MIN_PYTHON_VERSION_SOFT = (3, 6)
-MIN_PYTHON_VERSION_HARD = (3, 5)
-
-
 # Keep basic logic in sync with repo_trace.py.
 class Trace(object):
   """Trace helper logic."""
@@ -77,6 +70,8 @@ def check_python_version():
   def reexec(prog):
     exec_command([prog] + sys.argv)
 
+  MIN_PYTHON_VERSION = (3, 6)
+
   ver = sys.version_info
   major = ver.major
   minor = ver.minor
@@ -85,26 +80,19 @@ def check_python_version():
   if (major, minor) < (2, 7):
     print('repo: error: Your Python version is too old. '
           'Please use Python {}.{} or newer instead.'.format(
-              *MIN_PYTHON_VERSION_SOFT), file=sys.stderr)
+              *MIN_PYTHON_VERSION), file=sys.stderr)
     sys.exit(1)
 
   # Try to re-exec the version specific Python 3 if needed.
-  if (major, minor) < MIN_PYTHON_VERSION_SOFT:
+  if (major, minor) < MIN_PYTHON_VERSION:
     # Python makes releases ~once a year, so try our min version +10 to help
     # bridge the gap.  This is the fallback anyways so perf isn't critical.
-    min_major, min_minor = MIN_PYTHON_VERSION_SOFT
+    min_major, min_minor = MIN_PYTHON_VERSION
     for inc in range(0, 10):
       reexec('python{}.{}'.format(min_major, min_minor + inc))
 
-    # Fallback to older versions if possible.
-    for inc in range(MIN_PYTHON_VERSION_SOFT[1] - MIN_PYTHON_VERSION_HARD[1], 0, -1):
-      # Don't downgrade, and don't reexec ourselves (which would infinite loop).
-      if (min_major, min_minor - inc) <= (major, minor):
-        break
-      reexec('python{}.{}'.format(min_major, min_minor - inc))
-
-    # Try the generic Python 3 wrapper, but only if it's new enough.  If it
-    # isn't, we want to just give up below and make the user resolve things.
+    # Try the generic Python 3 wrapper, but only if it's new enough.  We don't
+    # want to go from (still supported) Python 2.7 to (unsupported) Python 3.5.
     try:
       proc = subprocess.Popen(
           ['python3', '-c', 'import sys; '
@@ -115,20 +103,18 @@ def check_python_version():
     except (OSError, subprocess.CalledProcessError):
       python3_ver = None
 
-    # If the python3 version looks like it's new enough, give it a try.
-    if (python3_ver and python3_ver >= MIN_PYTHON_VERSION_HARD
-            and python3_ver != (major, minor)):
+    # The python3 version looks like it's new enough, so give it a try.
+    if python3_ver and python3_ver >= MIN_PYTHON_VERSION:
       reexec('python3')
 
     # We're still here, so diagnose things for the user.
     if major < 3:
-      print('repo: error: Python 2 is no longer supported; '
-            'Please upgrade to Python {}.{}+.'.format(*MIN_PYTHON_VERSION_HARD),
+      print('repo: warning: Python 2 is no longer supported; '
+            'Please upgrade to Python {}.{}+.'.format(*MIN_PYTHON_VERSION),
             file=sys.stderr)
-      sys.exit(1)
-    elif (major, minor) < MIN_PYTHON_VERSION_HARD:
+    else:
       print('repo: error: Python 3 version is too old; '
-            'Please use Python {}.{} or newer.'.format(*MIN_PYTHON_VERSION_HARD),
+            'Please use Python {}.{} or newer.'.format(*MIN_PYTHON_VERSION),
             file=sys.stderr)
       sys.exit(1)
 
@@ -145,11 +131,9 @@ if not REPO_URL:
 REPO_REV = os.environ.get('REPO_REV')
 if not REPO_REV:
   REPO_REV = 'stable'
-# URL to file bug reports for repo tool issues.
-BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue'
 
 # increment this whenever we make important changes to this script
-VERSION = (2, 21)
+VERSION = (2, 8)
 
 # increment this if the MAINTAINER_KEYS block is modified
 KEYRING_VERSION = (2, 3)
@@ -248,7 +232,6 @@ GITC_FS_ROOT_DIR = '/gitc/manifest-rw/'
 
 import collections
 import errno
-import json
 import optparse
 import re
 import shutil
@@ -272,18 +255,11 @@ gpg_dir = os.path.join(home_dot_repo, 'gnupg')
 def GetParser(gitc_init=False):
   """Setup the CLI parser."""
   if gitc_init:
-    usage = 'repo gitc-init -c client [options] [-u] url'
+    usage = 'repo gitc-init -u url -c client [options]'
   else:
-    usage = 'repo init [options] [-u] url'
+    usage = 'repo init -u url [options]'
 
   parser = optparse.OptionParser(usage=usage)
-  InitParser(parser, gitc_init=gitc_init)
-  return parser
-
-
-def InitParser(parser, gitc_init=False):
-  """Setup the CLI parser."""
-  # NB: Keep in sync with command.py:_CommonOptions().
 
   # Logging.
   group = parser.add_option_group('Logging options')
@@ -298,28 +274,10 @@ def InitParser(parser, gitc_init=False):
   group = parser.add_option_group('Manifest options')
   group.add_option('-u', '--manifest-url',
                    help='manifest repository location', metavar='URL')
-  group.add_option('-b', '--manifest-branch', metavar='REVISION',
-                   help='manifest branch or revision (use HEAD for default)')
-  group.add_option('-m', '--manifest-name', default='default.xml',
+  group.add_option('-b', '--manifest-branch',
+                   help='manifest branch or revision', metavar='REVISION')
+  group.add_option('-m', '--manifest-name',
                    help='initial manifest file', metavar='NAME.xml')
-  group.add_option('-g', '--groups', default='default',
-                   help='restrict manifest projects to ones with specified '
-                        'group(s) [default|all|G1,G2,G3|G4,-G5,-G6]',
-                   metavar='GROUP')
-  group.add_option('-p', '--platform', default='auto',
-                   help='restrict manifest projects to ones with a specified '
-                        'platform group [auto|all|none|linux|darwin|...]',
-                   metavar='PLATFORM')
-  group.add_option('--submodules', action='store_true',
-                   help='sync any submodules associated with the manifest repo')
-  group.add_option('--standalone-manifest', action='store_true',
-                   help='download the manifest as a static file '
-                        'rather then create a git checkout of '
-                        'the manifest repo')
-
-  # Options that only affect manifest project, and not any of the projects
-  # specified in the manifest itself.
-  group = parser.add_option_group('Manifest (only) checkout options')
   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.
@@ -328,29 +286,9 @@ def InitParser(parser, gitc_init=False):
   group.add_option(*cbr_opts,
                    dest='current_branch_only', action='store_true',
                    help='fetch only current manifest branch from server')
-  group.add_option('--no-current-branch',
-                   dest='current_branch_only', action='store_false',
-                   help='fetch all manifest branches from server')
-  group.add_option('--tags',
-                   action='store_true',
-                   help='fetch tags in the manifest')
-  group.add_option('--no-tags',
-                   dest='tags', action='store_false',
-                   help="don't fetch tags in the manifest")
-
-  # These are fundamentally different ways of structuring the checkout.
-  group = parser.add_option_group('Checkout modes')
   group.add_option('--mirror', action='store_true',
                    help='create a replica of the remote repositories '
                         'rather than a client working directory')
-  group.add_option('--archive', action='store_true',
-                   help='checkout an archive instead of a git repository for '
-                        'each project. See git archive.')
-  group.add_option('--worktree', action='store_true',
-                   help='use git-worktree to manage projects')
-
-  # These are fundamentally different ways of structuring the checkout.
-  group = parser.add_option_group('Project checkout optimizations')
   group.add_option('--reference',
                    help='location of mirror directory', metavar='DIR')
   group.add_option('--dissociate', action='store_true',
@@ -361,32 +299,32 @@ def InitParser(parser, gitc_init=False):
   group.add_option('--partial-clone', action='store_true',
                    help='perform partial clone (https://git-scm.com/'
                         'docs/gitrepository-layout#_code_partialclone_code)')
-  group.add_option('--no-partial-clone', action='store_false',
-                   help='disable use of partial clone (https://git-scm.com/'
-                        'docs/gitrepository-layout#_code_partialclone_code)')
-  group.add_option('--partial-clone-exclude', action='store',
-                   help='exclude the specified projects (a comma-delimited '
-                        'project names) from partial clone (https://git-scm.com'
-                        '/docs/gitrepository-layout#_code_partialclone_code)')
   group.add_option('--clone-filter', action='store', default='blob:none',
                    help='filter for use with --partial-clone '
                         '[default: %default]')
-  group.add_option('--use-superproject', action='store_true', default=None,
-                   help='use the manifest superproject to sync projects; implies -c')
-  group.add_option('--no-use-superproject', action='store_false',
-                   dest='use_superproject',
-                   help='disable use of manifest superprojects')
+  group.add_option('--worktree', action='store_true',
+                   help=optparse.SUPPRESS_HELP)
+  group.add_option('--archive', action='store_true',
+                   help='checkout an archive instead of a git repository for '
+                        'each project. See git archive.')
+  group.add_option('--submodules', action='store_true',
+                   help='sync any submodules associated with the manifest repo')
+  group.add_option('-g', '--groups', default='default',
+                   help='restrict manifest projects to ones with specified '
+                        'group(s) [default|all|G1,G2,G3|G4,-G5,-G6]',
+                   metavar='GROUP')
+  group.add_option('-p', '--platform', default='auto',
+                   help='restrict manifest projects to ones with a specified '
+                        'platform group [auto|all|none|linux|darwin|...]',
+                   metavar='PLATFORM')
   group.add_option('--clone-bundle', action='store_true',
-                   help='enable use of /clone.bundle on HTTP/HTTPS '
-                        '(default if not --partial-clone)')
+                   help='enable use of /clone.bundle on HTTP/HTTPS (default if not --partial-clone)')
   group.add_option('--no-clone-bundle',
                    dest='clone_bundle', action='store_false',
                    help='disable use of /clone.bundle on HTTP/HTTPS (default if --partial-clone)')
-  group.add_option('--git-lfs', action='store_true',
-                   help='enable Git LFS support')
-  group.add_option('--no-git-lfs',
-                   dest='git_lfs', action='store_false',
-                   help='disable Git LFS support')
+  group.add_option('--no-tags',
+                   dest='tags', default=True, action='store_false',
+                   help="don't fetch tags in the manifest")
 
   # Tool.
   group = parser.add_option_group('repo Version options')
@@ -501,11 +439,9 @@ def get_gitc_manifest_dir():
 def gitc_parse_clientdir(gitc_fs_path):
   """Parse a path in the GITC FS and return its client name.
 
-  Args:
-    gitc_fs_path: A subdirectory path within the GITC_FS_ROOT_DIR.
+  @param gitc_fs_path: A subdirectory path within the GITC_FS_ROOT_DIR.
 
-  Returns:
-    The GITC client name.
+  @returns: The GITC client name
   """
   if gitc_fs_path == GITC_FS_ROOT_DIR:
     return None
@@ -563,11 +499,8 @@ def _Init(args, gitc_init=False):
   parser = GetParser(gitc_init=gitc_init)
   opt, args = parser.parse_args(args)
   if args:
-    if not opt.manifest_url:
-      opt.manifest_url = args.pop(0)
-    if args:
-      parser.print_usage()
-      sys.exit(1)
+    parser.print_usage()
+    sys.exit(1)
   opt.quiet = opt.output_mode is False
   opt.verbose = opt.output_mode is True
 
@@ -623,7 +556,6 @@ def _Init(args, gitc_init=False):
             "REPO_URL set correctly?" % url, file=sys.stderr)
 
   except CloneFailure:
-    print('fatal: double check your --repo-rev setting.', file=sys.stderr)
     if opt.quiet:
       print('fatal: repo init failed; run without --quiet to see why',
             file=sys.stderr)
@@ -869,10 +801,11 @@ def _DownloadBundle(url, cwd, quiet, verbose):
     try:
       r = urllib.request.urlopen(url)
     except urllib.error.HTTPError as e:
-      if e.code not in [400, 401, 403, 404, 501]:
-        print('warning: Cannot get %s' % url, file=sys.stderr)
-        print('warning: HTTP error %s' % e.code, file=sys.stderr)
-      return False
+      if e.code in [401, 403, 404, 501]:
+        return False
+      print('fatal: Cannot get %s' % url, file=sys.stderr)
+      print('fatal: HTTP error %s' % e.code, file=sys.stderr)
+      raise CloneFailure()
     except urllib.error.URLError as e:
       print('fatal: Cannot get %s' % url, file=sys.stderr)
       print('fatal: error %s' % e.reason, file=sys.stderr)
@@ -1086,90 +1019,6 @@ def _ParseArguments(args):
   return cmd, opt, arg
 
 
-class Requirements(object):
-  """Helper for checking repo's system requirements."""
-
-  REQUIREMENTS_NAME = 'requirements.json'
-
-  def __init__(self, requirements):
-    """Initialize.
-
-    Args:
-      requirements: A dictionary of settings.
-    """
-    self.requirements = requirements
-
-  @classmethod
-  def from_dir(cls, path):
-    return cls.from_file(os.path.join(path, cls.REQUIREMENTS_NAME))
-
-  @classmethod
-  def from_file(cls, path):
-    try:
-      with open(path, 'rb') as f:
-        data = f.read()
-    except EnvironmentError:
-      # NB: EnvironmentError is used for Python 2 & 3 compatibility.
-      # If we couldn't open the file, assume it's an old source tree.
-      return None
-
-    return cls.from_data(data)
-
-  @classmethod
-  def from_data(cls, data):
-    comment_line = re.compile(br'^ *#')
-    strip_data = b''.join(x for x in data.splitlines() if not comment_line.match(x))
-    try:
-      json_data = json.loads(strip_data)
-    except Exception:  # pylint: disable=broad-except
-      # If we couldn't parse it, assume it's incompatible.
-      return None
-
-    return cls(json_data)
-
-  def _get_soft_ver(self, pkg):
-    """Return the soft version for |pkg| if it exists."""
-    return self.requirements.get(pkg, {}).get('soft', ())
-
-  def _get_hard_ver(self, pkg):
-    """Return the hard version for |pkg| if it exists."""
-    return self.requirements.get(pkg, {}).get('hard', ())
-
-  @staticmethod
-  def _format_ver(ver):
-    """Return a dotted version from |ver|."""
-    return '.'.join(str(x) for x in ver)
-
-  def assert_ver(self, pkg, curr_ver):
-    """Verify |pkg|'s |curr_ver| is new enough."""
-    curr_ver = tuple(curr_ver)
-    soft_ver = tuple(self._get_soft_ver(pkg))
-    hard_ver = tuple(self._get_hard_ver(pkg))
-    if curr_ver < hard_ver:
-      print('repo: error: Your version of "%s" (%s) is unsupported; '
-            'Please upgrade to at least version %s to continue.' %
-            (pkg, self._format_ver(curr_ver), self._format_ver(soft_ver)),
-            file=sys.stderr)
-      sys.exit(1)
-
-    if curr_ver < soft_ver:
-      print('repo: warning: Your version of "%s" (%s) is no longer supported; '
-            'Please upgrade to at least version %s to avoid breakage.' %
-            (pkg, self._format_ver(curr_ver), self._format_ver(soft_ver)),
-            file=sys.stderr)
-
-  def assert_all(self):
-    """Assert all of the requirements are satisified."""
-    # See if we need a repo launcher upgrade first.
-    self.assert_ver('repo', VERSION)
-
-    # Check python before we try to import the repo code.
-    self.assert_ver('python', sys.version_info)
-
-    # Check git while we're at it.
-    self.assert_ver('git', ParseGitVersion())
-
-
 def _Usage():
   gitc_usage = ""
   if get_gitc_manifest_dir():
@@ -1188,7 +1037,6 @@ The most commonly used repo commands are:
 
 For access to the full online help, install repo ("repo init").
 """)
-  print('Bug reports:', BUG_URL)
   sys.exit(0)
 
 
@@ -1222,7 +1070,6 @@ def _Version():
     print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
     print('CPU %s (%s)' %
           (uname.machine, uname.processor if uname.processor else 'unknown'))
-  print('Bug reports:', BUG_URL)
   sys.exit(0)
 
 
@@ -1329,10 +1176,6 @@ def main(orig_args):
     print("fatal: unable to find repo entry point", file=sys.stderr)
     sys.exit(1)
 
-  reqs = Requirements.from_dir(os.path.dirname(repo_main))
-  if reqs:
-    reqs.assert_all()
-
   ver_str = '.'.join(map(str, VERSION))
   me = [sys.executable, repo_main,
         '--repo-dir=%s' % rel_repo_dir,

repo_trace.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +19,7 @@
 Activated via `repo --trace ...` or `REPO_TRACE=1 repo ...`.
 """
 
+from __future__ import print_function
 import sys
 import os
 

requirements.json

@@ -1,57 +0,0 @@
-# This file declares various requirements for this version of repo.  The
-# launcher script will load it and check the constraints before trying to run
-# us.  This avoids issues of the launcher using an old version of Python (e.g.
-# 3.5) while the codebase has moved on to requiring something much newer (e.g.
-# 3.8).  If the launcher tried to import us, it would fail with syntax errors.
-
-# This is a JSON file with line-level comments allowed.
-
-# Always keep backwards compatibility in mine.  The launcher script is robust
-# against missing values, but when a field is renamed/removed, it means older
-# versions of the launcher script won't be able to enforce the constraint.
-
-# When requiring versions, always use lists as they are easy to parse & compare
-# in Python.  Strings would require futher processing to turn into a list.
-
-# Version constraints should be expressed in pairs: soft & hard.  Soft versions
-# are when we start warning users that their software too old and we're planning
-# on dropping support for it, so they need to start planning system upgrades.
-# Hard versions are when we refuse to work the tool.  Users will be shown an
-# error message before we abort entirely.
-
-# When deciding whether to upgrade a version requirement, check out the distro
-# lists to see who will be impacted:
-# https://gerrit.googlesource.com/git-repo/+/HEAD/docs/release-process.md#Project-References
-
-{
-  # The repo launcher itself.  This allows us to force people to upgrade as some
-  # ignore the warnings about it being out of date, or install ancient versions
-  # to start with for whatever reason.
-  #
-  # NB: Repo launchers started checking this file with repo-2.12, so listing
-  # versions older than that won't make a difference.
-  "repo": {
-    "hard": [2, 11],
-    "soft": [2, 11]
-  },
-
-  # Supported Python versions.
-  #
-  # python-3.6 is in Ubuntu Bionic.
-  # python-3.7 is in Debian Buster.
-  "python": {
-    "hard": [3, 6],
-    "soft": [3, 6]
-  },
-
-  # Supported git versions.
-  #
-  # git-1.7.2 is in Debian Squeeze.
-  # git-1.7.9 is in Ubuntu Precise.
-  # git-1.9.1 is in Ubuntu Trusty.
-  # git-1.7.10 is in Debian Wheezy.
-  "git": {
-    "hard": [1, 7, 2],
-    "soft": [1, 9, 1]
-  }
-}

run_tests

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
 # Copyright 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,32 +16,26 @@
 
 """Wrapper to run pytest with the right settings."""
 
+from __future__ import print_function
+
 import errno
 import os
-import shutil
 import subprocess
 import sys
 
 
-def find_pytest():
-  """Try to locate a good version of pytest."""
-  # If we're in a virtualenv, assume that it's provided the right pytest.
-  if 'VIRTUAL_ENV' in os.environ:
-    return 'pytest'
-
-  # Use the Python 3 version if available.
-  ret = shutil.which('pytest-3')
-  if ret:
-    return ret
-
-  # Hopefully this is a Python 3 version.
-  ret = shutil.which('pytest')
-  if ret:
-    return ret
-
-  print('%s: unable to find pytest.' % (__file__,), file=sys.stderr)
-  print('%s: Try installing: sudo apt-get install python-pytest' % (__file__,),
-        file=sys.stderr)
+def run_pytest(cmd, argv):
+  """Run the unittests via |cmd|."""
+  try:
+    return subprocess.call([cmd] + argv)
+  except OSError as e:
+    if e.errno == errno.ENOENT:
+      print('%s: unable to run `%s`: %s' % (__file__, cmd, e), file=sys.stderr)
+      print('%s: Try installing pytest: sudo apt-get install python-pytest' %
+            (__file__,), file=sys.stderr)
+      return 127
+    else:
+      raise
 
 
 def main(argv):
@@ -53,8 +48,7 @@ def main(argv):
     pythonpath += os.pathsep + oldpythonpath
   os.environ['PYTHONPATH'] = pythonpath
 
-  pytest = find_pytest()
-  return subprocess.run([pytest] + argv, check=False).returncode
+  return run_pytest('pytest', argv)
 
 
 if __name__ == '__main__':

setup.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
 # Copyright 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the 'License");
@@ -15,6 +16,8 @@
 
 """Python packaging for repo."""
 
+from __future__ import print_function
+
 import os
 import setuptools
 
@@ -32,7 +35,7 @@ with open(os.path.join(TOPDIR, 'README.md')) as fp:
 # https://packaging.python.org/tutorials/packaging-projects/
 setuptools.setup(
     name='repo',
-    version='2',
+    version='1.13.8',
     maintainer='Various',
     maintainer_email='repo-discuss@googlegroups.com',
     description='Repo helps manage many Git repositories',
@@ -52,10 +55,9 @@ setuptools.setup(
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows :: Windows 10',
         'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3 :: Only',
         'Topic :: Software Development :: Version Control :: Git',
     ],
-    python_requires='>=3.6',
+    # We support Python 2.7 and Python 3.6+.
+    python_requires='>=2.7, ' + ', '.join('!=3.%i.*' % x for x in range(0, 6)),
     packages=['subcmds'],
 )

ssh.py

@@ -1,280 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Common SSH management logic."""
-
-import functools
-import multiprocessing
-import os
-import re
-import signal
-import subprocess
-import sys
-import tempfile
-import time
-
-import platform_utils
-from repo_trace import Trace
-
-
-PROXY_PATH = os.path.join(os.path.dirname(__file__), 'git_ssh')
-
-
-def _run_ssh_version():
-  """run ssh -V to display the version number"""
-  return subprocess.check_output(['ssh', '-V'], stderr=subprocess.STDOUT).decode()
-
-
-def _parse_ssh_version(ver_str=None):
-  """parse a ssh version string into a tuple"""
-  if ver_str is None:
-    ver_str = _run_ssh_version()
-  m = re.match(r'^OpenSSH_([0-9.]+)(p[0-9]+)?\s', ver_str)
-  if m:
-    return tuple(int(x) for x in m.group(1).split('.'))
-  else:
-    return ()
-
-
-@functools.lru_cache(maxsize=None)
-def version():
-  """return ssh version as a tuple"""
-  try:
-    return _parse_ssh_version()
-  except FileNotFoundError:
-    print('fatal: ssh not installed', file=sys.stderr)
-    sys.exit(1)
-  except subprocess.CalledProcessError:
-    print('fatal: unable to detect ssh version', file=sys.stderr)
-    sys.exit(1)
-
-
-URI_SCP = re.compile(r'^([^@:]*@?[^:/]{1,}):')
-URI_ALL = re.compile(r'^([a-z][a-z+-]*)://([^@/]*@?[^/]*)/')
-
-
-class ProxyManager:
-  """Manage various ssh clients & masters that we spawn.
-
-  This will take care of sharing state between multiprocessing children, and
-  make sure that if we crash, we don't leak any of the ssh sessions.
-
-  The code should work with a single-process scenario too, and not add too much
-  overhead due to the manager.
-  """
-
-  # Path to the ssh program to run which will pass our master settings along.
-  # Set here more as a convenience API.
-  proxy = PROXY_PATH
-
-  def __init__(self, manager):
-    # Protect access to the list of active masters.
-    self._lock = multiprocessing.Lock()
-    # List of active masters (pid).  These will be spawned on demand, and we are
-    # responsible for shutting them all down at the end.
-    self._masters = manager.list()
-    # Set of active masters indexed by "host:port" information.
-    # The value isn't used, but multiprocessing doesn't provide a set class.
-    self._master_keys = manager.dict()
-    # Whether ssh masters are known to be broken, so we give up entirely.
-    self._master_broken = manager.Value('b', False)
-    # List of active ssh sesssions.  Clients will be added & removed as
-    # connections finish, so this list is just for safety & cleanup if we crash.
-    self._clients = manager.list()
-    # Path to directory for holding master sockets.
-    self._sock_path = None
-
-  def __enter__(self):
-    """Enter a new context."""
-    return self
-
-  def __exit__(self, exc_type, exc_value, traceback):
-    """Exit a context & clean up all resources."""
-    self.close()
-
-  def add_client(self, proc):
-    """Track a new ssh session."""
-    self._clients.append(proc.pid)
-
-  def remove_client(self, proc):
-    """Remove a completed ssh session."""
-    try:
-      self._clients.remove(proc.pid)
-    except ValueError:
-      pass
-
-  def add_master(self, proc):
-    """Track a new master connection."""
-    self._masters.append(proc.pid)
-
-  def _terminate(self, procs):
-    """Kill all |procs|."""
-    for pid in procs:
-      try:
-        os.kill(pid, signal.SIGTERM)
-        os.waitpid(pid, 0)
-      except OSError:
-        pass
-
-    # The multiprocessing.list() API doesn't provide many standard list()
-    # methods, so we have to manually clear the list.
-    while True:
-      try:
-        procs.pop(0)
-      except:
-        break
-
-  def close(self):
-    """Close this active ssh session.
-
-    Kill all ssh clients & masters we created, and nuke the socket dir.
-    """
-    self._terminate(self._clients)
-    self._terminate(self._masters)
-
-    d = self.sock(create=False)
-    if d:
-      try:
-        platform_utils.rmdir(os.path.dirname(d))
-      except OSError:
-        pass
-
-  def _open_unlocked(self, host, port=None):
-    """Make sure a ssh master session exists for |host| & |port|.
-
-    If one doesn't exist already, we'll create it.
-
-    We won't grab any locks, so the caller has to do that.  This helps keep the
-    business logic of actually creating the master separate from grabbing locks.
-    """
-    # Check to see whether we already think that the master is running; if we
-    # think it's already running, return right away.
-    if port is not None:
-      key = '%s:%s' % (host, port)
-    else:
-      key = host
-
-    if key in self._master_keys:
-      return True
-
-    if self._master_broken.value or 'GIT_SSH' in os.environ:
-      # Failed earlier, so don't retry.
-      return False
-
-    # We will make two calls to ssh; this is the common part of both calls.
-    command_base = ['ssh', '-o', 'ControlPath %s' % self.sock(), host]
-    if port is not None:
-      command_base[1:1] = ['-p', str(port)]
-
-    # Since the key wasn't in _master_keys, we think that master isn't running.
-    # ...but before actually starting a master, we'll double-check.  This can
-    # be important because we can't tell that that 'git@myhost.com' is the same
-    # as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file.
-    check_command = command_base + ['-O', 'check']
-    try:
-      Trace(': %s', ' '.join(check_command))
-      check_process = subprocess.Popen(check_command,
-                                       stdout=subprocess.PIPE,
-                                       stderr=subprocess.PIPE)
-      check_process.communicate()  # read output, but ignore it...
-      isnt_running = check_process.wait()
-
-      if not isnt_running:
-        # Our double-check found that the master _was_ infact running.  Add to
-        # the list of keys.
-        self._master_keys[key] = True
-        return True
-    except Exception:
-      # Ignore excpetions.  We we will fall back to the normal command and print
-      # to the log there.
-      pass
-
-    command = command_base[:1] + ['-M', '-N'] + command_base[1:]
-    try:
-      Trace(': %s', ' '.join(command))
-      p = subprocess.Popen(command)
-    except Exception as e:
-      self._master_broken.value = True
-      print('\nwarn: cannot enable ssh control master for %s:%s\n%s'
-            % (host, port, str(e)), file=sys.stderr)
-      return False
-
-    time.sleep(1)
-    ssh_died = (p.poll() is not None)
-    if ssh_died:
-      return False
-
-    self.add_master(p)
-    self._master_keys[key] = True
-    return True
-
-  def _open(self, host, port=None):
-    """Make sure a ssh master session exists for |host| & |port|.
-
-    If one doesn't exist already, we'll create it.
-
-    This will obtain any necessary locks to avoid inter-process races.
-    """
-    # Bail before grabbing the lock if we already know that we aren't going to
-    # try creating new masters below.
-    if sys.platform in ('win32', 'cygwin'):
-      return False
-
-    # Acquire the lock.  This is needed to prevent opening multiple masters for
-    # the same host when we're running "repo sync -jN" (for N > 1) _and_ the
-    # manifest <remote fetch="ssh://xyz"> specifies a different host from the
-    # one that was passed to repo init.
-    with self._lock:
-      return self._open_unlocked(host, port)
-
-  def preconnect(self, url):
-    """If |uri| will create a ssh connection, setup the ssh master for it."""
-    m = URI_ALL.match(url)
-    if m:
-      scheme = m.group(1)
-      host = m.group(2)
-      if ':' in host:
-        host, port = host.split(':')
-      else:
-        port = None
-      if scheme in ('ssh', 'git+ssh', 'ssh+git'):
-        return self._open(host, port)
-      return False
-
-    m = URI_SCP.match(url)
-    if m:
-      host = m.group(1)
-      return self._open(host)
-
-    return False
-
-  def sock(self, create=True):
-    """Return the path to the ssh socket dir.
-
-    This has all the master sockets so clients can talk to them.
-    """
-    if self._sock_path is None:
-      if not create:
-        return None
-      tmp_dir = '/tmp'
-      if not os.path.exists(tmp_dir):
-        tmp_dir = tempfile.gettempdir()
-      if version() < (6, 7):
-        tokens = '%r@%h:%p'
-      else:
-        tokens = '%C'  # hash of %l%h%p%r
-      self._sock_path = os.path.join(
-          tempfile.mkdtemp('', 'ssh-', tmp_dir),
-          'master-' + tokens)
-    return self._sock_path

subcmds/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

subcmds/abandon.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
+
 from collections import defaultdict
-import functools
-import itertools
 import sys
 
-from command import Command, DEFAULT_LOCAL_JOBS
+from command import Command
 from git_command import git
 from progress import Progress
 
 
 class Abandon(Command):
-  COMMON = True
+  common = True
   helpSummary = "Permanently abandon a development branch"
   helpUsage = """
 %prog [--all | <branchname>] [<project>...]
@@ -33,9 +35,11 @@ deleting it (and all its history) from your local repository.
 
 It is equivalent to "git branch -D <branchname>".
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
   def _Options(self, p):
+    p.add_option('-q', '--quiet',
+                 action='store_true', default=False,
+                 help='be quiet')
     p.add_option('--all',
                  dest='all', action='store_true',
                  help='delete all branches in all projects')
@@ -51,44 +55,35 @@ It is equivalent to "git branch -D <branchname>".
     else:
       args.insert(0, "'All local branches'")
 
-  def _ExecuteOne(self, all_branches, nb, project):
-    """Abandon one project."""
-    if all_branches:
-      branches = project.GetBranches()
-    else:
-      branches = [nb]
-
-    ret = {}
-    for name in branches:
-      status = project.AbandonBranch(name)
-      if status is not None:
-        ret[name] = status
-    return (ret, project)
-
   def Execute(self, opt, args):
     nb = args[0]
     err = defaultdict(list)
     success = defaultdict(list)
     all_projects = self.GetProjects(args[1:])
 
-    def _ProcessResults(_pool, pm, states):
-      for (results, project) in states:
-        for branch, status in results.items():
+    pm = Progress('Abandon %s' % nb, len(all_projects))
+    for project in all_projects:
+      pm.update()
+
+      if opt.all:
+        branches = list(project.GetBranches().keys())
+      else:
+        branches = [nb]
+
+      for name in branches:
+        status = project.AbandonBranch(name)
+        if status is not None:
           if status:
-            success[branch].append(project)
+            success[name].append(project)
           else:
-            err[branch].append(project)
-        pm.update()
+            err[name].append(project)
+    pm.end()
 
-    self.ExecuteInParallel(
-        opt.jobs,
-        functools.partial(self._ExecuteOne, opt.all, nb),
-        all_projects,
-        callback=_ProcessResults,
-        output=Progress('Abandon %s' % (nb,), len(all_projects), quiet=opt.quiet))
+    width = 25
+    for name in branches:
+      if width < len(name):
+        width = len(name)
 
-    width = max(itertools.chain(
-        [25], (len(x) for x in itertools.chain(success, err))))
     if err:
       for br in err.keys():
         err_msg = "error: cannot abandon %s" % br

subcmds/branches.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import itertools
+from __future__ import print_function
 import sys
-
 from color import Coloring
-from command import Command, DEFAULT_LOCAL_JOBS
+from command import Command
 
 
 class BranchColoring(Coloring):
@@ -62,7 +63,7 @@ class BranchInfo(object):
 
 
 class Branches(Command):
-  COMMON = True
+  common = True
   helpSummary = "View current topic branches"
   helpUsage = """
 %prog [<project>...]
@@ -95,7 +96,6 @@ the branch appears in, or does not appear in.  If no project list
 is shown, then the branch appears in all projects.
 
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
   def Execute(self, opt, args):
     projects = self.GetProjects(args)
@@ -103,19 +103,14 @@ is shown, then the branch appears in all projects.
     all_branches = {}
     project_cnt = len(projects)
 
-    def _ProcessResults(_pool, _output, results):
-      for name, b in itertools.chain.from_iterable(results):
+    for project in projects:
+      for name, b in project.GetBranches().items():
+        b.project = project
         if name not in all_branches:
           all_branches[name] = BranchInfo(name)
         all_branches[name].add(b)
 
-    self.ExecuteInParallel(
-        opt.jobs,
-        expand_project_to_branches,
-        projects,
-        callback=_ProcessResults)
-
-    names = sorted(all_branches)
+    names = list(sorted(all_branches))
 
     if not names:
       print('   (no branches)', file=sys.stderr)
@@ -151,7 +146,7 @@ is shown, then the branch appears in all projects.
         fmt = out.write
         paths = []
         non_cur_paths = []
-        if i.IsSplitCurrent or (in_cnt <= project_cnt - in_cnt):
+        if i.IsSplitCurrent or (in_cnt < project_cnt - in_cnt):
           in_type = 'in'
           for b in i.projects:
             if not i.IsSplitCurrent or b.current:
@@ -163,9 +158,9 @@ is shown, then the branch appears in all projects.
           in_type = 'not in'
           have = set()
           for b in i.projects:
-            have.add(b.project.relpath)
+            have.add(b.project)
           for p in projects:
-            if p.relpath not in have:
+            if p not in have:
               paths.append(p.relpath)
 
         s = ' %s %s' % (in_type, ', '.join(paths))
@@ -185,19 +180,3 @@ is shown, then the branch appears in all projects.
       else:
         out.write(' in all projects')
       out.nl()
-
-
-def expand_project_to_branches(project):
-  """Expands a project into a list of branch names & associated information.
-
-  Args:
-    project: project.Project
-
-  Returns:
-    List[Tuple[str, git_config.Branch]]
-  """
-  branches = []
-  for name, b in project.GetBranches().items():
-    b.project = project
-    branches.append((name, b))
-  return branches

subcmds/checkout.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,15 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import functools
+from __future__ import print_function
 import sys
-
-from command import Command, DEFAULT_LOCAL_JOBS
+from command import Command
 from progress import Progress
 
 
 class Checkout(Command):
-  COMMON = True
+  common = True
   helpSummary = "Checkout a branch for development"
   helpUsage = """
 %prog <branchname> [<project>...]
@@ -33,37 +34,28 @@ The command is equivalent to:
 
   repo forall [<project>...] -c git checkout <branchname>
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
   def ValidateOptions(self, opt, args):
     if not args:
       self.Usage()
 
-  def _ExecuteOne(self, nb, project):
-    """Checkout one project."""
-    return (project.CheckoutBranch(nb), project)
-
   def Execute(self, opt, args):
     nb = args[0]
     err = []
     success = []
     all_projects = self.GetProjects(args[1:])
 
-    def _ProcessResults(_pool, pm, results):
-      for status, project in results:
-        if status is not None:
-          if status:
-            success.append(project)
-          else:
-            err.append(project)
-        pm.update()
+    pm = Progress('Checkout %s' % nb, len(all_projects))
+    for project in all_projects:
+      pm.update()
 
-    self.ExecuteInParallel(
-        opt.jobs,
-        functools.partial(self._ExecuteOne, nb),
-        all_projects,
-        callback=_ProcessResults,
-        output=Progress('Checkout %s' % (nb,), len(all_projects), quiet=opt.quiet))
+      status = project.CheckoutBranch(nb)
+      if status is not None:
+        if status:
+          success.append(project)
+        else:
+          err.append(project)
+    pm.end()
 
     if err:
       for p in err:

subcmds/cherry_pick.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2010 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import re
 import sys
 from command import Command
@@ -21,7 +24,7 @@ CHANGE_ID_RE = re.compile(r'^\s*Change-Id: I([0-9a-f]{40})\s*$')
 
 
 class CherryPick(Command):
-  COMMON = True
+  common = True
   helpSummary = "Cherry-pick a change."
   helpUsage = """
 %prog <sha1>
@@ -32,6 +35,9 @@ The change id will be updated, and a reference to the old
 change id will be added.
 """
 
+  def _Options(self, p):
+    pass
+
   def ValidateOptions(self, opt, args):
     if len(args) != 1:
       self.Usage()
@@ -69,9 +75,11 @@ change id will be added.
       new_msg = self._Reformat(old_msg, sha1)
 
       p = GitCommand(None, ['commit', '--amend', '-F', '-'],
-                     input=new_msg,
+                     provide_stdin=True,
                      capture_stdout=True,
                      capture_stderr=True)
+      p.stdin.write(new_msg)
+      p.stdin.close()
       if p.Wait() != 0:
         print("error: Failed to update commit message", file=sys.stderr)
         sys.exit(1)

subcmds/diff.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,14 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import functools
-import io
-
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
+from command import PagedCommand
 
 
 class Diff(PagedCommand):
-  COMMON = True
+  common = True
   helpSummary = "Show changes between commit and working tree"
   helpUsage = """
 %prog [<project>...]
@@ -28,42 +27,15 @@ The -u option causes '%prog' to generate diff output with file paths
 relative to the repository root, so the output can be applied
 to the Unix 'patch' command.
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
   def _Options(self, p):
     p.add_option('-u', '--absolute',
                  dest='absolute', action='store_true',
-                 help='paths are relative to the repository root')
-
-  def _ExecuteOne(self, absolute, project):
-    """Obtains the diff for a specific project.
-
-    Args:
-      absolute: Paths are relative to the root.
-      project: Project to get status of.
-
-    Returns:
-      The status of the project.
-    """
-    buf = io.StringIO()
-    ret = project.PrintWorkTreeDiff(absolute, output_redir=buf)
-    return (ret, buf.getvalue())
+                 help='Paths are relative to the repository root')
 
   def Execute(self, opt, args):
-    all_projects = self.GetProjects(args)
-
-    def _ProcessResults(_pool, _output, results):
-      ret = 0
-      for (state, output) in results:
-        if output:
-          print(output, end='')
-        if not state:
-          ret = 1
-      return ret
-
-    return self.ExecuteInParallel(
-        opt.jobs,
-        functools.partial(self._ExecuteOne, opt.absolute),
-        all_projects,
-        callback=_ProcessResults,
-        ordered=True)
+    ret = 0
+    for project in self.GetProjects(args):
+      if not project.PrintWorkTreeDiff(opt.absolute):
+        ret = 1
+    return ret

subcmds/diffmanifests.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2014 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +16,7 @@
 
 from color import Coloring
 from command import PagedCommand
-from manifest_xml import RepoClient
+from manifest_xml import XmlManifest
 
 
 class _Coloring(Coloring):
@@ -31,7 +33,7 @@ class Diffmanifests(PagedCommand):
   deeper level.
   """
 
-  COMMON = True
+  common = True
   helpSummary = "Manifest diff utility"
   helpUsage = """%prog manifest1.xml [manifest2.xml] [options]"""
 
@@ -68,10 +70,10 @@ synced and their revisions won't be found.
   def _Options(self, p):
     p.add_option('--raw',
                  dest='raw', action='store_true',
-                 help='display raw diff')
+                 help='Display raw diff.')
     p.add_option('--no-color',
                  dest='color', action='store_false', default=True,
-                 help='does not display the diff in color')
+                 help='does not display the diff in color.')
     p.add_option('--pretty-format',
                  dest='pretty_format', action='store',
                  metavar='<FORMAT>',
@@ -181,7 +183,7 @@ synced and their revisions won't be found.
       self.OptionParser.error('missing manifests to diff')
 
   def Execute(self, opt, args):
-    self.out = _Coloring(self.client.globalConfig)
+    self.out = _Coloring(self.manifest.globalConfig)
     self.printText = self.out.nofmt_printer('text')
     if opt.color:
       self.printProject = self.out.nofmt_printer('project', attr='bold')
@@ -191,12 +193,12 @@ synced and their revisions won't be found.
     else:
       self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText
 
-    manifest1 = RepoClient(self.repodir)
+    manifest1 = XmlManifest(self.manifest.repodir)
     manifest1.Override(args[0], load_local_manifests=False)
     if len(args) == 1:
       manifest2 = self.manifest
     else:
-      manifest2 = RepoClient(self.repodir)
+      manifest2 = XmlManifest(self.manifest.repodir)
       manifest2.Override(args[1], load_local_manifests=False)
 
     diff = manifest1.projectsDiff(manifest2)

subcmds/download.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,17 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import re
 import sys
 
 from command import Command
-from error import GitError, NoSuchProjectError
+from error import GitError
 
 CHANGE_RE = re.compile(r'^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$')
 
 
 class Download(Command):
-  COMMON = True
+  common = True
   helpSummary = "Download and checkout a change"
   helpUsage = """
 %prog {[project] change[/patchset]}...
@@ -60,7 +63,6 @@ If no project is specified try to use current directory as a project.
       if m:
         if not project:
           project = self.GetProjects(".")[0]
-          print('Defaulting to cwd project', project.name)
         chg_id = int(m.group(1))
         if m.group(2):
           ps_id = int(m.group(2))
@@ -77,23 +79,7 @@ If no project is specified try to use current directory as a project.
                 ps_id = max(int(match.group(1)), ps_id)
         to_get.append((project, chg_id, ps_id))
       else:
-        projects = self.GetProjects([a])
-        if len(projects) > 1:
-          # If the cwd is one of the projects, assume they want that.
-          try:
-            project = self.GetProjects('.')[0]
-          except NoSuchProjectError:
-            project = None
-          if project not in projects:
-            print('error: %s matches too many projects; please re-run inside '
-                  'the project checkout.' % (a,), file=sys.stderr)
-            for project in projects:
-              print('  %s/ @ %s' % (project.relpath, project.revisionExpr),
-                    file=sys.stderr)
-            sys.exit(1)
-        else:
-          project = projects[0]
-          print('Defaulting to cwd project', project.name)
+        project = self.GetProjects([a])[0]
     return to_get
 
   def ValidateOptions(self, opt, args):

subcmds/forall.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import errno
-import functools
-import io
 import multiprocessing
 import re
 import os
@@ -23,8 +24,8 @@ import sys
 import subprocess
 
 from color import Coloring
-from command import DEFAULT_LOCAL_JOBS, Command, MirrorSafeCommand, WORKER_BATCH_SIZE
-from error import ManifestInvalidRevisionError
+from command import Command, MirrorSafeCommand
+import platform_utils
 
 _CAN_COLOR = [
     'branch',
@@ -41,11 +42,11 @@ class ForallColoring(Coloring):
 
 
 class Forall(Command, MirrorSafeCommand):
-  COMMON = False
+  common = False
   helpSummary = "Run a shell command in each project"
   helpUsage = """
 %prog [<project>...] -c <command> [<arg>...]
-%prog -r str1 [str2] ... -c <command> [<arg>...]
+%prog -r str1 [str2] ... -c <command> [<arg>...]"
 """
   helpDescription = """
 Executes the same shell command in each project.
@@ -53,11 +54,6 @@ Executes the same shell command in each project.
 The -r option allows running the command only on projects matching
 regex or wildcard expression.
 
-By default, projects are processed non-interactively in parallel.  If you want
-to run interactive commands, make sure to pass --interactive to force --jobs 1.
-While the processing order of projects is not guaranteed, the order of project
-output is stable.
-
 # Output Formatting
 
 The -p option causes '%prog' to bind pipes to the command's stdin,
@@ -120,48 +116,73 @@ terminal and are not redirected.
 If -e is used, when a command exits unsuccessfully, '%prog' will abort
 without iterating through the remaining projects.
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
-
-  @staticmethod
-  def _cmd_option(option, _opt_str, _value, parser):
-    setattr(parser.values, option.dest, list(parser.rargs))
-    while parser.rargs:
-      del parser.rargs[0]
 
   def _Options(self, p):
+    def cmd(option, opt_str, value, parser):
+      setattr(parser.values, option.dest, list(parser.rargs))
+      while parser.rargs:
+        del parser.rargs[0]
     p.add_option('-r', '--regex',
                  dest='regex', action='store_true',
-                 help='execute the command only on projects matching regex or wildcard expression')
+                 help="Execute the command only on projects matching regex or wildcard expression")
     p.add_option('-i', '--inverse-regex',
                  dest='inverse_regex', action='store_true',
-                 help='execute the command only on projects not matching regex or '
-                      'wildcard expression')
+                 help="Execute the command only on projects not matching regex or "
+                      "wildcard expression")
     p.add_option('-g', '--groups',
                  dest='groups',
-                 help='execute the command only on projects matching the specified groups')
+                 help="Execute the command only on projects matching the specified groups")
     p.add_option('-c', '--command',
-                 help='command (and arguments) to execute',
+                 help='Command (and arguments) to execute',
                  dest='command',
                  action='callback',
-                 callback=self._cmd_option)
+                 callback=cmd)
     p.add_option('-e', '--abort-on-errors',
                  dest='abort_on_errors', action='store_true',
-                 help='abort if a command exits unsuccessfully')
+                 help='Abort if a command exits unsuccessfully')
     p.add_option('--ignore-missing', action='store_true',
-                 help='silently skip & do not exit non-zero due missing '
+                 help='Silently skip & do not exit non-zero due missing '
                       'checkouts')
 
-    g = p.get_option_group('--quiet')
+    g = p.add_option_group('Output')
     g.add_option('-p',
                  dest='project_header', action='store_true',
-                 help='show project headers before output')
-    p.add_option('--interactive',
-                 action='store_true',
-                 help='force interactive usage')
+                 help='Show project headers before output')
+    g.add_option('-v', '--verbose',
+                 dest='verbose', action='store_true',
+                 help='Show command error messages')
+    g.add_option('-j', '--jobs',
+                 dest='jobs', action='store', type='int', default=1,
+                 help='number of commands to execute simultaneously')
 
   def WantPager(self, opt):
     return opt.project_header and opt.jobs == 1
 
+  def _SerializeProject(self, project):
+    """ Serialize a project._GitGetByExec instance.
+
+    project._GitGetByExec is not pickle-able. Instead of trying to pass it
+    around between processes, make a dict ourselves containing only the
+    attributes that we need.
+
+    """
+    if not self.manifest.IsMirror:
+      lrev = project.GetRevisionId()
+    else:
+      lrev = None
+    return {
+        'name': project.name,
+        'relpath': project.relpath,
+        'remote_name': project.remote.name,
+        'lrev': lrev,
+        'rrev': project.revisionExpr,
+        'annotations': dict((a.name, a.value) for a in project.annotations),
+        'gitdir': project.gitdir,
+        'worktree': project.worktree,
+        'upstream': project.upstream,
+        'dest_branch': project.dest_branch,
+    }
+
   def ValidateOptions(self, opt, args):
     if not opt.command:
       self.Usage()
@@ -177,11 +198,6 @@ without iterating through the remaining projects.
       cmd.append(cmd[0])
     cmd.extend(opt.command[1:])
 
-    # Historically, forall operated interactively, and in serial.  If the user
-    # has selected 1 job, then default to interacive mode.
-    if opt.jobs == 1:
-      opt.interactive = True
-
     if opt.project_header \
             and not shell \
             and cmd[0] == 'git':
@@ -221,50 +237,60 @@ without iterating through the remaining projects.
 
     os.environ['REPO_COUNT'] = str(len(projects))
 
+    pool = multiprocessing.Pool(opt.jobs, InitWorker)
     try:
       config = self.manifest.manifestProject.config
-      with multiprocessing.Pool(opt.jobs, InitWorker) as pool:
-        results_it = pool.imap(
-            functools.partial(DoWorkWrapper, mirror, opt, cmd, shell, config),
-            enumerate(projects),
-            chunksize=WORKER_BATCH_SIZE)
-        first = True
-        for (r, output) in results_it:
-          if output:
-            if first:
-              first = False
-            elif opt.project_header:
-              print()
-            # To simplify the DoWorkWrapper, take care of automatic newlines.
-            end = '\n'
-            if output[-1] == '\n':
-              end = ''
-            print(output, end=end)
-          rc = rc or r
-          if r != 0 and opt.abort_on_errors:
-            raise Exception('Aborting due to previous error')
+      results_it = pool.imap(
+          DoWorkWrapper,
+          self.ProjectArgs(projects, mirror, opt, cmd, shell, config))
+      pool.close()
+      for r in results_it:
+        rc = rc or r
+        if r != 0 and opt.abort_on_errors:
+          raise Exception('Aborting due to previous error')
     except (KeyboardInterrupt, WorkerKeyboardInterrupt):
       # Catch KeyboardInterrupt raised inside and outside of workers
+      print('Interrupted - terminating the pool')
+      pool.terminate()
       rc = rc or errno.EINTR
     except Exception as e:
       # Catch any other exceptions raised
-      print('forall: unhandled error, terminating the pool: %s: %s' %
+      print('Got an error, terminating the pool: %s: %s' %
             (type(e).__name__, e),
             file=sys.stderr)
+      pool.terminate()
       rc = rc or getattr(e, 'errno', 1)
+    finally:
+      pool.join()
     if rc != 0:
       sys.exit(rc)
 
+  def ProjectArgs(self, projects, mirror, opt, cmd, shell, config):
+    for cnt, p in enumerate(projects):
+      try:
+        project = self._SerializeProject(p)
+      except Exception as e:
+        print('Project list error on project %s: %s: %s' %
+              (p.name, type(e).__name__, e),
+              file=sys.stderr)
+        return
+      except KeyboardInterrupt:
+        print('Project list interrupted',
+              file=sys.stderr)
+        return
+      yield [mirror, opt, cmd, shell, cnt, config, project]
+
 
 class WorkerKeyboardInterrupt(Exception):
   """ Keyboard interrupt exception for worker processes. """
+  pass
 
 
 def InitWorker():
   signal.signal(signal.SIGINT, signal.SIG_IGN)
 
 
-def DoWorkWrapper(mirror, opt, cmd, shell, config, args):
+def DoWorkWrapper(args):
   """ A wrapper around the DoWork() method.
 
   Catch the KeyboardInterrupt exceptions here and re-raise them as a different,
@@ -272,11 +298,11 @@ def DoWorkWrapper(mirror, opt, cmd, shell, config, args):
   and making the parent hang indefinitely.
 
   """
-  cnt, project = args
+  project = args.pop()
   try:
-    return DoWork(project, mirror, opt, cmd, shell, cnt, config)
+    return DoWork(project, *args)
   except KeyboardInterrupt:
-    print('%s: Worker interrupted' % project.name)
+    print('%s: Worker interrupted' % project['name'])
     raise WorkerKeyboardInterrupt()
 
 
@@ -288,65 +314,94 @@ def DoWork(project, mirror, opt, cmd, shell, cnt, config):
       val = ''
     env[name] = val
 
-  setenv('REPO_PROJECT', project.name)
-  setenv('REPO_PATH', project.relpath)
-  setenv('REPO_REMOTE', project.remote.name)
-  try:
-    # If we aren't in a fully synced state and we don't have the ref the manifest
-    # wants, then this will fail.  Ignore it for the purposes of this code.
-    lrev = '' if mirror else project.GetRevisionId()
-  except ManifestInvalidRevisionError:
-    lrev = ''
-  setenv('REPO_LREV', lrev)
-  setenv('REPO_RREV', project.revisionExpr)
-  setenv('REPO_UPSTREAM', project.upstream)
-  setenv('REPO_DEST_BRANCH', project.dest_branch)
+  setenv('REPO_PROJECT', project['name'])
+  setenv('REPO_PATH', project['relpath'])
+  setenv('REPO_REMOTE', project['remote_name'])
+  setenv('REPO_LREV', project['lrev'])
+  setenv('REPO_RREV', project['rrev'])
+  setenv('REPO_UPSTREAM', project['upstream'])
+  setenv('REPO_DEST_BRANCH', project['dest_branch'])
   setenv('REPO_I', str(cnt + 1))
-  for annotation in project.annotations:
-    setenv("REPO__%s" % (annotation.name), annotation.value)
+  for name in project['annotations']:
+    setenv("REPO__%s" % (name), project['annotations'][name])
 
   if mirror:
-    setenv('GIT_DIR', project.gitdir)
-    cwd = project.gitdir
+    setenv('GIT_DIR', project['gitdir'])
+    cwd = project['gitdir']
   else:
-    cwd = project.worktree
+    cwd = project['worktree']
 
   if not os.path.exists(cwd):
     # Allow the user to silently ignore missing checkouts so they can run on
     # partial checkouts (good for infra recovery tools).
     if opt.ignore_missing:
-      return (0, '')
-
-    output = ''
+      return 0
     if ((opt.project_header and opt.verbose)
             or not opt.project_header):
-      output = 'skipping %s/' % project.relpath
-    return (1, output)
+      print('skipping %s/' % project['relpath'], file=sys.stderr)
+    return 1
 
-  if opt.verbose:
-    stderr = subprocess.STDOUT
-  else:
-    stderr = subprocess.DEVNULL
-
-  stdin = None if opt.interactive else subprocess.DEVNULL
-
-  result = subprocess.run(
-      cmd, cwd=cwd, shell=shell, env=env, check=False,
-      encoding='utf-8', errors='replace',
-      stdin=stdin, stdout=subprocess.PIPE, stderr=stderr)
-
-  output = result.stdout
   if opt.project_header:
-    if output:
-      buf = io.StringIO()
-      out = ForallColoring(config)
-      out.redirect(buf)
-      if mirror:
-        project_header_path = project.name
-      else:
-        project_header_path = project.relpath
-      out.project('project %s/' % project_header_path)
-      out.nl()
-      buf.write(output)
-      output = buf.getvalue()
-  return (result.returncode, output)
+    stdin = subprocess.PIPE
+    stdout = subprocess.PIPE
+    stderr = subprocess.PIPE
+  else:
+    stdin = None
+    stdout = None
+    stderr = None
+
+  p = subprocess.Popen(cmd,
+                       cwd=cwd,
+                       shell=shell,
+                       env=env,
+                       stdin=stdin,
+                       stdout=stdout,
+                       stderr=stderr)
+
+  if opt.project_header:
+    out = ForallColoring(config)
+    out.redirect(sys.stdout)
+    empty = True
+    errbuf = ''
+
+    p.stdin.close()
+    s_in = platform_utils.FileDescriptorStreams.create()
+    s_in.add(p.stdout, sys.stdout, 'stdout')
+    s_in.add(p.stderr, sys.stderr, 'stderr')
+
+    while not s_in.is_done:
+      in_ready = s_in.select()
+      for s in in_ready:
+        buf = s.read().decode()
+        if not buf:
+          s_in.remove(s)
+          s.close()
+          continue
+
+        if not opt.verbose:
+          if s.std_name == 'stderr':
+            errbuf += buf
+            continue
+
+        if empty and out:
+          if not cnt == 0:
+            out.nl()
+
+          if mirror:
+            project_header_path = project['name']
+          else:
+            project_header_path = project['relpath']
+          out.project('project %s/', project_header_path)
+          out.nl()
+          out.flush()
+          if errbuf:
+            sys.stderr.write(errbuf)
+            sys.stderr.flush()
+            errbuf = ''
+          empty = False
+
+        s.dest.write(buf)
+        s.dest.flush()
+
+  r = p.wait()
+  return r

subcmds/gitc_delete.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2015 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,14 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import sys
 
 from command import Command, GitcClientCommand
 import platform_utils
 
+from pyversion import is_python3
+if not is_python3():
+  input = raw_input  # noqa: F821
+
 
 class GitcDelete(Command, GitcClientCommand):
-  COMMON = True
+  common = True
   visible_everywhere = False
   helpSummary = "Delete a GITC Client."
   helpUsage = """
@@ -33,7 +40,7 @@ and all locally downloaded sources.
   def _Options(self, p):
     p.add_option('-f', '--force',
                  dest='force', action='store_true',
-                 help='force the deletion (no prompt)')
+                 help='Force the deletion (no prompt).')
 
   def Execute(self, opt, args):
     if not opt.force:

subcmds/gitc_init.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2015 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import os
 import sys
 
@@ -23,7 +26,7 @@ import wrapper
 
 
 class GitcInit(init.Init, GitcAvailableCommand):
-  COMMON = True
+  common = True
   helpSummary = "Initialize a GITC Client."
   helpUsage = """
 %prog [options] [client name]
@@ -47,7 +50,14 @@ use for this GITC client.
 """
 
   def _Options(self, p):
-    super()._Options(p, gitc_init=True)
+    super(GitcInit, self)._Options(p, gitc_init=True)
+    g = p.add_option_group('GITC options')
+    g.add_option('-f', '--manifest-file',
+                 dest='manifest_file',
+                 help='Optional manifest file to use for this GITC client.')
+    g.add_option('-c', '--gitc-client',
+                 dest='gitc_client',
+                 help='The name of the gitc_client instance to create or modify.')
 
   def Execute(self, opt, args):
     gitc_client = gitc_utils.parse_clientdir(os.getcwd())
@@ -57,7 +67,7 @@ use for this GITC client.
       sys.exit(1)
     self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
                                    gitc_client)
-    super().Execute(opt, args)
+    super(GitcInit, self).Execute(opt, args)
 
     manifest_file = self.manifest.manifestFile
     if opt.manifest_file:

subcmds/grep.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import functools
+from __future__ import print_function
+
 import sys
 
 from color import Coloring
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
+from command import PagedCommand
 from error import GitError
 from git_command import GitCommand
 
@@ -29,7 +32,7 @@ class GrepColoring(Coloring):
 
 
 class Grep(PagedCommand):
-  COMMON = True
+  common = True
   helpSummary = "Print lines matching a pattern"
   helpUsage = """
 %prog {pattern | -e pattern} [<project>...]
@@ -62,33 +65,30 @@ contain a line that matches both expressions:
   repo grep --all-match -e NODE -e Unexpected
 
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
-
-  @staticmethod
-  def _carry_option(_option, opt_str, value, parser):
-    pt = getattr(parser.values, 'cmd_argv', None)
-    if pt is None:
-      pt = []
-      setattr(parser.values, 'cmd_argv', pt)
-
-    if opt_str == '-(':
-      pt.append('(')
-    elif opt_str == '-)':
-      pt.append(')')
-    else:
-      pt.append(opt_str)
-
-    if value is not None:
-      pt.append(value)
-
-  def _CommonOptions(self, p):
-    """Override common options slightly."""
-    super()._CommonOptions(p, opt_v=False)
 
   def _Options(self, p):
+    def carry(option,
+              opt_str,
+              value,
+              parser):
+      pt = getattr(parser.values, 'cmd_argv', None)
+      if pt is None:
+        pt = []
+        setattr(parser.values, 'cmd_argv', pt)
+
+      if opt_str == '-(':
+        pt.append('(')
+      elif opt_str == '-)':
+        pt.append(')')
+      else:
+        pt.append(opt_str)
+
+      if value is not None:
+        pt.append(value)
+
     g = p.add_option_group('Sources')
     g.add_option('--cached',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Search the index, instead of the work tree')
     g.add_option('-r', '--revision',
                  dest='revision', action='append', metavar='TREEish',
@@ -96,134 +96,68 @@ contain a line that matches both expressions:
 
     g = p.add_option_group('Pattern')
     g.add_option('-e',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  metavar='PATTERN', type='str',
                  help='Pattern to search for')
     g.add_option('-i', '--ignore-case',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Ignore case differences')
     g.add_option('-a', '--text',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help="Process binary files as if they were text")
     g.add_option('-I',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help="Don't match the pattern in binary files")
     g.add_option('-w', '--word-regexp',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Match the pattern only at word boundaries')
     g.add_option('-v', '--invert-match',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Select non-matching lines')
     g.add_option('-G', '--basic-regexp',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Use POSIX basic regexp for patterns (default)')
     g.add_option('-E', '--extended-regexp',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Use POSIX extended regexp for patterns')
     g.add_option('-F', '--fixed-strings',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Use fixed strings (not regexp) for pattern')
 
     g = p.add_option_group('Pattern Grouping')
     g.add_option('--all-match',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Limit match to lines that have all patterns')
     g.add_option('--and', '--or', '--not',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Boolean operators to combine patterns')
     g.add_option('-(', '-)',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Boolean operator grouping')
 
     g = p.add_option_group('Output')
     g.add_option('-n',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Prefix the line number to matching lines')
     g.add_option('-C',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  metavar='CONTEXT', type='str',
                  help='Show CONTEXT lines around match')
     g.add_option('-B',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  metavar='CONTEXT', type='str',
                  help='Show CONTEXT lines before match')
     g.add_option('-A',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  metavar='CONTEXT', type='str',
                  help='Show CONTEXT lines after match')
     g.add_option('-l', '--name-only', '--files-with-matches',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Show only file names containing matching lines')
     g.add_option('-L', '--files-without-match',
-                 action='callback', callback=self._carry_option,
+                 action='callback', callback=carry,
                  help='Show only file names not containing matching lines')
 
-  def _ExecuteOne(self, cmd_argv, project):
-    """Process one project."""
-    try:
-      p = GitCommand(project,
-                     cmd_argv,
-                     bare=False,
-                     capture_stdout=True,
-                     capture_stderr=True)
-    except GitError as e:
-      return (project, -1, None, str(e))
-
-    return (project, p.Wait(), p.stdout, p.stderr)
-
-  @staticmethod
-  def _ProcessResults(full_name, have_rev, _pool, out, results):
-    git_failed = False
-    bad_rev = False
-    have_match = False
-
-    for project, rc, stdout, stderr in results:
-      if rc < 0:
-        git_failed = True
-        out.project('--- project %s ---' % project.relpath)
-        out.nl()
-        out.fail('%s', stderr)
-        out.nl()
-        continue
-
-      if rc:
-        # no results
-        if stderr:
-          if have_rev and 'fatal: ambiguous argument' in stderr:
-            bad_rev = True
-          else:
-            out.project('--- project %s ---' % project.relpath)
-            out.nl()
-            out.fail('%s', stderr.strip())
-            out.nl()
-        continue
-      have_match = True
-
-      # We cut the last element, to avoid a blank line.
-      r = stdout.split('\n')
-      r = r[0:-1]
-
-      if have_rev and full_name:
-        for line in r:
-          rev, line = line.split(':', 1)
-          out.write("%s", rev)
-          out.write(':')
-          out.project(project.relpath)
-          out.write('/')
-          out.write("%s", line)
-          out.nl()
-      elif full_name:
-        for line in r:
-          out.project(project.relpath)
-          out.write('/')
-          out.write("%s", line)
-          out.nl()
-      else:
-        for line in r:
-          print(line)
-
-    return (git_failed, bad_rev, have_match)
-
   def Execute(self, opt, args):
     out = GrepColoring(self.manifest.manifestProject.config)
 
@@ -255,13 +189,62 @@ contain a line that matches both expressions:
       cmd_argv.extend(opt.revision)
     cmd_argv.append('--')
 
-    git_failed, bad_rev, have_match = self.ExecuteInParallel(
-        opt.jobs,
-        functools.partial(self._ExecuteOne, cmd_argv),
-        projects,
-        callback=functools.partial(self._ProcessResults, full_name, have_rev),
-        output=out,
-        ordered=True)
+    git_failed = False
+    bad_rev = False
+    have_match = False
+
+    for project in projects:
+      try:
+        p = GitCommand(project,
+                       cmd_argv,
+                       bare=False,
+                       capture_stdout=True,
+                       capture_stderr=True)
+      except GitError as e:
+        git_failed = True
+        out.project('--- project %s ---' % project.relpath)
+        out.nl()
+        out.fail('%s', str(e))
+        out.nl()
+        continue
+
+      if p.Wait() != 0:
+        # no results
+        #
+        if p.stderr:
+          if have_rev and 'fatal: ambiguous argument' in p.stderr:
+            bad_rev = True
+          else:
+            out.project('--- project %s ---' % project.relpath)
+            out.nl()
+            out.fail('%s', p.stderr.strip())
+            out.nl()
+        continue
+      have_match = True
+
+      # We cut the last element, to avoid a blank line.
+      #
+      r = p.stdout.split('\n')
+      r = r[0:-1]
+
+      if have_rev and full_name:
+        for line in r:
+          rev, line = line.split(':', 1)
+          out.write("%s", rev)
+          out.write(':')
+          out.project(project.relpath)
+          out.write('/')
+          out.write("%s", line)
+          out.nl()
+      elif full_name:
+        for line in r:
+          out.project(project.relpath)
+          out.write('/')
+          out.write("%s", line)
+          out.nl()
+      else:
+        for line in r:
+          print(line)
 
     if git_failed:
       sys.exit(1)

subcmds/help.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,19 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import re
 import sys
-import textwrap
+from formatter import AbstractFormatter, DumbWriter
 
 from subcmds import all_commands
 from color import Coloring
 from command import PagedCommand, MirrorSafeCommand, GitcAvailableCommand, GitcClientCommand
 import gitc_utils
-from wrapper import Wrapper
 
 
 class Help(PagedCommand, MirrorSafeCommand):
-  COMMON = False
+  common = False
   helpSummary = "Display detailed help on a command"
   helpUsage = """
 %prog [--all|command]
@@ -50,27 +52,20 @@ Displays detailed usage information about a command.
 
   def _PrintAllCommands(self):
     print('usage: repo COMMAND [ARGS]')
-    self.PrintAllCommandsBody()
-
-  def PrintAllCommandsBody(self):
-    print('The complete list of recognized repo commands is:')
+    print('The complete list of recognized repo commands are:')
     commandNames = list(sorted(all_commands))
     self._PrintCommands(commandNames)
     print("See 'repo help <command>' for more information on a "
           'specific command.')
-    print('Bug reports:', Wrapper().BUG_URL)
 
   def _PrintCommonCommands(self):
     print('usage: repo COMMAND [ARGS]')
-    self.PrintCommonCommandsBody()
-
-  def PrintCommonCommandsBody(self):
     print('The most commonly used repo commands are:')
 
     def gitc_supported(cmd):
       if not isinstance(cmd, GitcAvailableCommand) and not isinstance(cmd, GitcClientCommand):
         return True
-      if self.client.isGitcClient:
+      if self.manifest.isGitcClient:
         return True
       if isinstance(cmd, GitcClientCommand):
         return False
@@ -80,20 +75,20 @@ Displays detailed usage information about a command.
 
     commandNames = list(sorted([name
                                 for name, command in all_commands.items()
-                                if command.COMMON and gitc_supported(command)]))
+                                if command.common and gitc_supported(command)]))
     self._PrintCommands(commandNames)
 
     print(
         "See 'repo help <command>' for more information on a specific command.\n"
         "See 'repo help --all' for a complete list of recognized commands.")
-    print('Bug reports:', Wrapper().BUG_URL)
 
   def _PrintCommandHelp(self, cmd, header_prefix=''):
     class _Out(Coloring):
       def __init__(self, gc):
         Coloring.__init__(self, gc, 'help')
         self.heading = self.printer('heading', attr='bold')
-        self._first = True
+
+        self.wrap = AbstractFormatter(DumbWriter())
 
       def _PrintSection(self, heading, bodyAttr):
         try:
@@ -103,9 +98,7 @@ Displays detailed usage information about a command.
         if body == '' or body is None:
           return
 
-        if not self._first:
-          self.nl()
-        self._first = False
+        self.nl()
 
         self.heading('%s%s', header_prefix, heading)
         self.nl()
@@ -115,8 +108,7 @@ Displays detailed usage information about a command.
         body = body.strip()
         body = body.replace('%prog', me)
 
-        # Extract the title, but skip any trailing {#anchors}.
-        asciidoc_hdr = re.compile(r'^\n?#+ ([^{]+)(\{#.+\})?$')
+        asciidoc_hdr = re.compile(r'^\n?#+ (.+)$')
         for para in body.split("\n\n"):
           if para.startswith(' '):
             self.write('%s', para)
@@ -131,21 +123,19 @@ Displays detailed usage information about a command.
             self.nl()
             continue
 
-          lines = textwrap.wrap(para.replace('  ', ' '), width=80,
-                                break_long_words=False, break_on_hyphens=False)
-          for line in lines:
-            self.write('%s', line)
-            self.nl()
-          self.nl()
+          self.wrap.add_flowing_data(para)
+          self.wrap.end_paragraph(1)
+        self.wrap.end_paragraph(0)
 
-    out = _Out(self.client.globalConfig)
+    out = _Out(self.manifest.globalConfig)
     out._PrintSection('Summary', 'helpSummary')
     cmd.OptionParser.print_help()
     out._PrintSection('Description', 'helpDescription')
 
   def _PrintAllCommandHelp(self):
     for name in sorted(all_commands):
-      cmd = all_commands[name](manifest=self.manifest)
+      cmd = all_commands[name]()
+      cmd.manifest = self.manifest
       self._PrintCommandHelp(cmd, header_prefix='[%s] ' % (name,))
 
   def _Options(self, p):
@@ -169,11 +159,12 @@ Displays detailed usage information about a command.
       name = args[0]
 
       try:
-        cmd = all_commands[name](manifest=self.manifest)
+        cmd = all_commands[name]()
       except KeyError:
         print("repo: '%s' is not a repo command." % name, file=sys.stderr)
         sys.exit(1)
 
+      cmd.manifest = self.manifest
       self._PrintCommandHelp(cmd)
 
     else:

subcmds/info.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2012 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import optparse
-
 from command import PagedCommand
 from color import Coloring
 from git_refs import R_M, R_HEADS
@@ -25,9 +25,9 @@ class _Coloring(Coloring):
 
 
 class Info(PagedCommand):
-  COMMON = True
+  common = True
   helpSummary = "Get info on the manifest branch, current branch or unmerged branches"
-  helpUsage = "%prog [-dl] [-o [-c]] [<project>...]"
+  helpUsage = "%prog [-dl] [-o [-b]] [<project>...]"
 
   def _Options(self, p):
     p.add_option('-d', '--diff',
@@ -36,22 +36,15 @@ class Info(PagedCommand):
     p.add_option('-o', '--overview',
                  dest='overview', action='store_true',
                  help='show overview of all local commits')
-    p.add_option('-c', '--current-branch',
+    p.add_option('-b', '--current-branch',
                  dest="current_branch", action="store_true",
                  help="consider only checked out branches")
-    p.add_option('--no-current-branch',
-                 dest='current_branch', action='store_false',
-                 help='consider all local branches')
-    # Turn this into a warning & remove this someday.
-    p.add_option('-b',
-                 dest='current_branch', action='store_true',
-                 help=optparse.SUPPRESS_HELP)
     p.add_option('-l', '--local-only',
                  dest="local", action="store_true",
-                 help="disable all remote operations")
+                 help="Disable all remote operations")
 
   def Execute(self, opt, args):
-    self.out = _Coloring(self.client.globalConfig)
+    self.out = _Coloring(self.manifest.globalConfig)
     self.heading = self.out.printer('heading', attr='bold')
     self.headtext = self.out.nofmt_printer('headtext', fg='yellow')
     self.redtext = self.out.printer('redtext', fg='red')

subcmds/init.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
+
+import optparse
 import os
 import platform
 import re
 import sys
-import urllib.parse
+
+from pyversion import is_python3
+if is_python3():
+  import urllib.parse
+else:
+  import imp
+  import urlparse
+  urllib = imp.new_module('urllib')
+  urllib.parse = urlparse
 
 from color import Coloring
 from command import InteractiveCommand, MirrorSafeCommand
@@ -24,17 +37,15 @@ from error import ManifestParseError
 from project import SyncBuffer
 from git_config import GitConfig
 from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD
-import fetch
-import git_superproject
 import platform_utils
 from wrapper import Wrapper
 
 
 class Init(InteractiveCommand, MirrorSafeCommand):
-  COMMON = True
-  helpSummary = "Initialize a repo client checkout in the current directory"
+  common = True
+  helpSummary = "Initialize repo in the current directory"
   helpUsage = """
-%prog [options] [manifest url]
+%prog [options]
 """
   helpDescription = """
 The '%prog' command is run once to install and initialize repo.
@@ -42,24 +53,14 @@ The latest repo source code and manifest collection is downloaded
 from the server and is installed in the .repo/ directory in the
 current working directory.
 
-When creating a new checkout, the manifest URL is the only required setting.
-It may be specified using the --manifest-url option, or as the first optional
-argument.
-
 The optional -b argument can be used to select the manifest branch
 to checkout and use.  If no branch is specified, the remote's default
-branch is used.  This is equivalent to using -b HEAD.
+branch is used.
 
 The optional -m argument can be used to specify an alternate manifest
 to be used. If no manifest is specified, the manifest default.xml
 will be used.
 
-If the --standalone-manifest argument is set, the manifest will be downloaded
-directly from the specified --manifest-url as a static file (rather than
-setting up a manifest git checkout). With --standalone-manifest, the manifest
-will be fully static and will not be re-downloaded during subsesquent
-`repo init` and `repo sync` calls.
-
 The --reference option can be used to point to a directory that
 has the content of a --mirror sync. This will make the working
 directory use as much data as possible from the local reference
@@ -85,64 +86,115 @@ manifest, a subsequent `repo sync` (or `repo sync -d`) is necessary
 to update the working directory files.
 """
 
-  def _CommonOptions(self, p):
-    """Disable due to re-use of Wrapper()."""
-
   def _Options(self, p, gitc_init=False):
-    Wrapper().InitParser(p, gitc_init=gitc_init)
+    # Logging
+    g = p.add_option_group('Logging options')
+    g.add_option('-v', '--verbose',
+                 dest='output_mode', action='store_true',
+                 help='show all output')
+    g.add_option('-q', '--quiet',
+                 dest='output_mode', action='store_false',
+                 help='only show errors')
+
+    # Manifest
+    g = p.add_option_group('Manifest options')
+    g.add_option('-u', '--manifest-url',
+                 dest='manifest_url',
+                 help='manifest repository location', metavar='URL')
+    g.add_option('-b', '--manifest-branch',
+                 dest='manifest_branch',
+                 help='manifest branch or revision', metavar='REVISION')
+    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',
+                 dest='manifest_name', default='default.xml',
+                 help='initial manifest file', metavar='NAME.xml')
+    g.add_option('--mirror',
+                 dest='mirror', action='store_true',
+                 help='create a replica of the remote repositories '
+                      'rather than a client working directory')
+    g.add_option('--reference',
+                 dest='reference',
+                 help='location of mirror directory', metavar='DIR')
+    g.add_option('--dissociate',
+                 dest='dissociate', action='store_true',
+                 help='dissociate from reference mirrors after clone')
+    g.add_option('--depth', type='int', default=None,
+                 dest='depth',
+                 help='create a shallow clone with given depth; see git clone')
+    g.add_option('--partial-clone', action='store_true',
+                 dest='partial_clone',
+                 help='perform partial clone (https://git-scm.com/'
+                 'docs/gitrepository-layout#_code_partialclone_code)')
+    g.add_option('--clone-filter', action='store', default='blob:none',
+                 dest='clone_filter',
+                 help='filter for use with --partial-clone [default: %default]')
+    # TODO(vapier): Expose option with real help text once this has been in the
+    # wild for a while w/out significant bug reports.  Goal is by ~Sep 2020.
+    g.add_option('--worktree', action='store_true',
+                 help=optparse.SUPPRESS_HELP)
+    g.add_option('--archive',
+                 dest='archive', action='store_true',
+                 help='checkout an archive instead of a git repository for '
+                      'each project. See git archive.')
+    g.add_option('--submodules',
+                 dest='submodules', action='store_true',
+                 help='sync any submodules associated with the manifest repo')
+    g.add_option('-g', '--groups',
+                 dest='groups', default='default',
+                 help='restrict manifest projects to ones with specified '
+                      'group(s) [default|all|G1,G2,G3|G4,-G5,-G6]',
+                 metavar='GROUP')
+    g.add_option('-p', '--platform',
+                 dest='platform', default='auto',
+                 help='restrict manifest projects to ones with a specified '
+                      'platform group [auto|all|none|linux|darwin|...]',
+                 metavar='PLATFORM')
+    g.add_option('--clone-bundle', action='store_true',
+                 help='force use of /clone.bundle on HTTP/HTTPS (default if not --partial-clone)')
+    g.add_option('--no-clone-bundle',
+                 dest='clone_bundle', action='store_false',
+                 help='disable use of /clone.bundle on HTTP/HTTPS (default if --partial-clone)')
+    g.add_option('--no-tags',
+                 dest='tags', default=True, action='store_false',
+                 help="don't fetch tags in the manifest")
+
+    # Tool
+    g = p.add_option_group('repo Version options')
+    g.add_option('--repo-url',
+                 dest='repo_url',
+                 help='repo repository location', metavar='URL')
+    g.add_option('--repo-rev', metavar='REV',
+                 help='repo branch or revision')
+    g.add_option('--repo-branch', dest='repo_rev',
+                 help=optparse.SUPPRESS_HELP)
+    g.add_option('--no-repo-verify',
+                 dest='repo_verify', default=True, action='store_false',
+                 help='do not verify repo source code')
+
+    # Other
+    g = p.add_option_group('Other options')
+    g.add_option('--config-name',
+                 dest='config_name', action="store_true", default=False,
+                 help='Always prompt for name/e-mail')
 
   def _RegisteredEnvironmentOptions(self):
     return {'REPO_MANIFEST_URL': 'manifest_url',
             'REPO_MIRROR_LOCATION': 'reference'}
 
-  def _CloneSuperproject(self, opt):
-    """Clone the superproject based on the superproject's url and branch.
-
-    Args:
-      opt: Program options returned from optparse.  See _Options().
-    """
-    superproject = git_superproject.Superproject(self.manifest,
-                                                 self.repodir,
-                                                 self.git_event_log,
-                                                 quiet=opt.quiet)
-    sync_result = superproject.Sync()
-    if not sync_result.success:
-      print('warning: git update of superproject failed, repo sync will not '
-            'use superproject to fetch source; while this error is not fatal, '
-            'and you can continue to run repo sync, please run repo init with '
-            'the --no-use-superproject option to stop seeing this warning',
-            file=sys.stderr)
-      if sync_result.fatal and opt.use_superproject is not None:
-        sys.exit(1)
-
   def _SyncManifest(self, opt):
     m = self.manifest.manifestProject
     is_new = not m.Exists
 
-    # If repo has already been initialized, we take -u with the absence of
-    # --standalone-manifest to mean "transition to a standard repo set up",
-    # which necessitates starting fresh.
-    # If --standalone-manifest is set, we always tear everything down and start
-    # anew.
-    if not is_new:
-      was_standalone_manifest = m.config.GetString('manifest.standalone')
-      if was_standalone_manifest and not opt.manifest_url:
-        print('fatal: repo was initialized with a standlone manifest, '
-              'cannot be re-initialized without --manifest-url/-u')
-        sys.exit(1)
-
-      if opt.standalone_manifest or (was_standalone_manifest and
-                                     opt.manifest_url):
-        m.config.ClearCache()
-        if m.gitdir and os.path.exists(m.gitdir):
-          platform_utils.rmtree(m.gitdir)
-        if m.worktree and os.path.exists(m.worktree):
-          platform_utils.rmtree(m.worktree)
-
-    is_new = not m.Exists
     if is_new:
       if not opt.manifest_url:
-        print('fatal: manifest url is required.', file=sys.stderr)
+        print('fatal: manifest url (-u) is required.', file=sys.stderr)
         sys.exit(1)
 
       if not opt.quiet:
@@ -164,21 +216,6 @@ to update the working directory files.
 
       m._InitGitDir(mirror_git=mirrored_manifest_git)
 
-    # If standalone_manifest is set, mark the project as "standalone" -- we'll
-    # still do much of the manifests.git set up, but will avoid actual syncs to
-    # a remote.
-    standalone_manifest = False
-    if opt.standalone_manifest:
-      standalone_manifest = True
-      m.config.SetString('manifest.standalone', opt.manifest_url)
-    elif not opt.manifest_url and not opt.manifest_branch:
-      # If -u is set and --standalone-manifest is not, then we're not in
-      # standalone mode. Otherwise, use config to infer what we were in the last
-      # init.
-      standalone_manifest = bool(m.config.GetString('manifest.standalone'))
-    if not standalone_manifest:
-      m.config.SetString('manifest.standalone', None)
-
     self._ConfigureDepth(opt)
 
     # Set the remote URL before the remote branch as we might need it below.
@@ -188,23 +225,17 @@ to update the working directory files.
       r.ResetFetch()
       r.Save()
 
-    if not standalone_manifest:
-      if opt.manifest_branch:
-        if opt.manifest_branch == 'HEAD':
-          opt.manifest_branch = m.ResolveRemoteHead()
-          if opt.manifest_branch is None:
-            print('fatal: unable to resolve HEAD', file=sys.stderr)
-            sys.exit(1)
-        m.revisionExpr = opt.manifest_branch
+    if opt.manifest_branch:
+      m.revisionExpr = opt.manifest_branch
+    else:
+      if is_new:
+        default_branch = m.ResolveRemoteHead()
+        if default_branch is None:
+          # If the remote doesn't have HEAD configured, default to master.
+          default_branch = 'refs/heads/master'
+        m.revisionExpr = default_branch
       else:
-        if is_new:
-          default_branch = m.ResolveRemoteHead()
-          if default_branch is None:
-            # If the remote doesn't have HEAD configured, default to master.
-            default_branch = 'refs/heads/master'
-          m.revisionExpr = default_branch
-        else:
-          m.PreSync()
+        m.PreSync()
 
     groups = re.split(r'[,\s]+', opt.groups)
     all_platforms = ['linux', 'darwin', 'windows']
@@ -223,7 +254,7 @@ to update the working directory files.
 
     groups = [x for x in groups if x]
     groupstr = ','.join(groups)
-    if opt.platform == 'auto' and groupstr == self.manifest.GetDefaultGroupsStr():
+    if opt.platform == 'auto' and groupstr == 'default,platform-' + platform.system().lower():
       groupstr = None
     m.config.SetString('manifest.groups', groupstr)
 
@@ -231,7 +262,7 @@ to update the working directory files.
       m.config.SetString('repo.reference', opt.reference)
 
     if opt.dissociate:
-      m.config.SetBoolean('repo.dissociate', opt.dissociate)
+      m.config.SetString('repo.dissociate', 'true')
 
     if opt.worktree:
       if opt.mirror:
@@ -242,14 +273,14 @@ to update the working directory files.
         print('fatal: --submodules and --worktree are incompatible',
               file=sys.stderr)
         sys.exit(1)
-      m.config.SetBoolean('repo.worktree', opt.worktree)
+      m.config.SetString('repo.worktree', 'true')
       if is_new:
         m.use_git_worktrees = True
       print('warning: --worktree is experimental!', file=sys.stderr)
 
     if opt.archive:
       if is_new:
-        m.config.SetBoolean('repo.archive', opt.archive)
+        m.config.SetString('repo.archive', 'true')
       else:
         print('fatal: --archive is only supported when initializing a new '
               'workspace.', file=sys.stderr)
@@ -259,7 +290,7 @@ to update the working directory files.
 
     if opt.mirror:
       if is_new:
-        m.config.SetBoolean('repo.mirror', opt.mirror)
+        m.config.SetString('repo.mirror', 'true')
       else:
         print('fatal: --mirror is only supported when initializing a new '
               'workspace.', file=sys.stderr)
@@ -267,58 +298,30 @@ to update the working directory files.
               'in another location.', file=sys.stderr)
         sys.exit(1)
 
-    if opt.partial_clone is not None:
+    if opt.partial_clone:
       if opt.mirror:
         print('fatal: --mirror and --partial-clone are mutually exclusive',
               file=sys.stderr)
         sys.exit(1)
-      m.config.SetBoolean('repo.partialclone', opt.partial_clone)
+      m.config.SetString('repo.partialclone', 'true')
       if opt.clone_filter:
         m.config.SetString('repo.clonefilter', opt.clone_filter)
-    elif m.config.GetBoolean('repo.partialclone'):
-      opt.clone_filter = m.config.GetString('repo.clonefilter')
     else:
       opt.clone_filter = None
 
-    if opt.partial_clone_exclude is not None:
-      m.config.SetString('repo.partialcloneexclude', opt.partial_clone_exclude)
-
     if opt.clone_bundle is None:
       opt.clone_bundle = False if opt.partial_clone else True
     else:
-      m.config.SetBoolean('repo.clonebundle', opt.clone_bundle)
+      m.config.SetString('repo.clonebundle', 'true' if opt.clone_bundle else 'false')
 
     if opt.submodules:
-      m.config.SetBoolean('repo.submodules', opt.submodules)
-
-    if opt.git_lfs is not None:
-      if opt.git_lfs:
-        git_require((2, 17, 0), fail=True, msg='Git LFS support')
-
-      m.config.SetBoolean('repo.git-lfs', opt.git_lfs)
-      if not is_new:
-        print('warning: Changing --git-lfs settings will only affect new project checkouts.\n'
-              '         Existing projects will require manual updates.\n', file=sys.stderr)
-
-    if opt.use_superproject is not None:
-      m.config.SetBoolean('repo.superproject', opt.use_superproject)
-
-    if standalone_manifest:
-      if is_new:
-        manifest_name = 'default.xml'
-        manifest_data = fetch.fetch_file(opt.manifest_url, verbose=opt.verbose)
-        dest = os.path.join(m.worktree, manifest_name)
-        os.makedirs(os.path.dirname(dest), exist_ok=True)
-        with open(dest, 'wb') as f:
-          f.write(manifest_data)
-      return
+      m.config.SetString('repo.submodules', 'true')
 
     if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet, verbose=opt.verbose,
                               clone_bundle=opt.clone_bundle,
                               current_branch_only=opt.current_branch_only,
                               tags=opt.tags, submodules=opt.submodules,
-                              clone_filter=opt.clone_filter,
-                              partial_clone_exclude=self.manifest.PartialCloneExclude):
+                              clone_filter=opt.clone_filter):
       r = m.GetRemote(m.remote.name)
       print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr)
 
@@ -362,7 +365,7 @@ to update the working directory files.
     return a
 
   def _ShouldConfigureUser(self, opt):
-    gc = self.client.globalConfig
+    gc = self.manifest.globalConfig
     mp = self.manifest.manifestProject
 
     # If we don't have local settings, get from global.
@@ -411,7 +414,7 @@ to update the working directory files.
     return False
 
   def _ConfigureColor(self):
-    gc = self.client.globalConfig
+    gc = self.manifest.globalConfig
     if self._HasColorSet(gc):
       return
 
@@ -486,29 +489,11 @@ to update the working directory files.
 
     # 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.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'):
-      self.OptionParser.error('--manifest-branch and --manifest-name cannot'
-                              ' be used with --standalone-manifest.')
+    if opt.archive and opt.mirror:
+      self.OptionParser.error('--mirror and --archive cannot be used together.')
 
     if args:
-      if opt.manifest_url:
-        self.OptionParser.error(
-            '--manifest-url option and URL argument both specified: only use '
-            'one to select the manifest URL.')
-
-      opt.manifest_url = args.pop(0)
-
-      if args:
-        self.OptionParser.error('too many arguments to init')
+      self.OptionParser.error('init takes no arguments')
 
   def Execute(self, opt, args):
     git_require(MIN_GIT_VERSION_HARD, fail=True)
@@ -518,6 +503,9 @@ to update the working directory files.
             % ('.'.join(str(x) for x in MIN_GIT_VERSION_SOFT),),
             file=sys.stderr)
 
+    opt.quiet = opt.output_mode is False
+    opt.verbose = opt.output_mode is True
+
     rp = self.manifest.repoProject
 
     # Handle new --repo-url requests.
@@ -529,15 +517,11 @@ to update the working directory files.
     # Handle new --repo-rev requests.
     if opt.repo_rev:
       wrapper = Wrapper()
-      try:
-        remote_ref, rev = wrapper.check_repo_rev(
-            rp.gitdir, opt.repo_rev, repo_verify=opt.repo_verify, quiet=opt.quiet)
-      except wrapper.CloneFailure:
-        print('fatal: double check your --repo-rev setting.', file=sys.stderr)
-        sys.exit(1)
+      remote_ref, rev = wrapper.check_repo_rev(
+          rp.gitdir, opt.repo_rev, repo_verify=opt.repo_verify, quiet=opt.quiet)
       branch = rp.GetBranch('default')
       branch.merge = remote_ref
-      rp.work_git.reset('--hard', rev)
+      rp.work_git.update_ref('refs/heads/default', rev)
       branch.Save()
 
     if opt.worktree:
@@ -547,9 +531,6 @@ to update the working directory files.
     self._SyncManifest(opt)
     self._LinkManifest(opt.manifest_name)
 
-    if self.manifest.manifestProject.config.GetBoolean('repo.superproject'):
-      self._CloneSuperproject(opt)
-
     if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror:
       if opt.config_name or self._ShouldConfigureUser(opt):
         self._ConfigureUser(opt)

subcmds/list.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2011 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,59 +14,45 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
+from __future__ import print_function
 
 from command import Command, MirrorSafeCommand
 
 
 class List(Command, MirrorSafeCommand):
-  COMMON = True
+  common = True
   helpSummary = "List projects and their associated directories"
   helpUsage = """
 %prog [-f] [<project>...]
-%prog [-f] -r str1 [str2]...
+%prog [-f] -r str1 [str2]..."
 """
   helpDescription = """
 List all projects; pass '.' to list the project for the cwd.
 
-By default, only projects that currently exist in the checkout are shown.  If
-you want to list all projects (using the specified filter settings), use the
---all option.  If you want to show all projects regardless of the manifest
-groups, then also pass --groups all.
-
 This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
 """
 
   def _Options(self, p):
     p.add_option('-r', '--regex',
                  dest='regex', action='store_true',
-                 help='filter the project list based on regex or wildcard matching of strings')
+                 help="Filter the project list based on regex or wildcard matching of strings")
     p.add_option('-g', '--groups',
                  dest='groups',
-                 help='filter the project list based on the groups the project is in')
-    p.add_option('-a', '--all',
-                 action='store_true',
-                 help='show projects regardless of checkout state')
-    p.add_option('-n', '--name-only',
-                 dest='name_only', action='store_true',
-                 help='display only the name of the repository')
-    p.add_option('-p', '--path-only',
-                 dest='path_only', action='store_true',
-                 help='display only the path of the repository')
+                 help="Filter the project list based on the groups the project is in")
     p.add_option('-f', '--fullpath',
                  dest='fullpath', action='store_true',
-                 help='display the full work tree path instead of the relative path')
-    p.add_option('--relative-to', metavar='PATH',
-                 help='display paths relative to this one (default: top of repo client checkout)')
+                 help="Display the full work tree path instead of the relative path")
+    p.add_option('-n', '--name-only',
+                 dest='name_only', action='store_true',
+                 help="Display only the name of the repository")
+    p.add_option('-p', '--path-only',
+                 dest='path_only', action='store_true',
+                 help="Display only the path of the repository")
 
   def ValidateOptions(self, opt, args):
     if opt.fullpath and opt.name_only:
       self.OptionParser.error('cannot combine -f and -n')
 
-    # Resolve any symlinks so the output is stable.
-    if opt.relative_to:
-      opt.relative_to = os.path.realpath(opt.relative_to)
-
   def Execute(self, opt, args):
     """List all projects and the associated directories.
 
@@ -77,15 +65,13 @@ This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
       args: Positional args.  Can be a list of projects to list, or empty.
     """
     if not opt.regex:
-      projects = self.GetProjects(args, groups=opt.groups, missing_ok=opt.all)
+      projects = self.GetProjects(args, groups=opt.groups)
     else:
       projects = self.FindProjects(args)
 
     def _getpath(x):
       if opt.fullpath:
         return x.worktree
-      if opt.relative_to:
-        return os.path.relpath(x.worktree, opt.relative_to)
       return x.relpath
 
     lines = []
@@ -97,6 +83,5 @@ This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
       else:
         lines.append("%s : %s" % (_getpath(project), project.name))
 
-    if lines:
-      lines.sort()
-      print('\n'.join(lines))
+    lines.sort()
+    print('\n'.join(lines))

subcmds/manifest.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
+from __future__ import print_function
 import os
 import sys
 
@@ -20,7 +22,7 @@ from command import PagedCommand
 
 
 class Manifest(PagedCommand):
-  COMMON = False
+  common = False
   helpSummary = "Manifest inspection utility"
   helpUsage = """
 %prog [-o {-|NAME.xml}] [-m MANIFEST.xml] [-r]
@@ -53,29 +55,23 @@ to indicate the remote ref to push changes to via 'repo upload'.
   def _Options(self, p):
     p.add_option('-r', '--revision-as-HEAD',
                  dest='peg_rev', action='store_true',
-                 help='save revisions as current HEAD')
+                 help='Save revisions as current HEAD')
     p.add_option('-m', '--manifest-name',
                  help='temporary manifest to use for this sync', metavar='NAME.xml')
     p.add_option('--suppress-upstream-revision', dest='peg_rev_upstream',
                  default=True, action='store_false',
-                 help='if in -r mode, do not write the upstream field '
-                 '(only of use if the branch names for a sha1 manifest are '
-                 'sensitive)')
+                 help='If in -r mode, do not write the upstream field.  '
+                 'Only of use if the branch names for a sha1 manifest are '
+                 'sensitive.')
     p.add_option('--suppress-dest-branch', dest='peg_rev_dest_branch',
                  default=True, action='store_false',
-                 help='if in -r mode, do not write the dest-branch field '
-                 '(only of use if the branch names for a sha1 manifest are '
-                 'sensitive)')
-    p.add_option('--json', default=False, action='store_true',
-                 help='output manifest in JSON format (experimental)')
-    p.add_option('--pretty', default=False, action='store_true',
-                 help='format output for humans to read')
-    p.add_option('--no-local-manifests', default=False, action='store_true',
-                 dest='ignore_local_manifests', help='ignore local manifests')
+                 help='If in -r mode, do not write the dest-branch field.  '
+                 'Only of use if the branch names for a sha1 manifest are '
+                 'sensitive.')
     p.add_option('-o', '--output-file',
                  dest='output_file',
                  default='-',
-                 help='file to save the manifest to',
+                 help='File to save the manifest to',
                  metavar='-|NAME.xml')
 
   def _Output(self, opt):
@@ -87,29 +83,10 @@ to indicate the remote ref to push changes to via 'repo upload'.
       fd = sys.stdout
     else:
       fd = open(opt.output_file, 'w')
-
-    self.manifest.SetUseLocalManifests(not opt.ignore_local_manifests)
-
-    if opt.json:
-      print('warning: --json is experimental!', file=sys.stderr)
-      doc = self.manifest.ToDict(peg_rev=opt.peg_rev,
-                                 peg_rev_upstream=opt.peg_rev_upstream,
-                                 peg_rev_dest_branch=opt.peg_rev_dest_branch)
-
-      json_settings = {
-          # JSON style guide says Uunicode characters are fully allowed.
-          'ensure_ascii': False,
-          # We use 2 space indent to match JSON style guide.
-          'indent': 2 if opt.pretty else None,
-          'separators': (',', ': ') if opt.pretty else (',', ':'),
-          'sort_keys': True,
-      }
-      fd.write(json.dumps(doc, **json_settings))
-    else:
-      self.manifest.Save(fd,
-                         peg_rev=opt.peg_rev,
-                         peg_rev_upstream=opt.peg_rev_upstream,
-                         peg_rev_dest_branch=opt.peg_rev_dest_branch)
+    self.manifest.Save(fd,
+                       peg_rev=opt.peg_rev,
+                       peg_rev_upstream=opt.peg_rev_upstream,
+                       peg_rev_dest_branch=opt.peg_rev_dest_branch)
     fd.close()
     if opt.output_file != '-':
       print('Saved manifest to %s' % opt.output_file, file=sys.stderr)

subcmds/overview.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2012 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,14 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import optparse
-
+from __future__ import print_function
 from color import Coloring
 from command import PagedCommand
 
 
 class Overview(PagedCommand):
-  COMMON = True
+  common = True
   helpSummary = "Display overview of unmerged project branches"
   helpUsage = """
 %prog [--current-branch] [<project>...]
@@ -28,22 +29,15 @@ class Overview(PagedCommand):
 The '%prog' command is used to display an overview of the projects branches,
 and list any local commits that have not yet been merged into the project.
 
-The -c/--current-branch option can be used to restrict the output to only
+The -b/--current-branch option can be used to restrict the output to only
 branches currently checked out in each project.  By default, all branches
 are displayed.
 """
 
   def _Options(self, p):
-    p.add_option('-c', '--current-branch',
+    p.add_option('-b', '--current-branch',
                  dest="current_branch", action="store_true",
-                 help="consider only checked out branches")
-    p.add_option('--no-current-branch',
-                 dest='current_branch', action='store_false',
-                 help='consider all local branches')
-    # Turn this into a warning & remove this someday.
-    p.add_option('-b',
-                 dest='current_branch', action='store_true',
-                 help=optparse.SUPPRESS_HELP)
+                 help="Consider only checked out branches")
 
   def Execute(self, opt, args):
     all_branches = []

subcmds/prune.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,38 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import itertools
-
+from __future__ import print_function
 from color import Coloring
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
+from command import PagedCommand
 
 
 class Prune(PagedCommand):
-  COMMON = True
+  common = True
   helpSummary = "Prune (delete) already merged topics"
   helpUsage = """
 %prog [<project>...]
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
-
-  def _ExecuteOne(self, project):
-    """Process one project."""
-    return project.PruneHeads()
 
   def Execute(self, opt, args):
-    projects = self.GetProjects(args)
-
-    # NB: Should be able to refactor this module to display summary as results
-    # come back from children.
-    def _ProcessResults(_pool, _output, results):
-      return list(itertools.chain.from_iterable(results))
-
-    all_branches = self.ExecuteInParallel(
-        opt.jobs,
-        self._ExecuteOne,
-        projects,
-        callback=_ProcessResults,
-        ordered=True)
+    all_branches = []
+    for project in self.GetProjects(args):
+      all_branches.extend(project.PruneHeads())
 
     if not all_branches:
       return

subcmds/rebase.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2010 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import sys
 
 from color import Coloring
@@ -27,7 +30,7 @@ class RebaseColoring(Coloring):
 
 
 class Rebase(Command):
-  COMMON = True
+  common = True
   helpSummary = "Rebase local branches on upstream branch"
   helpUsage = """
 %prog {[<project>...] | -i <project>...}
@@ -39,34 +42,36 @@ branch but need to incorporate new upstream changes "underneath" them.
 """
 
   def _Options(self, p):
-    g = p.get_option_group('--quiet')
-    g.add_option('-i', '--interactive',
+    p.add_option('-i', '--interactive',
                  dest="interactive", action="store_true",
                  help="interactive rebase (single project only)")
 
     p.add_option('--fail-fast',
                  dest='fail_fast', action='store_true',
-                 help='stop rebasing after first error is hit')
+                 help='Stop rebasing after first error is hit')
     p.add_option('-f', '--force-rebase',
                  dest='force_rebase', action='store_true',
-                 help='pass --force-rebase to git rebase')
+                 help='Pass --force-rebase to git rebase')
     p.add_option('--no-ff',
                  dest='ff', default=True, action='store_false',
-                 help='pass --no-ff to git rebase')
+                 help='Pass --no-ff to git rebase')
+    p.add_option('-q', '--quiet',
+                 dest='quiet', action='store_true',
+                 help='Pass --quiet to git rebase')
     p.add_option('--autosquash',
                  dest='autosquash', action='store_true',
-                 help='pass --autosquash to git rebase')
+                 help='Pass --autosquash to git rebase')
     p.add_option('--whitespace',
                  dest='whitespace', action='store', metavar='WS',
-                 help='pass --whitespace to git rebase')
+                 help='Pass --whitespace to git rebase')
     p.add_option('--auto-stash',
                  dest='auto_stash', action='store_true',
-                 help='stash local modifications before starting')
+                 help='Stash local modifications before starting')
     p.add_option('-m', '--onto-manifest',
                  dest='onto_manifest', action='store_true',
-                 help='rebase onto the manifest version instead of upstream '
-                      'HEAD (this helps to make sure the local tree stays '
-                      'consistent if you previously synced to a manifest)')
+                 help='Rebase onto the manifest version instead of upstream '
+                      'HEAD.  This helps to make sure the local tree stays '
+                      'consistent if you previously synced to a manifest.')
 
   def Execute(self, opt, args):
     all_projects = self.GetProjects(args)

subcmds/selfupdate.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 from optparse import SUPPRESS_HELP
 import sys
 
@@ -21,7 +24,7 @@ from subcmds.sync import _PostRepoFetch
 
 
 class Selfupdate(Command, MirrorSafeCommand):
-  COMMON = False
+  common = False
   helpSummary = "Update repo to the latest version"
   helpUsage = """
 %prog

subcmds/smartsync.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2010 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +18,7 @@ from subcmds.sync import Sync
 
 
 class Smartsync(Sync):
-  COMMON = True
+  common = True
   helpSummary = "Update working tree to the latest known good revision"
   helpUsage = """
 %prog [<project>...]

subcmds/stage.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import sys
 
 from color import Coloring
@@ -28,7 +31,7 @@ class _ProjectList(Coloring):
 
 
 class Stage(InteractiveCommand):
-  COMMON = True
+  common = True
   helpSummary = "Stage file(s) for commit"
   helpUsage = """
 %prog -i [<project>...]
@@ -38,8 +41,7 @@ The '%prog' command stages files to prepare the next commit.
 """
 
   def _Options(self, p):
-    g = p.get_option_group('--quiet')
-    g.add_option('-i', '--interactive',
+    p.add_option('-i', '--interactive',
                  dest='interactive', action='store_true',
                  help='use interactive staging')
 

subcmds/start.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import functools
+from __future__ import print_function
 import os
 import sys
 
-from command import Command, DEFAULT_LOCAL_JOBS
+from command import Command
 from git_config import IsImmutable
 from git_command import git
 import gitc_utils
@@ -25,7 +27,7 @@ from project import SyncBuffer
 
 
 class Start(Command):
-  COMMON = True
+  common = True
   helpSummary = "Start a new branch for development"
   helpUsage = """
 %prog <newbranchname> [--all | <project>...]
@@ -34,7 +36,6 @@ class Start(Command):
 '%prog' begins a new branch of development, starting from the
 revision specified in the manifest.
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
   def _Options(self, p):
     p.add_option('--all',
@@ -42,8 +43,7 @@ revision specified in the manifest.
                  help='begin branch in all projects')
     p.add_option('-r', '--rev', '--revision', dest='revision',
                  help='point branch at this revision instead of upstream')
-    p.add_option('--head', '--HEAD',
-                 dest='revision', action='store_const', const='HEAD',
+    p.add_option('--head', dest='revision', action='store_const', const='HEAD',
                  help='abbreviation for --rev HEAD')
 
   def ValidateOptions(self, opt, args):
@@ -54,26 +54,6 @@ revision specified in the manifest.
     if not git.check_ref_format('heads/%s' % nb):
       self.OptionParser.error("'%s' is not a valid name" % nb)
 
-  def _ExecuteOne(self, revision, nb, project):
-    """Start one project."""
-    # If the current revision is immutable, such as a SHA1, a tag or
-    # a change, then we can't push back to it. Substitute with
-    # dest_branch, if defined; or with manifest default revision instead.
-    branch_merge = ''
-    if IsImmutable(project.revisionExpr):
-      if project.dest_branch:
-        branch_merge = project.dest_branch
-      else:
-        branch_merge = self.manifest.default.revisionExpr
-
-    try:
-      ret = project.StartBranch(
-          nb, branch_merge=branch_merge, revision=revision)
-    except Exception as e:
-      print('error: unable to checkout %s: %s' % (project.name, e), file=sys.stderr)
-      ret = False
-    return (ret, project)
-
   def Execute(self, opt, args):
     nb = args[0]
     err = []
@@ -105,8 +85,11 @@ revision specified in the manifest.
       if not os.path.exists(os.getcwd()):
         os.chdir(self.manifest.topdir)
 
-      pm = Progress('Syncing %s' % nb, len(all_projects), quiet=opt.quiet)
-      for project in all_projects:
+    pm = Progress('Starting %s' % nb, len(all_projects))
+    for project in all_projects:
+      pm.update()
+
+      if self.gitc_manifest:
         gitc_project = self.gitc_manifest.paths[project.relpath]
         # Sync projects that have not been opened.
         if not gitc_project.already_synced:
@@ -119,21 +102,21 @@ revision specified in the manifest.
           sync_buf = SyncBuffer(self.manifest.manifestProject.config)
           project.Sync_LocalHalf(sync_buf)
           project.revisionId = gitc_project.old_revision
-        pm.update()
-      pm.end()
 
-    def _ProcessResults(_pool, pm, results):
-      for (result, project) in results:
-        if not result:
-          err.append(project)
-        pm.update()
+      # If the current revision is immutable, such as a SHA1, a tag or
+      # a change, then we can't push back to it. Substitute with
+      # dest_branch, if defined; or with manifest default revision instead.
+      branch_merge = ''
+      if IsImmutable(project.revisionExpr):
+        if project.dest_branch:
+          branch_merge = project.dest_branch
+        else:
+          branch_merge = self.manifest.default.revisionExpr
 
-    self.ExecuteInParallel(
-        opt.jobs,
-        functools.partial(self._ExecuteOne, opt.revision, nb),
-        all_projects,
-        callback=_ProcessResults,
-        output=Progress('Starting %s' % (nb,), len(all_projects), quiet=opt.quiet))
+      if not project.StartBranch(
+              nb, branch_merge=branch_merge, revision=opt.revision):
+        err.append(project)
+    pm.end()
 
     if err:
       for p in err:

subcmds/status.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,19 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
+
 import functools
 import glob
-import io
+import multiprocessing
 import os
 
-from command import DEFAULT_LOCAL_JOBS, PagedCommand
+from command import PagedCommand
 
 from color import Coloring
 import platform_utils
 
 
 class Status(PagedCommand):
-  COMMON = True
+  common = True
   helpSummary = "Show the working tree status"
   helpUsage = """
 %prog [<project>...]
@@ -76,12 +80,16 @@ the following meanings:
  d:  deleted       (    in index, not in work tree                )
 
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
   def _Options(self, p):
+    p.add_option('-j', '--jobs',
+                 dest='jobs', action='store', type='int', default=2,
+                 help="number of projects to check simultaneously")
     p.add_option('-o', '--orphans',
                  dest='orphans', action='store_true',
                  help="include objects in working directory outside of repo projects")
+    p.add_option('-q', '--quiet', action='store_true',
+                 help="only print the name of modified projects")
 
   def _StatusHelper(self, quiet, project):
     """Obtains the status for a specific project.
@@ -96,9 +104,7 @@ the following meanings:
     Returns:
       The status of the project.
     """
-    buf = io.StringIO()
-    ret = project.PrintWorkTreeStatus(quiet=quiet, output_redir=buf)
-    return (ret, buf.getvalue())
+    return project.PrintWorkTreeStatus(quiet=quiet)
 
   def _FindOrphans(self, dirs, proj_dirs, proj_dirs_parents, outstring):
     """find 'dirs' that are present in 'proj_dirs_parents' but not in 'proj_dirs'"""
@@ -118,23 +124,17 @@ the following meanings:
 
   def Execute(self, opt, args):
     all_projects = self.GetProjects(args)
+    counter = 0
 
-    def _ProcessResults(_pool, _output, results):
-      ret = 0
-      for (state, output) in results:
-        if output:
-          print(output, end='')
+    if opt.jobs == 1:
+      for project in all_projects:
+        state = project.PrintWorkTreeStatus(quiet=opt.quiet)
         if state == 'CLEAN':
-          ret += 1
-      return ret
-
-    counter = self.ExecuteInParallel(
-        opt.jobs,
-        functools.partial(self._StatusHelper, opt.quiet),
-        all_projects,
-        callback=_ProcessResults,
-        ordered=True)
-
+          counter += 1
+    else:
+      with multiprocessing.Pool(opt.jobs) as pool:
+        states = pool.map(functools.partial(self._StatusHelper, opt.quiet), all_projects)
+        counter += states.count('CLEAN')
     if not opt.quiet and len(all_projects) == counter:
       print('nothing to commit (working directory clean)')
 
@@ -165,7 +165,7 @@ the following meanings:
                           proj_dirs, proj_dirs_parents, outstring)
 
         if outstring:
-          output = StatusColoring(self.client.globalConfig)
+          output = StatusColoring(self.manifest.globalConfig)
           output.project('Objects not within a project (orphans)')
           output.nl()
           for entry in outstring:

subcmds/upload.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2008 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,19 +14,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import copy
-import functools
-import optparse
 import re
 import sys
 
-from command import DEFAULT_LOCAL_JOBS, InteractiveCommand
+from command import InteractiveCommand
 from editor import Editor
-from error import UploadError
+from error import HookError, UploadError
 from git_command import GitCommand
 from git_refs import R_HEADS
 from hooks import RepoHook
 
+from pyversion import is_python3
+if not is_python3():
+  input = raw_input  # noqa: F821
+else:
+  unicode = str
 
 UNUSUAL_COMMIT_THRESHOLD = 5
 
@@ -55,7 +61,7 @@ def _SplitEmails(values):
 
 
 class Upload(InteractiveCommand):
-  COMMON = True
+  common = True
   helpSummary = "Upload changes for code review"
   helpUsage = """
 %prog [--re --cc] [<project>]...
@@ -147,67 +153,85 @@ https://gerrit-review.googlesource.com/Documentation/user-upload.html#notify
 Gerrit Code Review:  https://www.gerritcodereview.com/
 
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
 
   def _Options(self, p):
     p.add_option('-t',
                  dest='auto_topic', action='store_true',
-                 help='send local branch name to Gerrit Code Review')
+                 help='Send local branch name to Gerrit Code Review')
     p.add_option('--hashtag', '--ht',
                  dest='hashtags', action='append', default=[],
-                 help='add hashtags (comma delimited) to the review')
+                 help='Add hashtags (comma delimited) to the review.')
     p.add_option('--hashtag-branch', '--htb',
                  action='store_true',
-                 help='add local branch name as a hashtag')
+                 help='Add local branch name as a hashtag.')
     p.add_option('-l', '--label',
                  dest='labels', action='append', default=[],
-                 help='add a label when uploading')
+                 help='Add a label when uploading.')
     p.add_option('--re', '--reviewers',
                  type='string', action='append', dest='reviewers',
-                 help='request reviews from these people')
+                 help='Request reviews from these people.')
     p.add_option('--cc',
                  type='string', action='append', dest='cc',
-                 help='also send email to these email addresses')
-    p.add_option('--br', '--branch',
+                 help='Also send email to these email addresses.')
+    p.add_option('--br',
                  type='string', action='store', dest='branch',
-                 help='(local) branch to upload')
-    p.add_option('-c', '--current-branch',
+                 help='Branch to upload.')
+    p.add_option('--cbr', '--current-branch',
                  dest='current_branch', action='store_true',
-                 help='upload current git branch')
-    p.add_option('--no-current-branch',
-                 dest='current_branch', action='store_false',
-                 help='upload all git branches')
-    # Turn this into a warning & remove this someday.
-    p.add_option('--cbr',
-                 dest='current_branch', action='store_true',
-                 help=optparse.SUPPRESS_HELP)
+                 help='Upload current git branch.')
     p.add_option('--ne', '--no-emails',
                  action='store_false', dest='notify', default=True,
-                 help='do not send e-mails on upload')
+                 help='If specified, do not send emails on upload.')
     p.add_option('-p', '--private',
                  action='store_true', dest='private', default=False,
-                 help='upload as a private change (deprecated; use --wip)')
+                 help='If specified, upload as a private change.')
     p.add_option('-w', '--wip',
                  action='store_true', dest='wip', default=False,
-                 help='upload as a work-in-progress change')
+                 help='If specified, upload as a work-in-progress change.')
     p.add_option('-o', '--push-option',
                  type='string', action='append', dest='push_options',
                  default=[],
-                 help='additional push options to transmit')
+                 help='Additional push options to transmit')
     p.add_option('-D', '--destination', '--dest',
                  type='string', action='store', dest='dest_branch',
                  metavar='BRANCH',
-                 help='submit for review on this target branch')
+                 help='Submit for review on this target branch.')
     p.add_option('-n', '--dry-run',
                  dest='dryrun', default=False, action='store_true',
-                 help='do everything except actually upload the CL')
+                 help='Do everything except actually upload the CL.')
     p.add_option('-y', '--yes',
                  default=False, action='store_true',
-                 help='answer yes to all safe prompts')
+                 help='Answer yes to all safe prompts.')
     p.add_option('--no-cert-checks',
                  dest='validate_certs', action='store_false', default=True,
-                 help='disable verifying ssl certs (unsafe)')
-    RepoHook.AddOptionGroup(p, 'pre-upload')
+                 help='Disable verifying ssl certs (unsafe).')
+
+    # Options relating to upload hook.  Note that verify and no-verify are NOT
+    # opposites of each other, which is why they store to different locations.
+    # We are using them to match 'git commit' syntax.
+    #
+    # Combinations:
+    # - no-verify=False, verify=False (DEFAULT):
+    #   If stdout is a tty, can prompt about running upload hooks if needed.
+    #   If user denies running hooks, the upload is cancelled.  If stdout is
+    #   not a tty and we would need to prompt about upload hooks, upload is
+    #   cancelled.
+    # - no-verify=False, verify=True:
+    #   Always run upload hooks with no prompt.
+    # - no-verify=True, verify=False:
+    #   Never run upload hooks, but upload anyway (AKA bypass hooks).
+    # - no-verify=True, verify=True:
+    #   Invalid
+    g = p.add_option_group('Upload hooks')
+    g.add_option('--no-verify',
+                 dest='bypass_hooks', action='store_true',
+                 help='Do not run the upload hook.')
+    g.add_option('--verify',
+                 dest='allow_all_hooks', action='store_true',
+                 help='Run the upload hook without prompting.')
+    g.add_option('--ignore-hooks',
+                 dest='ignore_hooks', action='store_true',
+                 help='Do not abort uploading if upload hooks fail.')
 
   def _SingleBranch(self, opt, branch, people):
     project = branch.project
@@ -512,60 +536,72 @@ Gerrit Code Review:  https://www.gerritcodereview.com/
     merge_branch = p.stdout.strip()
     return merge_branch
 
-  @staticmethod
-  def _GatherOne(opt, project):
-    """Figure out the upload status for |project|."""
-    if opt.current_branch:
-      cbr = project.CurrentBranch
-      up_branch = project.GetUploadableBranch(cbr)
-      avail = [up_branch] if up_branch else None
-    else:
-      avail = project.GetUploadableBranches(opt.branch)
-    return (project, avail)
-
   def Execute(self, opt, args):
-    projects = self.GetProjects(args)
+    project_list = self.GetProjects(args)
+    pending = []
+    reviewers = []
+    cc = []
+    branch = None
 
-    def _ProcessResults(_pool, _out, results):
-      pending = []
-      for result in results:
-        project, avail = result
-        if avail is None:
-          print('repo: error: %s: Unable to upload branch "%s". '
-                'You might be able to fix the branch by running:\n'
-                '  git branch --set-upstream-to m/%s' %
-                (project.relpath, project.CurrentBranch, self.manifest.branch),
+    if opt.branch:
+      branch = opt.branch
+
+    for project in project_list:
+      if opt.current_branch:
+        cbr = project.CurrentBranch
+        up_branch = project.GetUploadableBranch(cbr)
+        if up_branch:
+          avail = [up_branch]
+        else:
+          avail = None
+          print('ERROR: Current branch (%s) not uploadable. '
+                'You may be able to type '
+                '"git branch --set-upstream-to m/master" to fix '
+                'your branch.' % str(cbr),
                 file=sys.stderr)
-        elif avail:
-          pending.append(result)
-      return pending
-
-    pending = self.ExecuteInParallel(
-        opt.jobs,
-        functools.partial(self._GatherOne, opt),
-        projects,
-        callback=_ProcessResults)
+      else:
+        avail = project.GetUploadableBranches(branch)
+      if avail:
+        pending.append((project, avail))
 
     if not pending:
-      if opt.branch is None:
+      if branch is None:
         print('repo: error: no branches ready for upload', file=sys.stderr)
       else:
         print('repo: error: no branches named "%s" ready for upload' %
-              (opt.branch,), file=sys.stderr)
+              (branch,), file=sys.stderr)
       return 1
 
-    pending_proj_names = [project.name for (project, available) in pending]
-    pending_worktrees = [project.worktree for (project, available) in pending]
-    hook = RepoHook.FromSubcmd(
-        hook_type='pre-upload', manifest=self.manifest,
-        opt=opt, abort_if_user_denies=True)
-    if not hook.Run(
-        project_list=pending_proj_names,
-        worktree_list=pending_worktrees):
-      return 1
+    if not opt.bypass_hooks:
+      hook = RepoHook('pre-upload', self.manifest.repo_hooks_project,
+                      self.manifest.topdir,
+                      self.manifest.manifestProject.GetRemote('origin').url,
+                      abort_if_user_denies=True)
+      pending_proj_names = [project.name for (project, available) in pending]
+      pending_worktrees = [project.worktree for (project, available) in pending]
+      passed = True
+      try:
+        hook.Run(opt.allow_all_hooks, project_list=pending_proj_names,
+                 worktree_list=pending_worktrees)
+      except SystemExit:
+        passed = False
+        if not opt.ignore_hooks:
+          raise
+      except HookError as e:
+        passed = False
+        print("ERROR: %s" % str(e), file=sys.stderr)
 
-    reviewers = _SplitEmails(opt.reviewers) if opt.reviewers else []
-    cc = _SplitEmails(opt.cc) if opt.cc else []
+      if not passed:
+        if opt.ignore_hooks:
+          print('\nWARNING: pre-upload hooks failed, but uploading anyways.',
+                file=sys.stderr)
+        else:
+          return 1
+
+    if opt.reviewers:
+      reviewers = _SplitEmails(opt.reviewers)
+    if opt.cc:
+      cc = _SplitEmails(opt.cc)
     people = (reviewers, cc)
 
     if len(pending) == 1 and len(pending[0][1]) == 1:

subcmds/version.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,20 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
+
 import platform
 import sys
 
 from command import Command, MirrorSafeCommand
 from git_command import git, RepoSourceVersion, user_agent
 from git_refs import HEAD
-from wrapper import Wrapper
 
 
 class Version(Command, MirrorSafeCommand):
   wrapper_version = None
   wrapper_path = None
 
-  COMMON = False
+  common = False
   helpSummary = "Display the version of repo"
   helpUsage = """
 %prog
@@ -34,14 +37,12 @@ class Version(Command, MirrorSafeCommand):
   def Execute(self, opt, args):
     rp = self.manifest.repoProject
     rem = rp.GetRemote(rp.remote.name)
-    branch = rp.GetBranch('default')
 
     # These might not be the same.  Report them both.
     src_ver = RepoSourceVersion()
     rp_ver = rp.bare_git.describe(HEAD)
     print('repo version %s' % rp_ver)
     print('       (from %s)' % rem.url)
-    print('       (tracking %s)' % branch.merge)
     print('       (%s)' % rp.bare_git.log('-1', '--format=%cD', HEAD))
 
     if self.wrapper_path is not None:
@@ -63,4 +64,3 @@ class Version(Command, MirrorSafeCommand):
       print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
       print('CPU %s (%s)' %
             (uname.machine, uname.processor if uname.processor else 'unknown'))
-    print('Bug reports:', Wrapper().BUG_URL)

tests/test_editor.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +16,8 @@
 
 """Unittests for the editor.py module."""
 
+from __future__ import print_function
+
 import unittest
 
 from editor import Editor

tests/test_error.py

@@ -1,53 +0,0 @@
-# Copyright 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Unittests for the error.py module."""
-
-import inspect
-import pickle
-import unittest
-
-import error
-
-
-class PickleTests(unittest.TestCase):
-  """Make sure all our custom exceptions can be pickled."""
-
-  def getExceptions(self):
-    """Return all our custom exceptions."""
-    for name in dir(error):
-      cls = getattr(error, name)
-      if isinstance(cls, type) and issubclass(cls, Exception):
-        yield cls
-
-  def testExceptionLookup(self):
-    """Make sure our introspection logic works."""
-    classes = list(self.getExceptions())
-    self.assertIn(error.HookError, classes)
-    # Don't assert the exact number to avoid being a change-detector test.
-    self.assertGreater(len(classes), 10)
-
-  def testPickle(self):
-    """Try to pickle all the exceptions."""
-    for cls in self.getExceptions():
-      args = inspect.getfullargspec(cls.__init__).args[1:]
-      obj = cls(*args)
-      p = pickle.dumps(obj)
-      try:
-        newobj = pickle.loads(p)
-      except Exception as e:  # pylint: disable=broad-except
-        self.fail('Class %s is unable to be pickled: %s\n'
-                  'Incomplete super().__init__(...) call?' % (cls, e))
-      self.assertIsInstance(newobj, cls)
-      self.assertEqual(str(obj), str(newobj))

tests/test_git_command.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +16,8 @@
 
 """Unittests for the git_command.py module."""
 
+from __future__ import print_function
+
 import re
 import unittest
 
@@ -26,6 +30,33 @@ import git_command
 import wrapper
 
 
+class SSHUnitTest(unittest.TestCase):
+  """Tests the ssh functions."""
+
+  def test_ssh_version(self):
+    """Check ssh_version() handling."""
+    ver = git_command._parse_ssh_version('Unknown\n')
+    self.assertEqual(ver, ())
+    ver = git_command._parse_ssh_version('OpenSSH_1.0\n')
+    self.assertEqual(ver, (1, 0))
+    ver = git_command._parse_ssh_version('OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.13, OpenSSL 1.0.1f 6 Jan 2014\n')
+    self.assertEqual(ver, (6, 6, 1))
+    ver = git_command._parse_ssh_version('OpenSSH_7.6p1 Ubuntu-4ubuntu0.3, OpenSSL 1.0.2n  7 Dec 2017\n')
+    self.assertEqual(ver, (7, 6))
+
+  def test_ssh_sock(self):
+    """Check ssh_sock() function."""
+    with mock.patch('tempfile.mkdtemp', return_value='/tmp/foo'):
+      # old ssh version uses port
+      with mock.patch('git_command.ssh_version', return_value=(6, 6)):
+        self.assertTrue(git_command.ssh_sock().endswith('%p'))
+      git_command._ssh_sock_path = None
+      # new ssh version uses hash
+      with mock.patch('git_command.ssh_version', return_value=(6, 7)):
+        self.assertTrue(git_command.ssh_sock().endswith('%C'))
+      git_command._ssh_sock_path = None
+
+
 class GitCallUnitTest(unittest.TestCase):
   """Tests the _GitCall class (via git_command.git)."""
 

tests/test_git_config.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2009 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +16,9 @@
 
 """Unittests for the git_config.py module."""
 
+from __future__ import print_function
+
 import os
-import tempfile
 import unittest
 
 import git_config
@@ -27,8 +30,9 @@ def fixture(*paths):
   return os.path.join(os.path.dirname(__file__), 'fixtures', *paths)
 
 
-class GitConfigReadOnlyTests(unittest.TestCase):
-  """Read-only tests of the GitConfig class."""
+class GitConfigUnitTest(unittest.TestCase):
+  """Tests the GitConfig class.
+  """
 
   def setUp(self):
     """Create a GitConfig object using the test.gitconfig fixture.
@@ -105,88 +109,5 @@ class GitConfigReadOnlyTests(unittest.TestCase):
       self.assertEqual(value, self.config.GetInt('section.%s' % (key,)))
 
 
-class GitConfigReadWriteTests(unittest.TestCase):
-  """Read/write tests of the GitConfig class."""
-
-  def setUp(self):
-    self.tmpfile = tempfile.NamedTemporaryFile()
-    self.config = self.get_config()
-
-  def get_config(self):
-    """Get a new GitConfig instance."""
-    return git_config.GitConfig(self.tmpfile.name)
-
-  def test_SetString(self):
-    """Test SetString behavior."""
-    # Set a value.
-    self.assertIsNone(self.config.GetString('foo.bar'))
-    self.config.SetString('foo.bar', 'val')
-    self.assertEqual('val', self.config.GetString('foo.bar'))
-
-    # Make sure the value was actually written out.
-    config = self.get_config()
-    self.assertEqual('val', config.GetString('foo.bar'))
-
-    # Update the value.
-    self.config.SetString('foo.bar', 'valll')
-    self.assertEqual('valll', self.config.GetString('foo.bar'))
-    config = self.get_config()
-    self.assertEqual('valll', config.GetString('foo.bar'))
-
-    # Delete the value.
-    self.config.SetString('foo.bar', None)
-    self.assertIsNone(self.config.GetString('foo.bar'))
-    config = self.get_config()
-    self.assertIsNone(config.GetString('foo.bar'))
-
-  def test_SetBoolean(self):
-    """Test SetBoolean behavior."""
-    # Set a true value.
-    self.assertIsNone(self.config.GetBoolean('foo.bar'))
-    for val in (True, 1):
-      self.config.SetBoolean('foo.bar', val)
-      self.assertTrue(self.config.GetBoolean('foo.bar'))
-
-    # Make sure the value was actually written out.
-    config = self.get_config()
-    self.assertTrue(config.GetBoolean('foo.bar'))
-    self.assertEqual('true', config.GetString('foo.bar'))
-
-    # Set a false value.
-    for val in (False, 0):
-      self.config.SetBoolean('foo.bar', val)
-      self.assertFalse(self.config.GetBoolean('foo.bar'))
-
-    # Make sure the value was actually written out.
-    config = self.get_config()
-    self.assertFalse(config.GetBoolean('foo.bar'))
-    self.assertEqual('false', config.GetString('foo.bar'))
-
-    # Delete the value.
-    self.config.SetBoolean('foo.bar', None)
-    self.assertIsNone(self.config.GetBoolean('foo.bar'))
-    config = self.get_config()
-    self.assertIsNone(config.GetBoolean('foo.bar'))
-
-  def test_GetSyncAnalysisStateData(self):
-    """Test config entries with a sync state analysis data."""
-    superproject_logging_data = {}
-    superproject_logging_data['test'] = False
-    options = type('options', (object,), {})()
-    options.verbose = 'true'
-    options.mp_update = 'false'
-    TESTS = (
-        ('superproject.test', 'false'),
-        ('options.verbose', 'true'),
-        ('options.mpupdate', 'false'),
-        ('main.version', '1'),
-    )
-    self.config.UpdateSyncAnalysisState(options, superproject_logging_data)
-    sync_data = self.config.GetSyncAnalysisStateData()
-    for key, value in TESTS:
-      self.assertEqual(sync_data[f'{git_config.SYNC_STATE_PREFIX}{key}'], value)
-    self.assertTrue(sync_data[f'{git_config.SYNC_STATE_PREFIX}main.synctime'])
-
-
 if __name__ == '__main__':
   unittest.main()

tests/test_git_superproject.py

@@ -1,376 +0,0 @@
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Unittests for the git_superproject.py module."""
-
-import json
-import os
-import platform
-import tempfile
-import unittest
-from unittest import mock
-
-import git_superproject
-import git_trace2_event_log
-import manifest_xml
-import platform_utils
-from test_manifest_xml import sort_attributes
-
-
-class SuperprojectTestCase(unittest.TestCase):
-  """TestCase for the Superproject module."""
-
-  PARENT_SID_KEY = 'GIT_TRACE2_PARENT_SID'
-  PARENT_SID_VALUE = 'parent_sid'
-  SELF_SID_REGEX = r'repo-\d+T\d+Z-.*'
-  FULL_SID_REGEX = r'^%s/%s' % (PARENT_SID_VALUE, SELF_SID_REGEX)
-
-  def setUp(self):
-    """Set up superproject every time."""
-    self.tempdir = tempfile.mkdtemp(prefix='repo_tests')
-    self.repodir = os.path.join(self.tempdir, '.repo')
-    self.manifest_file = os.path.join(
-        self.repodir, manifest_xml.MANIFEST_FILE_NAME)
-    os.mkdir(self.repodir)
-    self.platform = platform.system().lower()
-
-    # By default we initialize with the expected case where
-    # repo launches us (so GIT_TRACE2_PARENT_SID is set).
-    env = {
-        self.PARENT_SID_KEY: self.PARENT_SID_VALUE,
-    }
-    self.git_event_log = git_trace2_event_log.EventLog(env=env)
-
-    # The manifest parsing really wants a git repo currently.
-    gitdir = os.path.join(self.repodir, 'manifests.git')
-    os.mkdir(gitdir)
-    with open(os.path.join(gitdir, 'config'), 'w') as fp:
-      fp.write("""[remote "origin"]
-        url = https://localhost:0/manifest
-""")
-
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <superproject name="superproject"/>
-  <project path="art" name="platform/art" groups="notdefault,platform-""" + self.platform + """
-  " /></manifest>
-""")
-    self._superproject = git_superproject.Superproject(manifest, self.repodir,
-                                                       self.git_event_log)
-
-  def tearDown(self):
-    """Tear down superproject every time."""
-    platform_utils.rmtree(self.tempdir)
-
-  def getXmlManifest(self, data):
-    """Helper to initialize a manifest for testing."""
-    with open(self.manifest_file, 'w') as fp:
-      fp.write(data)
-    return manifest_xml.XmlManifest(self.repodir, self.manifest_file)
-
-  def verifyCommonKeys(self, log_entry, expected_event_name, full_sid=True):
-    """Helper function to verify common event log keys."""
-    self.assertIn('event', log_entry)
-    self.assertIn('sid', log_entry)
-    self.assertIn('thread', log_entry)
-    self.assertIn('time', log_entry)
-
-    # Do basic data format validation.
-    self.assertEqual(expected_event_name, log_entry['event'])
-    if full_sid:
-      self.assertRegex(log_entry['sid'], self.FULL_SID_REGEX)
-    else:
-      self.assertRegex(log_entry['sid'], self.SELF_SID_REGEX)
-    self.assertRegex(log_entry['time'], r'^\d+-\d+-\d+T\d+:\d+:\d+\.\d+Z$')
-
-  def readLog(self, log_path):
-    """Helper function to read log data into a list."""
-    log_data = []
-    with open(log_path, mode='rb') as f:
-      for line in f:
-        log_data.append(json.loads(line))
-    return log_data
-
-  def verifyErrorEvent(self):
-    """Helper to verify that error event is written."""
-
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self.git_event_log.Write(path=tempdir)
-      self.log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self.log_data), 2)
-    error_event = self.log_data[1]
-    self.verifyCommonKeys(self.log_data[0], expected_event_name='version')
-    self.verifyCommonKeys(error_event, expected_event_name='error')
-    # Check for 'error' event specific fields.
-    self.assertIn('msg', error_event)
-    self.assertIn('fmt', error_event)
-
-  def test_superproject_get_superproject_no_superproject(self):
-    """Test with no url."""
-    manifest = self.getXmlManifest("""
-<manifest>
-</manifest>
-""")
-    superproject = git_superproject.Superproject(manifest, self.repodir, self.git_event_log)
-    # Test that exit condition is false when there is no superproject tag.
-    sync_result = superproject.Sync()
-    self.assertFalse(sync_result.success)
-    self.assertFalse(sync_result.fatal)
-    self.verifyErrorEvent()
-
-  def test_superproject_get_superproject_invalid_url(self):
-    """Test with an invalid url."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <superproject name="superproject"/>
-</manifest>
-""")
-    superproject = git_superproject.Superproject(manifest, self.repodir, self.git_event_log)
-    sync_result = superproject.Sync()
-    self.assertFalse(sync_result.success)
-    self.assertTrue(sync_result.fatal)
-
-  def test_superproject_get_superproject_invalid_branch(self):
-    """Test with an invalid branch."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <superproject name="superproject"/>
-</manifest>
-""")
-    self._superproject = git_superproject.Superproject(manifest, self.repodir,
-                                                       self.git_event_log)
-    with mock.patch.object(self._superproject, '_branch', 'junk'):
-      sync_result = self._superproject.Sync()
-      self.assertFalse(sync_result.success)
-      self.assertTrue(sync_result.fatal)
-
-  def test_superproject_get_superproject_mock_init(self):
-    """Test with _Init failing."""
-    with mock.patch.object(self._superproject, '_Init', return_value=False):
-      sync_result = self._superproject.Sync()
-      self.assertFalse(sync_result.success)
-      self.assertTrue(sync_result.fatal)
-
-  def test_superproject_get_superproject_mock_fetch(self):
-    """Test with _Fetch failing."""
-    with mock.patch.object(self._superproject, '_Init', return_value=True):
-      os.mkdir(self._superproject._superproject_path)
-      with mock.patch.object(self._superproject, '_Fetch', return_value=False):
-        sync_result = self._superproject.Sync()
-        self.assertFalse(sync_result.success)
-        self.assertTrue(sync_result.fatal)
-
-  def test_superproject_get_all_project_commit_ids_mock_ls_tree(self):
-    """Test with LsTree being a mock."""
-    data = ('120000 blob 158258bdf146f159218e2b90f8b699c4d85b5804\tAndroid.bp\x00'
-            '160000 commit 2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea\tart\x00'
-            '160000 commit e9d25da64d8d365dbba7c8ee00fe8c4473fe9a06\tbootable/recovery\x00'
-            '120000 blob acc2cbdf438f9d2141f0ae424cec1d8fc4b5d97f\tbootstrap.bash\x00'
-            '160000 commit ade9b7a0d874e25fff4bf2552488825c6f111928\tbuild/bazel\x00')
-    with mock.patch.object(self._superproject, '_Init', return_value=True):
-      with mock.patch.object(self._superproject, '_Fetch', return_value=True):
-        with mock.patch.object(self._superproject, '_LsTree', return_value=data):
-          commit_ids_result = self._superproject._GetAllProjectsCommitIds()
-          self.assertEqual(commit_ids_result.commit_ids, {
-              'art': '2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea',
-              'bootable/recovery': 'e9d25da64d8d365dbba7c8ee00fe8c4473fe9a06',
-              'build/bazel': 'ade9b7a0d874e25fff4bf2552488825c6f111928'
-          })
-          self.assertFalse(commit_ids_result.fatal)
-
-  def test_superproject_write_manifest_file(self):
-    """Test with writing manifest to a file after setting revisionId."""
-    self.assertEqual(len(self._superproject._manifest.projects), 1)
-    project = self._superproject._manifest.projects[0]
-    project.SetRevisionId('ABCDEF')
-    # Create temporary directory so that it can write the file.
-    os.mkdir(self._superproject._superproject_path)
-    manifest_path = self._superproject._WriteManifestFile()
-    self.assertIsNotNone(manifest_path)
-    with open(manifest_path, 'r') as fp:
-      manifest_xml_data = fp.read()
-    self.assertEqual(
-        sort_attributes(manifest_xml_data),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="default-remote"/>'
-        '<default remote="default-remote" revision="refs/heads/main"/>'
-        '<project groups="notdefault,platform-' + self.platform + '" '
-        'name="platform/art" path="art" revision="ABCDEF" upstream="refs/heads/main"/>'
-        '<superproject name="superproject"/>'
-        '</manifest>')
-
-  def test_superproject_update_project_revision_id(self):
-    """Test with LsTree being a mock."""
-    self.assertEqual(len(self._superproject._manifest.projects), 1)
-    projects = self._superproject._manifest.projects
-    data = ('160000 commit 2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea\tart\x00'
-            '160000 commit e9d25da64d8d365dbba7c8ee00fe8c4473fe9a06\tbootable/recovery\x00')
-    with mock.patch.object(self._superproject, '_Init', return_value=True):
-      with mock.patch.object(self._superproject, '_Fetch', return_value=True):
-        with mock.patch.object(self._superproject,
-                               '_LsTree',
-                               return_value=data):
-          # Create temporary directory so that it can write the file.
-          os.mkdir(self._superproject._superproject_path)
-          update_result = self._superproject.UpdateProjectsRevisionId(projects)
-          self.assertIsNotNone(update_result.manifest_path)
-          self.assertFalse(update_result.fatal)
-          with open(update_result.manifest_path, 'r') as fp:
-            manifest_xml_data = fp.read()
-          self.assertEqual(
-              sort_attributes(manifest_xml_data),
-              '<?xml version="1.0" ?><manifest>'
-              '<remote fetch="http://localhost" name="default-remote"/>'
-              '<default remote="default-remote" revision="refs/heads/main"/>'
-              '<project groups="notdefault,platform-' + self.platform + '" '
-              'name="platform/art" path="art" '
-              'revision="2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea" upstream="refs/heads/main"/>'
-              '<superproject name="superproject"/>'
-              '</manifest>')
-
-  def test_superproject_update_project_revision_id_no_superproject_tag(self):
-    """Test update of commit ids of a manifest without superproject tag."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="test-name"/>
-</manifest>
-""")
-    self.maxDiff = None
-    self._superproject = git_superproject.Superproject(manifest, self.repodir,
-                                                       self.git_event_log)
-    self.assertEqual(len(self._superproject._manifest.projects), 1)
-    projects = self._superproject._manifest.projects
-    project = projects[0]
-    project.SetRevisionId('ABCDEF')
-    update_result = self._superproject.UpdateProjectsRevisionId(projects)
-    self.assertIsNone(update_result.manifest_path)
-    self.assertFalse(update_result.fatal)
-    self.verifyErrorEvent()
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="default-remote"/>'
-        '<default remote="default-remote" revision="refs/heads/main"/>'
-        '<project name="test-name" revision="ABCDEF" upstream="refs/heads/main"/>'
-        '</manifest>')
-
-  def test_superproject_update_project_revision_id_from_local_manifest_group(self):
-    """Test update of commit ids of a manifest that have local manifest no superproject group."""
-    local_group = manifest_xml.LOCAL_MANIFEST_GROUP_PREFIX + ':local'
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <remote name="goog" fetch="http://localhost2" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <superproject name="superproject"/>
-  <project path="vendor/x" name="platform/vendor/x" remote="goog"
-           groups=\"""" + local_group + """
-         " revision="master-with-vendor" clone-depth="1" />
-  <project path="art" name="platform/art" groups="notdefault,platform-""" + self.platform + """
-  " /></manifest>
-""")
-    self.maxDiff = None
-    self._superproject = git_superproject.Superproject(manifest, self.repodir,
-                                                       self.git_event_log)
-    self.assertEqual(len(self._superproject._manifest.projects), 2)
-    projects = self._superproject._manifest.projects
-    data = ('160000 commit 2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea\tart\x00')
-    with mock.patch.object(self._superproject, '_Init', return_value=True):
-      with mock.patch.object(self._superproject, '_Fetch', return_value=True):
-        with mock.patch.object(self._superproject,
-                               '_LsTree',
-                               return_value=data):
-          # Create temporary directory so that it can write the file.
-          os.mkdir(self._superproject._superproject_path)
-          update_result = self._superproject.UpdateProjectsRevisionId(projects)
-          self.assertIsNotNone(update_result.manifest_path)
-          self.assertFalse(update_result.fatal)
-          with open(update_result.manifest_path, 'r') as fp:
-            manifest_xml_data = fp.read()
-          # Verify platform/vendor/x's project revision hasn't changed.
-          self.assertEqual(
-              sort_attributes(manifest_xml_data),
-              '<?xml version="1.0" ?><manifest>'
-              '<remote fetch="http://localhost" name="default-remote"/>'
-              '<remote fetch="http://localhost2" name="goog"/>'
-              '<default remote="default-remote" revision="refs/heads/main"/>'
-              '<project groups="notdefault,platform-' + self.platform + '" '
-              'name="platform/art" path="art" '
-              'revision="2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea" upstream="refs/heads/main"/>'
-              '<project clone-depth="1" groups="' + local_group + '" '
-              'name="platform/vendor/x" path="vendor/x" remote="goog" '
-              'revision="master-with-vendor"/>'
-              '<superproject name="superproject"/>'
-              '</manifest>')
-
-  def test_superproject_update_project_revision_id_with_pinned_manifest(self):
-    """Test update of commit ids of a pinned manifest."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <superproject name="superproject"/>
-  <project path="vendor/x" name="platform/vendor/x" revision="" />
-  <project path="vendor/y" name="platform/vendor/y"
-           revision="52d3c9f7c107839ece2319d077de0cd922aa9d8f" />
-  <project path="art" name="platform/art" groups="notdefault,platform-""" + self.platform + """
-  " /></manifest>
-""")
-    self.maxDiff = None
-    self._superproject = git_superproject.Superproject(manifest, self.repodir,
-                                                       self.git_event_log)
-    self.assertEqual(len(self._superproject._manifest.projects), 3)
-    projects = self._superproject._manifest.projects
-    data = ('160000 commit 2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea\tart\x00'
-            '160000 commit e9d25da64d8d365dbba7c8ee00fe8c4473fe9a06\tvendor/x\x00')
-    with mock.patch.object(self._superproject, '_Init', return_value=True):
-      with mock.patch.object(self._superproject, '_Fetch', return_value=True):
-        with mock.patch.object(self._superproject,
-                               '_LsTree',
-                               return_value=data):
-          # Create temporary directory so that it can write the file.
-          os.mkdir(self._superproject._superproject_path)
-          update_result = self._superproject.UpdateProjectsRevisionId(projects)
-          self.assertIsNotNone(update_result.manifest_path)
-          self.assertFalse(update_result.fatal)
-          with open(update_result.manifest_path, 'r') as fp:
-            manifest_xml_data = fp.read()
-          # Verify platform/vendor/x's project revision hasn't changed.
-          self.assertEqual(
-              sort_attributes(manifest_xml_data),
-              '<?xml version="1.0" ?><manifest>'
-              '<remote fetch="http://localhost" name="default-remote"/>'
-              '<default remote="default-remote" revision="refs/heads/main"/>'
-              '<project groups="notdefault,platform-' + self.platform + '" '
-              'name="platform/art" path="art" '
-              'revision="2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea" upstream="refs/heads/main"/>'
-              '<project name="platform/vendor/x" path="vendor/x" '
-              'revision="e9d25da64d8d365dbba7c8ee00fe8c4473fe9a06" upstream="refs/heads/main"/>'
-              '<project name="platform/vendor/y" path="vendor/y" '
-              'revision="52d3c9f7c107839ece2319d077de0cd922aa9d8f"/>'
-              '<superproject name="superproject"/>'
-              '</manifest>')
-
-
-if __name__ == '__main__':
-  unittest.main()

tests/test_git_trace2_event_log.py

@@ -1,329 +0,0 @@
-# Copyright (C) 2020 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Unittests for the git_trace2_event_log.py module."""
-
-import json
-import os
-import tempfile
-import unittest
-from unittest import mock
-
-import git_trace2_event_log
-
-
-class EventLogTestCase(unittest.TestCase):
-  """TestCase for the EventLog module."""
-
-  PARENT_SID_KEY = 'GIT_TRACE2_PARENT_SID'
-  PARENT_SID_VALUE = 'parent_sid'
-  SELF_SID_REGEX = r'repo-\d+T\d+Z-.*'
-  FULL_SID_REGEX = r'^%s/%s' % (PARENT_SID_VALUE, SELF_SID_REGEX)
-
-  def setUp(self):
-    """Load the event_log module every time."""
-    self._event_log_module = None
-    # By default we initialize with the expected case where
-    # repo launches us (so GIT_TRACE2_PARENT_SID is set).
-    env = {
-        self.PARENT_SID_KEY: self.PARENT_SID_VALUE,
-    }
-    self._event_log_module = git_trace2_event_log.EventLog(env=env)
-    self._log_data = None
-
-  def verifyCommonKeys(self, log_entry, expected_event_name=None, full_sid=True):
-    """Helper function to verify common event log keys."""
-    self.assertIn('event', log_entry)
-    self.assertIn('sid', log_entry)
-    self.assertIn('thread', log_entry)
-    self.assertIn('time', log_entry)
-
-    # Do basic data format validation.
-    if expected_event_name:
-      self.assertEqual(expected_event_name, log_entry['event'])
-    if full_sid:
-      self.assertRegex(log_entry['sid'], self.FULL_SID_REGEX)
-    else:
-      self.assertRegex(log_entry['sid'], self.SELF_SID_REGEX)
-    self.assertRegex(log_entry['time'], r'^\d+-\d+-\d+T\d+:\d+:\d+\.\d+Z$')
-
-  def readLog(self, log_path):
-    """Helper function to read log data into a list."""
-    log_data = []
-    with open(log_path, mode='rb') as f:
-      for line in f:
-        log_data.append(json.loads(line))
-    return log_data
-
-  def remove_prefix(self, s, prefix):
-    """Return a copy string after removing |prefix| from |s|, if present or the original string."""
-    if s.startswith(prefix):
-        return s[len(prefix):]
-    else:
-        return s
-
-  def test_initial_state_with_parent_sid(self):
-    """Test initial state when 'GIT_TRACE2_PARENT_SID' is set by parent."""
-    self.assertRegex(self._event_log_module.full_sid, self.FULL_SID_REGEX)
-
-  def test_initial_state_no_parent_sid(self):
-    """Test initial state when 'GIT_TRACE2_PARENT_SID' is not set."""
-    # Setup an empty environment dict (no parent sid).
-    self._event_log_module = git_trace2_event_log.EventLog(env={})
-    self.assertRegex(self._event_log_module.full_sid, self.SELF_SID_REGEX)
-
-  def test_version_event(self):
-    """Test 'version' event data is valid.
-
-    Verify that the 'version' event is written even when no other
-    events are addded.
-
-    Expected event log:
-    <version event>
-    """
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    # A log with no added events should only have the version entry.
-    self.assertEqual(len(self._log_data), 1)
-    version_event = self._log_data[0]
-    self.verifyCommonKeys(version_event, expected_event_name='version')
-    # Check for 'version' event specific fields.
-    self.assertIn('evt', version_event)
-    self.assertIn('exe', version_event)
-    # Verify "evt" version field is a string.
-    self.assertIsInstance(version_event['evt'], str)
-
-  def test_start_event(self):
-    """Test and validate 'start' event data is valid.
-
-    Expected event log:
-    <version event>
-    <start event>
-    """
-    self._event_log_module.StartEvent()
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 2)
-    start_event = self._log_data[1]
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-    self.verifyCommonKeys(start_event, expected_event_name='start')
-    # Check for 'start' event specific fields.
-    self.assertIn('argv', start_event)
-    self.assertTrue(isinstance(start_event['argv'], list))
-
-  def test_exit_event_result_none(self):
-    """Test 'exit' event data is valid when result is None.
-
-    We expect None result to be converted to 0 in the exit event data.
-
-    Expected event log:
-    <version event>
-    <exit event>
-    """
-    self._event_log_module.ExitEvent(None)
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 2)
-    exit_event = self._log_data[1]
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-    self.verifyCommonKeys(exit_event, expected_event_name='exit')
-    # Check for 'exit' event specific fields.
-    self.assertIn('code', exit_event)
-    # 'None' result should convert to 0 (successful) return code.
-    self.assertEqual(exit_event['code'], 0)
-
-  def test_exit_event_result_integer(self):
-    """Test 'exit' event data is valid when result is an integer.
-
-    Expected event log:
-    <version event>
-    <exit event>
-    """
-    self._event_log_module.ExitEvent(2)
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 2)
-    exit_event = self._log_data[1]
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-    self.verifyCommonKeys(exit_event, expected_event_name='exit')
-    # Check for 'exit' event specific fields.
-    self.assertIn('code', exit_event)
-    self.assertEqual(exit_event['code'], 2)
-
-  def test_command_event(self):
-    """Test and validate 'command' event data is valid.
-
-    Expected event log:
-    <version event>
-    <command event>
-    """
-    name = 'repo'
-    subcommands = ['init' 'this']
-    self._event_log_module.CommandEvent(name='repo', subcommands=subcommands)
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 2)
-    command_event = self._log_data[1]
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-    self.verifyCommonKeys(command_event, expected_event_name='command')
-    # Check for 'command' event specific fields.
-    self.assertIn('name', command_event)
-    self.assertIn('subcommands', command_event)
-    self.assertEqual(command_event['name'], name)
-    self.assertEqual(command_event['subcommands'], subcommands)
-
-  def test_def_params_event_repo_config(self):
-    """Test 'def_params' event data outputs only repo config keys.
-
-    Expected event log:
-    <version event>
-    <def_param event>
-    <def_param event>
-    """
-    config = {
-        'git.foo': 'bar',
-        'repo.partialclone': 'true',
-        'repo.partialclonefilter': 'blob:none',
-    }
-    self._event_log_module.DefParamRepoEvents(config)
-
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 3)
-    def_param_events = self._log_data[1:]
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-
-    for event in def_param_events:
-      self.verifyCommonKeys(event, expected_event_name='def_param')
-      # Check for 'def_param' event specific fields.
-      self.assertIn('param', event)
-      self.assertIn('value', event)
-      self.assertTrue(event['param'].startswith('repo.'))
-
-  def test_def_params_event_no_repo_config(self):
-    """Test 'def_params' event data won't output non-repo config keys.
-
-    Expected event log:
-    <version event>
-    """
-    config = {
-        'git.foo': 'bar',
-        'git.core.foo2': 'baz',
-    }
-    self._event_log_module.DefParamRepoEvents(config)
-
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 1)
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-
-  def test_data_event_config(self):
-    """Test 'data' event data outputs all config keys.
-
-    Expected event log:
-    <version event>
-    <data event>
-    <data event>
-    """
-    config = {
-        'git.foo': 'bar',
-        'repo.partialclone': 'false',
-        'repo.syncstate.superproject.hassuperprojecttag': 'true',
-        'repo.syncstate.superproject.sys.argv': ['--', 'sync', 'protobuf'],
-    }
-    prefix_value = 'prefix'
-    self._event_log_module.LogDataConfigEvents(config, prefix_value)
-
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 5)
-    data_events = self._log_data[1:]
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-
-    for event in data_events:
-      self.verifyCommonKeys(event)
-      # Check for 'data' event specific fields.
-      self.assertIn('key', event)
-      self.assertIn('value', event)
-      key = event['key']
-      key = self.remove_prefix(key, f'{prefix_value}/')
-      value = event['value']
-      self.assertEqual(self._event_log_module.GetDataEventName(value), event['event'])
-      self.assertTrue(key in config and value == config[key])
-
-  def test_error_event(self):
-    """Test and validate 'error' event data is valid.
-
-    Expected event log:
-    <version event>
-    <error event>
-    """
-    msg = 'invalid option: --cahced'
-    fmt = 'invalid option: %s'
-    self._event_log_module.ErrorEvent(msg, fmt)
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      log_path = self._event_log_module.Write(path=tempdir)
-      self._log_data = self.readLog(log_path)
-
-    self.assertEqual(len(self._log_data), 2)
-    error_event = self._log_data[1]
-    self.verifyCommonKeys(self._log_data[0], expected_event_name='version')
-    self.verifyCommonKeys(error_event, expected_event_name='error')
-    # Check for 'error' event specific fields.
-    self.assertIn('msg', error_event)
-    self.assertIn('fmt', error_event)
-    self.assertEqual(error_event['msg'], msg)
-    self.assertEqual(error_event['fmt'], fmt)
-
-  def test_write_with_filename(self):
-    """Test Write() with a path to a file exits with None."""
-    self.assertIsNone(self._event_log_module.Write(path='path/to/file'))
-
-  def test_write_with_git_config(self):
-    """Test Write() uses the git config path when 'git config' call succeeds."""
-    with tempfile.TemporaryDirectory(prefix='event_log_tests') as tempdir:
-      with mock.patch.object(self._event_log_module,
-                             '_GetEventTargetPath', return_value=tempdir):
-        self.assertEqual(os.path.dirname(self._event_log_module.Write()), tempdir)
-
-  def test_write_no_git_config(self):
-    """Test Write() with no git config variable present exits with None."""
-    with mock.patch.object(self._event_log_module,
-                           '_GetEventTargetPath', return_value=None):
-      self.assertIsNone(self._event_log_module.Write())
-
-  def test_write_non_string(self):
-    """Test Write() with non-string type for |path| throws TypeError."""
-    with self.assertRaises(TypeError):
-      self._event_log_module.Write(path=1234)
-
-
-if __name__ == '__main__':
-  unittest.main()

tests/test_hooks.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +16,8 @@
 
 """Unittests for the hooks.py module."""
 
+from __future__ import print_function
+
 import hooks
 import unittest
 
@@ -24,6 +28,7 @@ class RepoHookShebang(unittest.TestCase):
     """Lines w/out shebangs should be rejected."""
     DATA = (
         '',
+        '# -*- coding:utf-8 -*-\n',
         '#\n# foo\n',
         '# Bad shebang in script\n#!/foo\n'
     )

tests/test_manifest_xml.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,11 +16,9 @@
 
 """Unittests for the manifest_xml.py module."""
 
+from __future__ import print_function
+
 import os
-import platform
-import re
-import shutil
-import tempfile
 import unittest
 import xml.dom.minidom
 
@@ -26,105 +26,6 @@ import error
 import manifest_xml
 
 
-# Invalid paths that we don't want in the filesystem.
-INVALID_FS_PATHS = (
-    '',
-    '.',
-    '..',
-    '../',
-    './',
-    './/',
-    'foo/',
-    './foo',
-    '../foo',
-    'foo/./bar',
-    'foo/../../bar',
-    '/foo',
-    './../foo',
-    '.git/foo',
-    # Check case folding.
-    '.GIT/foo',
-    'blah/.git/foo',
-    '.repo/foo',
-    '.repoconfig',
-    # Block ~ due to 8.3 filenames on Windows filesystems.
-    '~',
-    'foo~',
-    'blah/foo~',
-    # Block Unicode characters that get normalized out by filesystems.
-    u'foo\u200Cbar',
-    # Block newlines.
-    'f\n/bar',
-    'f\r/bar',
-)
-
-# Make sure platforms that use path separators (e.g. Windows) are also
-# rejected properly.
-if os.path.sep != '/':
-  INVALID_FS_PATHS += tuple(x.replace('/', os.path.sep) for x in INVALID_FS_PATHS)
-
-
-def sort_attributes(manifest):
-  """Sort the attributes of all elements alphabetically.
-
-  This is needed because different versions of the toxml() function from
-  xml.dom.minidom outputs the attributes of elements in different orders.
-  Before Python 3.8 they were output alphabetically, later versions preserve
-  the order specified by the user.
-
-  Args:
-    manifest: String containing an XML manifest.
-
-  Returns:
-    The XML manifest with the attributes of all elements sorted alphabetically.
-  """
-  new_manifest = ''
-  # This will find every element in the XML manifest, whether they have
-  # attributes or not. This simplifies recreating the manifest below.
-  matches = re.findall(r'(<[/?]?[a-z-]+\s*)((?:\S+?="[^"]+"\s*?)*)(\s*[/?]?>)', manifest)
-  for head, attrs, tail in matches:
-    m = re.findall(r'\S+?="[^"]+"', attrs)
-    new_manifest += head + ' '.join(sorted(m)) + tail
-  return new_manifest
-
-
-class ManifestParseTestCase(unittest.TestCase):
-  """TestCase for parsing manifests."""
-
-  def setUp(self):
-    self.tempdir = tempfile.mkdtemp(prefix='repo_tests')
-    self.repodir = os.path.join(self.tempdir, '.repo')
-    self.manifest_dir = os.path.join(self.repodir, 'manifests')
-    self.manifest_file = os.path.join(
-        self.repodir, manifest_xml.MANIFEST_FILE_NAME)
-    self.local_manifest_dir = os.path.join(
-        self.repodir, manifest_xml.LOCAL_MANIFESTS_DIR_NAME)
-    os.mkdir(self.repodir)
-    os.mkdir(self.manifest_dir)
-
-    # The manifest parsing really wants a git repo currently.
-    gitdir = os.path.join(self.repodir, 'manifests.git')
-    os.mkdir(gitdir)
-    with open(os.path.join(gitdir, 'config'), 'w') as fp:
-      fp.write("""[remote "origin"]
-        url = https://localhost:0/manifest
-""")
-
-  def tearDown(self):
-    shutil.rmtree(self.tempdir, ignore_errors=True)
-
-  def getXmlManifest(self, data):
-    """Helper to initialize a manifest for testing."""
-    with open(self.manifest_file, 'w') as fp:
-      fp.write(data)
-    return manifest_xml.XmlManifest(self.repodir, self.manifest_file)
-
-  @staticmethod
-  def encodeXmlAttr(attr):
-    """Encode |attr| using XML escape rules."""
-    return attr.replace('\r', '&#x000d;').replace('\n', '&#x000a;')
-
-
 class ManifestValidateFilePaths(unittest.TestCase):
   """Check _ValidateFilePaths helper.
 
@@ -155,7 +56,36 @@ class ManifestValidateFilePaths(unittest.TestCase):
 
   def test_bad_paths(self):
     """Make sure bad paths (src & dest) are rejected."""
-    for path in INVALID_FS_PATHS:
+    PATHS = (
+        '..',
+        '../',
+        './',
+        'foo/',
+        './foo',
+        '../foo',
+        'foo/./bar',
+        'foo/../../bar',
+        '/foo',
+        './../foo',
+        '.git/foo',
+        # Check case folding.
+        '.GIT/foo',
+        'blah/.git/foo',
+        '.repo/foo',
+        '.repoconfig',
+        # Block ~ due to 8.3 filenames on Windows filesystems.
+        '~',
+        'foo~',
+        'blah/foo~',
+        # Block Unicode characters that get normalized out by filesystems.
+        u'foo\u200Cbar',
+    )
+    # Make sure platforms that use path separators (e.g. Windows) are also
+    # rejected properly.
+    if os.path.sep != '/':
+      PATHS += tuple(x.replace('/', os.path.sep) for x in PATHS)
+
+    for path in PATHS:
       self.assertRaises(
           error.ManifestInvalidPathError, self.check_both, path, 'a')
       self.assertRaises(
@@ -216,630 +146,3 @@ class ValueTests(unittest.TestCase):
     with self.assertRaises(error.ManifestParseError):
       node = self._get_node('<node a="xx"/>')
       manifest_xml.XmlInt(node, 'a')
-
-
-class XmlManifestTests(ManifestParseTestCase):
-  """Check manifest processing."""
-
-  def test_empty(self):
-    """Parse an 'empty' manifest file."""
-    manifest = self.getXmlManifest(
-        '<?xml version="1.0" encoding="UTF-8"?>'
-        '<manifest></manifest>')
-    self.assertEqual(manifest.remotes, {})
-    self.assertEqual(manifest.projects, [])
-
-  def test_link(self):
-    """Verify Link handling with new names."""
-    manifest = manifest_xml.XmlManifest(self.repodir, self.manifest_file)
-    with open(os.path.join(self.manifest_dir, 'foo.xml'), 'w') as fp:
-      fp.write('<manifest></manifest>')
-    manifest.Link('foo.xml')
-    with open(self.manifest_file) as fp:
-      self.assertIn('<include name="foo.xml" />', fp.read())
-
-  def test_toxml_empty(self):
-    """Verify the ToXml() helper."""
-    manifest = self.getXmlManifest(
-        '<?xml version="1.0" encoding="UTF-8"?>'
-        '<manifest></manifest>')
-    self.assertEqual(manifest.ToXml().toxml(), '<?xml version="1.0" ?><manifest/>')
-
-  def test_todict_empty(self):
-    """Verify the ToDict() helper."""
-    manifest = self.getXmlManifest(
-        '<?xml version="1.0" encoding="UTF-8"?>'
-        '<manifest></manifest>')
-    self.assertEqual(manifest.ToDict(), {})
-
-  def test_repo_hooks(self):
-    """Check repo-hooks settings."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <project name="repohooks" path="src/repohooks"/>
-  <repo-hooks in-project="repohooks" enabled-list="a, b"/>
-</manifest>
-""")
-    self.assertEqual(manifest.repo_hooks_project.name, 'repohooks')
-    self.assertEqual(manifest.repo_hooks_project.enabled_repo_hooks, ['a', 'b'])
-
-  def test_repo_hooks_unordered(self):
-    """Check repo-hooks settings work even if the project def comes second."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <repo-hooks in-project="repohooks" enabled-list="a, b"/>
-  <project name="repohooks" path="src/repohooks"/>
-</manifest>
-""")
-    self.assertEqual(manifest.repo_hooks_project.name, 'repohooks')
-    self.assertEqual(manifest.repo_hooks_project.enabled_repo_hooks, ['a', 'b'])
-
-  def test_unknown_tags(self):
-    """Check superproject settings."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <superproject name="superproject"/>
-  <iankaz value="unknown (possible) future tags are ignored"/>
-  <x-custom-tag>X tags are always ignored</x-custom-tag>
-</manifest>
-""")
-    self.assertEqual(manifest.superproject['name'], 'superproject')
-    self.assertEqual(manifest.superproject['remote'].name, 'test-remote')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="test-remote"/>'
-        '<default remote="test-remote" revision="refs/heads/main"/>'
-        '<superproject name="superproject"/>'
-        '</manifest>')
-
-  def test_remote_annotations(self):
-    """Check remote settings."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost">
-    <annotation name="foo" value="bar"/>
-  </remote>
-</manifest>
-""")
-    self.assertEqual(manifest.remotes['test-remote'].annotations[0].name, 'foo')
-    self.assertEqual(manifest.remotes['test-remote'].annotations[0].value, 'bar')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="test-remote">'
-        '<annotation name="foo" value="bar"/>'
-        '</remote>'
-        '</manifest>')
-
-
-class IncludeElementTests(ManifestParseTestCase):
-  """Tests for <include>."""
-
-  def test_group_levels(self):
-    root_m = os.path.join(self.manifest_dir, 'root.xml')
-    with open(root_m, 'w') as fp:
-      fp.write("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <include name="level1.xml" groups="level1-group" />
-  <project name="root-name1" path="root-path1" />
-  <project name="root-name2" path="root-path2" groups="r2g1,r2g2" />
-</manifest>
-""")
-    with open(os.path.join(self.manifest_dir, 'level1.xml'), 'w') as fp:
-      fp.write("""
-<manifest>
-  <include name="level2.xml" groups="level2-group" />
-  <project name="level1-name1" path="level1-path1" />
-</manifest>
-""")
-    with open(os.path.join(self.manifest_dir, 'level2.xml'), 'w') as fp:
-      fp.write("""
-<manifest>
-  <project name="level2-name1" path="level2-path1" groups="l2g1,l2g2" />
-</manifest>
-""")
-    include_m = manifest_xml.XmlManifest(self.repodir, root_m)
-    for proj in include_m.projects:
-      if proj.name == 'root-name1':
-        # Check include group not set on root level proj.
-        self.assertNotIn('level1-group', proj.groups)
-      if proj.name == 'root-name2':
-        # Check root proj group not removed.
-        self.assertIn('r2g1', proj.groups)
-      if proj.name == 'level1-name1':
-        # Check level1 proj has inherited group level 1.
-        self.assertIn('level1-group', proj.groups)
-      if proj.name == 'level2-name1':
-        # Check level2 proj has inherited group levels 1 and 2.
-        self.assertIn('level1-group', proj.groups)
-        self.assertIn('level2-group', proj.groups)
-        # Check level2 proj group not removed.
-        self.assertIn('l2g1', proj.groups)
-
-  def test_allow_bad_name_from_user(self):
-    """Check handling of bad name attribute from the user's input."""
-    def parse(name):
-      name = self.encodeXmlAttr(name)
-      manifest = self.getXmlManifest(f"""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <include name="{name}" />
-</manifest>
-""")
-      # Force the manifest to be parsed.
-      manifest.ToXml()
-
-    # Setup target of the include.
-    target = os.path.join(self.tempdir, 'target.xml')
-    with open(target, 'w') as fp:
-      fp.write('<manifest></manifest>')
-
-    # Include with absolute path.
-    parse(os.path.abspath(target))
-
-    # Include with relative path.
-    parse(os.path.relpath(target, self.manifest_dir))
-
-  def test_bad_name_checks(self):
-    """Check handling of bad name attribute."""
-    def parse(name):
-      name = self.encodeXmlAttr(name)
-      # Setup target of the include.
-      with open(os.path.join(self.manifest_dir, 'target.xml'), 'w') as fp:
-        fp.write(f'<manifest><include name="{name}"/></manifest>')
-
-      manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <include name="target.xml" />
-</manifest>
-""")
-      # Force the manifest to be parsed.
-      manifest.ToXml()
-
-    # Handle empty name explicitly because a different codepath rejects it.
-    with self.assertRaises(error.ManifestParseError):
-      parse('')
-
-    for path in INVALID_FS_PATHS:
-      if not path:
-        continue
-
-      with self.assertRaises(error.ManifestInvalidPathError):
-        parse(path)
-
-
-class ProjectElementTests(ManifestParseTestCase):
-  """Tests for <project>."""
-
-  def test_group(self):
-    """Check project group settings."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <project name="test-name" path="test-path"/>
-  <project name="extras" path="path" groups="g1,g2,g1"/>
-</manifest>
-""")
-    self.assertEqual(len(manifest.projects), 2)
-    # Ordering isn't guaranteed.
-    result = {
-        manifest.projects[0].name: manifest.projects[0].groups,
-        manifest.projects[1].name: manifest.projects[1].groups,
-    }
-    project = manifest.projects[0]
-    self.assertCountEqual(
-        result['test-name'],
-        ['name:test-name', 'all', 'path:test-path'])
-    self.assertCountEqual(
-        result['extras'],
-        ['g1', 'g2', 'g1', 'name:extras', 'all', 'path:path'])
-    groupstr = 'default,platform-' + platform.system().lower()
-    self.assertEqual(groupstr, manifest.GetGroupsStr())
-    groupstr = 'g1,g2,g1'
-    manifest.manifestProject.config.SetString('manifest.groups', groupstr)
-    self.assertEqual(groupstr, manifest.GetGroupsStr())
-
-  def test_set_revision_id(self):
-    """Check setting of project's revisionId."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="test-name"/>
-</manifest>
-""")
-    self.assertEqual(len(manifest.projects), 1)
-    project = manifest.projects[0]
-    project.SetRevisionId('ABCDEF')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="default-remote"/>'
-        '<default remote="default-remote" revision="refs/heads/main"/>'
-        '<project name="test-name" revision="ABCDEF" upstream="refs/heads/main"/>'
-        '</manifest>')
-
-  def test_trailing_slash(self):
-    """Check handling of trailing slashes in attributes."""
-    def parse(name, path):
-      name = self.encodeXmlAttr(name)
-      path = self.encodeXmlAttr(path)
-      return self.getXmlManifest(f"""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="{name}" path="{path}" />
-</manifest>
-""")
-
-    manifest = parse('a/path/', 'foo')
-    self.assertEqual(manifest.projects[0].gitdir,
-                     os.path.join(self.tempdir, '.repo/projects/foo.git'))
-    self.assertEqual(manifest.projects[0].objdir,
-                     os.path.join(self.tempdir, '.repo/project-objects/a/path.git'))
-
-    manifest = parse('a/path', 'foo/')
-    self.assertEqual(manifest.projects[0].gitdir,
-                     os.path.join(self.tempdir, '.repo/projects/foo.git'))
-    self.assertEqual(manifest.projects[0].objdir,
-                     os.path.join(self.tempdir, '.repo/project-objects/a/path.git'))
-
-    manifest = parse('a/path', 'foo//////')
-    self.assertEqual(manifest.projects[0].gitdir,
-                     os.path.join(self.tempdir, '.repo/projects/foo.git'))
-    self.assertEqual(manifest.projects[0].objdir,
-                     os.path.join(self.tempdir, '.repo/project-objects/a/path.git'))
-
-  def test_toplevel_path(self):
-    """Check handling of path=. specially."""
-    def parse(name, path):
-      name = self.encodeXmlAttr(name)
-      path = self.encodeXmlAttr(path)
-      return self.getXmlManifest(f"""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="{name}" path="{path}" />
-</manifest>
-""")
-
-    for path in ('.', './', './/', './//'):
-      manifest = parse('server/path', path)
-      self.assertEqual(manifest.projects[0].gitdir,
-                       os.path.join(self.tempdir, '.repo/projects/..git'))
-
-  def test_bad_path_name_checks(self):
-    """Check handling of bad path & name attributes."""
-    def parse(name, path):
-      name = self.encodeXmlAttr(name)
-      path = self.encodeXmlAttr(path)
-      manifest = self.getXmlManifest(f"""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="{name}" path="{path}" />
-</manifest>
-""")
-      # Force the manifest to be parsed.
-      manifest.ToXml()
-
-    # Verify the parser is valid by default to avoid buggy tests below.
-    parse('ok', 'ok')
-
-    # Handle empty name explicitly because a different codepath rejects it.
-    # Empty path is OK because it defaults to the name field.
-    with self.assertRaises(error.ManifestParseError):
-      parse('', 'ok')
-
-    for path in INVALID_FS_PATHS:
-      if not path or path.endswith('/'):
-        continue
-
-      with self.assertRaises(error.ManifestInvalidPathError):
-        parse(path, 'ok')
-
-      # We have a dedicated test for path=".".
-      if path not in {'.'}:
-        with self.assertRaises(error.ManifestInvalidPathError):
-          parse('ok', path)
-
-
-class SuperProjectElementTests(ManifestParseTestCase):
-  """Tests for <superproject>."""
-
-  def test_superproject(self):
-    """Check superproject settings."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <superproject name="superproject"/>
-</manifest>
-""")
-    self.assertEqual(manifest.superproject['name'], 'superproject')
-    self.assertEqual(manifest.superproject['remote'].name, 'test-remote')
-    self.assertEqual(manifest.superproject['remote'].url, 'http://localhost/superproject')
-    self.assertEqual(manifest.superproject['revision'], 'refs/heads/main')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="test-remote"/>'
-        '<default remote="test-remote" revision="refs/heads/main"/>'
-        '<superproject name="superproject"/>'
-        '</manifest>')
-
-  def test_superproject_revision(self):
-    """Check superproject settings with a different revision attribute"""
-    self.maxDiff = None
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/main" />
-  <superproject name="superproject" revision="refs/heads/stable" />
-</manifest>
-""")
-    self.assertEqual(manifest.superproject['name'], 'superproject')
-    self.assertEqual(manifest.superproject['remote'].name, 'test-remote')
-    self.assertEqual(manifest.superproject['remote'].url, 'http://localhost/superproject')
-    self.assertEqual(manifest.superproject['revision'], 'refs/heads/stable')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="test-remote"/>'
-        '<default remote="test-remote" revision="refs/heads/main"/>'
-        '<superproject name="superproject" revision="refs/heads/stable"/>'
-        '</manifest>')
-
-  def test_superproject_revision_default_negative(self):
-    """Check superproject settings with a same revision attribute"""
-    self.maxDiff = None
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" />
-  <default remote="test-remote" revision="refs/heads/stable" />
-  <superproject name="superproject" revision="refs/heads/stable" />
-</manifest>
-""")
-    self.assertEqual(manifest.superproject['name'], 'superproject')
-    self.assertEqual(manifest.superproject['remote'].name, 'test-remote')
-    self.assertEqual(manifest.superproject['remote'].url, 'http://localhost/superproject')
-    self.assertEqual(manifest.superproject['revision'], 'refs/heads/stable')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="test-remote"/>'
-        '<default remote="test-remote" revision="refs/heads/stable"/>'
-        '<superproject name="superproject"/>'
-        '</manifest>')
-
-  def test_superproject_revision_remote(self):
-    """Check superproject settings with a same revision attribute"""
-    self.maxDiff = None
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="test-remote" fetch="http://localhost" revision="refs/heads/main" />
-  <default remote="test-remote" />
-  <superproject name="superproject" revision="refs/heads/stable" />
-</manifest>
-""")
-    self.assertEqual(manifest.superproject['name'], 'superproject')
-    self.assertEqual(manifest.superproject['remote'].name, 'test-remote')
-    self.assertEqual(manifest.superproject['remote'].url, 'http://localhost/superproject')
-    self.assertEqual(manifest.superproject['revision'], 'refs/heads/stable')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="test-remote" revision="refs/heads/main"/>'
-        '<default remote="test-remote"/>'
-        '<superproject name="superproject" revision="refs/heads/stable"/>'
-        '</manifest>')
-
-  def test_remote(self):
-    """Check superproject settings with a remote."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <remote name="superproject-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <superproject name="platform/superproject" remote="superproject-remote"/>
-</manifest>
-""")
-    self.assertEqual(manifest.superproject['name'], 'platform/superproject')
-    self.assertEqual(manifest.superproject['remote'].name, 'superproject-remote')
-    self.assertEqual(manifest.superproject['remote'].url, 'http://localhost/platform/superproject')
-    self.assertEqual(manifest.superproject['revision'], 'refs/heads/main')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="default-remote"/>'
-        '<remote fetch="http://localhost" name="superproject-remote"/>'
-        '<default remote="default-remote" revision="refs/heads/main"/>'
-        '<superproject name="platform/superproject" remote="superproject-remote"/>'
-        '</manifest>')
-
-  def test_defalut_remote(self):
-    """Check superproject settings with a default remote."""
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <superproject name="superproject" remote="default-remote"/>
-</manifest>
-""")
-    self.assertEqual(manifest.superproject['name'], 'superproject')
-    self.assertEqual(manifest.superproject['remote'].name, 'default-remote')
-    self.assertEqual(manifest.superproject['revision'], 'refs/heads/main')
-    self.assertEqual(
-        sort_attributes(manifest.ToXml().toxml()),
-        '<?xml version="1.0" ?><manifest>'
-        '<remote fetch="http://localhost" name="default-remote"/>'
-        '<default remote="default-remote" revision="refs/heads/main"/>'
-        '<superproject name="superproject"/>'
-        '</manifest>')
-
-
-class ContactinfoElementTests(ManifestParseTestCase):
-  """Tests for <contactinfo>."""
-
-  def test_contactinfo(self):
-    """Check contactinfo settings."""
-    bugurl = 'http://localhost/contactinfo'
-    manifest = self.getXmlManifest(f"""
-<manifest>
-  <contactinfo bugurl="{bugurl}"/>
-</manifest>
-""")
-    self.assertEqual(manifest.contactinfo.bugurl, bugurl)
-    self.assertEqual(
-        manifest.ToXml().toxml(),
-        '<?xml version="1.0" ?><manifest>'
-        f'<contactinfo bugurl="{bugurl}"/>'
-        '</manifest>')
-
-
-class DefaultElementTests(ManifestParseTestCase):
-  """Tests for <default>."""
-
-  def test_default(self):
-    """Check default settings."""
-    a = manifest_xml._Default()
-    a.revisionExpr = 'foo'
-    a.remote = manifest_xml._XmlRemote(name='remote')
-    b = manifest_xml._Default()
-    b.revisionExpr = 'bar'
-    self.assertEqual(a, a)
-    self.assertNotEqual(a, b)
-    self.assertNotEqual(b, a.remote)
-    self.assertNotEqual(a, 123)
-    self.assertNotEqual(a, None)
-
-
-class RemoteElementTests(ManifestParseTestCase):
-  """Tests for <remote>."""
-
-  def test_remote(self):
-    """Check remote settings."""
-    a = manifest_xml._XmlRemote(name='foo')
-    a.AddAnnotation('key1', 'value1', 'true')
-    b = manifest_xml._XmlRemote(name='foo')
-    b.AddAnnotation('key2', 'value1', 'true')
-    c = manifest_xml._XmlRemote(name='foo')
-    c.AddAnnotation('key1', 'value2', 'true')
-    d = manifest_xml._XmlRemote(name='foo')
-    d.AddAnnotation('key1', 'value1', 'false')
-    self.assertEqual(a, a)
-    self.assertNotEqual(a, b)
-    self.assertNotEqual(a, c)
-    self.assertNotEqual(a, d)
-    self.assertNotEqual(a, manifest_xml._Default())
-    self.assertNotEqual(a, 123)
-    self.assertNotEqual(a, None)
-
-
-class RemoveProjectElementTests(ManifestParseTestCase):
-  """Tests for <remove-project>."""
-
-  def test_remove_one_project(self):
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="myproject" />
-  <remove-project name="myproject" />
-</manifest>
-""")
-    self.assertEqual(manifest.projects, [])
-
-  def test_remove_one_project_one_remains(self):
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="myproject" />
-  <project name="yourproject" />
-  <remove-project name="myproject" />
-</manifest>
-""")
-
-    self.assertEqual(len(manifest.projects), 1)
-    self.assertEqual(manifest.projects[0].name, 'yourproject')
-
-  def test_remove_one_project_doesnt_exist(self):
-    with self.assertRaises(manifest_xml.ManifestParseError):
-      manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <remove-project name="myproject" />
-</manifest>
-""")
-      manifest.projects
-
-  def test_remove_one_optional_project_doesnt_exist(self):
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <remove-project name="myproject" optional="true" />
-</manifest>
-""")
-    self.assertEqual(manifest.projects, [])
-
-
-class ExtendProjectElementTests(ManifestParseTestCase):
-  """Tests for <extend-project>."""
-
-  def test_extend_project_dest_path_single_match(self):
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="myproject" />
-  <extend-project name="myproject" dest-path="bar" />
-</manifest>
-""")
-    self.assertEqual(len(manifest.projects), 1)
-    self.assertEqual(manifest.projects[0].relpath, 'bar')
-
-  def test_extend_project_dest_path_multi_match(self):
-    with self.assertRaises(manifest_xml.ManifestParseError):
-      manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="myproject" path="x" />
-  <project name="myproject" path="y" />
-  <extend-project name="myproject" dest-path="bar" />
-</manifest>
-""")
-      manifest.projects
-
-  def test_extend_project_dest_path_multi_match_path_specified(self):
-    manifest = self.getXmlManifest("""
-<manifest>
-  <remote name="default-remote" fetch="http://localhost" />
-  <default remote="default-remote" revision="refs/heads/main" />
-  <project name="myproject" path="x" />
-  <project name="myproject" path="y" />
-  <extend-project name="myproject" path="x" dest-path="bar" />
-</manifest>
-""")
-    self.assertEqual(len(manifest.projects), 2)
-    if manifest.projects[0].relpath == 'y':
-      self.assertEqual(manifest.projects[1].relpath, 'bar')
-    else:
-      self.assertEqual(manifest.projects[0].relpath, 'bar')
-      self.assertEqual(manifest.projects[1].relpath, 'y')

tests/test_platform_utils.py

@@ -1,50 +0,0 @@
-# Copyright 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Unittests for the platform_utils.py module."""
-
-import os
-import tempfile
-import unittest
-
-import platform_utils
-
-
-class RemoveTests(unittest.TestCase):
-  """Check remove() helper."""
-
-  def testMissingOk(self):
-    """Check missing_ok handling."""
-    with tempfile.TemporaryDirectory() as tmpdir:
-      path = os.path.join(tmpdir, 'test')
-
-      # Should not fail.
-      platform_utils.remove(path, missing_ok=True)
-
-      # Should fail.
-      self.assertRaises(OSError, platform_utils.remove, path)
-      self.assertRaises(OSError, platform_utils.remove, path, missing_ok=False)
-
-      # Should not fail if it exists.
-      open(path, 'w').close()
-      platform_utils.remove(path, missing_ok=True)
-      self.assertFalse(os.path.exists(path))
-
-      open(path, 'w').close()
-      platform_utils.remove(path)
-      self.assertFalse(os.path.exists(path))
-
-      open(path, 'w').close()
-      platform_utils.remove(path, missing_ok=False)
-      self.assertFalse(os.path.exists(path))

tests/test_project.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +16,16 @@
 
 """Unittests for the project.py module."""
 
+from __future__ import print_function
+
 import contextlib
 import os
-from pathlib import Path
 import shutil
 import subprocess
 import tempfile
 import unittest
 
 import error
-import git_command
 import git_config
 import platform_utils
 import project
@@ -36,19 +38,7 @@ def TempGitTree():
   # Python 2 support entirely.
   try:
     tempdir = tempfile.mkdtemp(prefix='repo-tests')
-
-    # Tests need to assume, that main is default branch at init,
-    # which is not supported in config until 2.28.
-    cmd = ['git', 'init']
-    if git_command.git_require((2, 28, 0)):
-      cmd += ['--initial-branch=main']
-    else:
-      # Use template dir for init.
-      templatedir = tempfile.mkdtemp(prefix='.test-template')
-      with open(os.path.join(templatedir, 'HEAD'), 'w') as fp:
-        fp.write('ref: refs/heads/main\n')
-      cmd += ['--template', templatedir]
-    subprocess.check_call(cmd, cwd=tempdir)
+    subprocess.check_call(['git', 'init'], cwd=tempdir)
     yield tempdir
   finally:
     platform_utils.rmtree(tempdir)
@@ -87,7 +77,7 @@ class ReviewableBranchTests(unittest.TestCase):
 
       # Start off with the normal details.
       rb = project.ReviewableBranch(
-          fakeproj, fakeproj.config.GetBranch('work'), 'main')
+          fakeproj, fakeproj.config.GetBranch('work'), 'master')
       self.assertEqual('work', rb.name)
       self.assertEqual(1, len(rb.commits))
       self.assertIn('Del file', rb.commits[0])
@@ -100,9 +90,9 @@ class ReviewableBranchTests(unittest.TestCase):
       self.assertTrue(rb.date)
 
       # Now delete the tracking branch!
-      fakeproj.work_git.branch('-D', 'main')
+      fakeproj.work_git.branch('-D', 'master')
       rb = project.ReviewableBranch(
-          fakeproj, fakeproj.config.GetBranch('work'), 'main')
+          fakeproj, fakeproj.config.GetBranch('work'), 'master')
       self.assertEqual(0, len(rb.commits))
       self.assertFalse(rb.base_exists)
       # Hard to assert anything useful about this.
@@ -336,76 +326,3 @@ class LinkFile(CopyLinkTestCase):
     platform_utils.symlink(self.tempdir, dest)
     lf._Link()
     self.assertEqual(os.path.join('git-project', 'foo.txt'), os.readlink(dest))
-
-
-class MigrateWorkTreeTests(unittest.TestCase):
-  """Check _MigrateOldWorkTreeGitDir handling."""
-
-  _SYMLINKS = {
-      'config', 'description', 'hooks', 'info', 'logs', 'objects',
-      'packed-refs', 'refs', 'rr-cache', 'shallow', 'svn',
-  }
-  _FILES = {
-      'COMMIT_EDITMSG', 'FETCH_HEAD', 'HEAD', 'index', 'ORIG_HEAD',
-      'unknown-file-should-be-migrated',
-  }
-  _CLEAN_FILES = {
-      'a-vim-temp-file~', '#an-emacs-temp-file#',
-  }
-
-  @classmethod
-  @contextlib.contextmanager
-  def _simple_layout(cls):
-    """Create a simple repo client checkout to test against."""
-    with tempfile.TemporaryDirectory() as tempdir:
-      tempdir = Path(tempdir)
-
-      gitdir = tempdir / '.repo/projects/src/test.git'
-      gitdir.mkdir(parents=True)
-      cmd = ['git', 'init', '--bare', str(gitdir)]
-      subprocess.check_call(cmd)
-
-      dotgit = tempdir / 'src/test/.git'
-      dotgit.mkdir(parents=True)
-      for name in cls._SYMLINKS:
-        (dotgit / name).symlink_to(f'../../../.repo/projects/src/test.git/{name}')
-      for name in cls._FILES | cls._CLEAN_FILES:
-        (dotgit / name).write_text(name)
-
-      yield tempdir
-
-  def test_standard(self):
-    """Migrate a standard checkout that we expect."""
-    with self._simple_layout() as tempdir:
-      dotgit = tempdir / 'src/test/.git'
-      project.Project._MigrateOldWorkTreeGitDir(str(dotgit))
-
-      # Make sure the dir was transformed into a symlink.
-      self.assertTrue(dotgit.is_symlink())
-      self.assertEqual(os.readlink(dotgit), '../../.repo/projects/src/test.git')
-
-      # Make sure files were moved over.
-      gitdir = tempdir / '.repo/projects/src/test.git'
-      for name in self._FILES:
-        self.assertEqual(name, (gitdir / name).read_text())
-      # Make sure files were removed.
-      for name in self._CLEAN_FILES:
-        self.assertFalse((gitdir / name).exists())
-
-  def test_unknown(self):
-    """A checkout with unknown files should abort."""
-    with self._simple_layout() as tempdir:
-      dotgit = tempdir / 'src/test/.git'
-      (tempdir / '.repo/projects/src/test.git/random-file').write_text('one')
-      (dotgit / 'random-file').write_text('two')
-      with self.assertRaises(error.GitError):
-        project.Project._MigrateOldWorkTreeGitDir(str(dotgit))
-
-      # Make sure no content was actually changed.
-      self.assertTrue(dotgit.is_dir())
-      for name in self._FILES:
-        self.assertTrue((dotgit / name).is_file())
-      for name in self._CLEAN_FILES:
-        self.assertTrue((dotgit / name).is_file())
-      for name in self._SYMLINKS:
-        self.assertTrue((dotgit / name).is_symlink())

tests/test_ssh.py

@@ -1,74 +0,0 @@
-# Copyright 2019 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Unittests for the ssh.py module."""
-
-import multiprocessing
-import subprocess
-import unittest
-from unittest import mock
-
-import ssh
-
-
-class SshTests(unittest.TestCase):
-  """Tests the ssh functions."""
-
-  def test_parse_ssh_version(self):
-    """Check _parse_ssh_version() handling."""
-    ver = ssh._parse_ssh_version('Unknown\n')
-    self.assertEqual(ver, ())
-    ver = ssh._parse_ssh_version('OpenSSH_1.0\n')
-    self.assertEqual(ver, (1, 0))
-    ver = ssh._parse_ssh_version('OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.13, OpenSSL 1.0.1f 6 Jan 2014\n')
-    self.assertEqual(ver, (6, 6, 1))
-    ver = ssh._parse_ssh_version('OpenSSH_7.6p1 Ubuntu-4ubuntu0.3, OpenSSL 1.0.2n  7 Dec 2017\n')
-    self.assertEqual(ver, (7, 6))
-
-  def test_version(self):
-    """Check version() handling."""
-    with mock.patch('ssh._run_ssh_version', return_value='OpenSSH_1.2\n'):
-      self.assertEqual(ssh.version(), (1, 2))
-
-  def test_context_manager_empty(self):
-    """Verify context manager with no clients works correctly."""
-    with multiprocessing.Manager() as manager:
-      with ssh.ProxyManager(manager):
-        pass
-
-  def test_context_manager_child_cleanup(self):
-    """Verify orphaned clients & masters get cleaned up."""
-    with multiprocessing.Manager() as manager:
-      with ssh.ProxyManager(manager) as ssh_proxy:
-        client = subprocess.Popen(['sleep', '964853320'])
-        ssh_proxy.add_client(client)
-        master = subprocess.Popen(['sleep', '964853321'])
-        ssh_proxy.add_master(master)
-    # If the process still exists, these will throw timeout errors.
-    client.wait(0)
-    master.wait(0)
-
-  def test_ssh_sock(self):
-    """Check sock() function."""
-    manager = multiprocessing.Manager()
-    proxy = ssh.ProxyManager(manager)
-    with mock.patch('tempfile.mkdtemp', return_value='/tmp/foo'):
-      # old ssh version uses port
-      with mock.patch('ssh.version', return_value=(6, 6)):
-        self.assertTrue(proxy.sock().endswith('%p'))
-
-      proxy._sock_path = None
-      # new ssh version uses hash
-      with mock.patch('ssh.version', return_value=(6, 7)):
-        self.assertTrue(proxy.sock().endswith('%C'))

tests/test_subcmds.py

@@ -14,7 +14,6 @@
 
 """Unittests for the subcmds module (mostly __init__.py than subcommands)."""
 
-import optparse
 import unittest
 
 import subcmds
@@ -42,32 +41,3 @@ class AllCommands(unittest.TestCase):
 
       # Reject internal python paths like "__init__".
       self.assertFalse(cmd.startswith('__'))
-
-  def test_help_desc_style(self):
-    """Force some consistency in option descriptions.
-
-    Python's optparse & argparse has a few default options like --help.  Their
-    option description text uses lowercase sentence fragments, so enforce our
-    options follow the same style so UI is consistent.
-
-    We enforce:
-    * Text starts with lowercase.
-    * Text doesn't end with period.
-    """
-    for name, cls in subcmds.all_commands.items():
-      cmd = cls()
-      parser = cmd.OptionParser
-      for option in parser.option_list:
-        if option.help == optparse.SUPPRESS_HELP:
-          continue
-
-        c = option.help[0]
-        self.assertEqual(
-            c.lower(), c,
-            msg=f'subcmds/{name}.py: {option.get_opt_string()}: help text '
-                f'should start with lowercase: "{option.help}"')
-
-        self.assertNotEqual(
-            option.help[-1], '.',
-            msg=f'subcmds/{name}.py: {option.get_opt_string()}: help text '
-                f'should not end in a period: "{option.help}"')

tests/test_subcmds_init.py

@@ -38,7 +38,7 @@ class InitCommand(unittest.TestCase):
     """Check invalid command line options."""
     ARGV = (
         # Too many arguments.
-        ['url', 'asdf'],
+        ['asdf'],
 
         # Conflicting options.
         ['--mirror', '--archive'],

tests/test_wrapper.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2015 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,22 +16,28 @@
 
 """Unittests for the wrapper.py module."""
 
+from __future__ import print_function
+
 import contextlib
-from io import StringIO
 import os
 import re
 import shutil
-import sys
 import tempfile
 import unittest
-from unittest import mock
 
-import git_command
-import main
 import platform_utils
+from pyversion import is_python3
 import wrapper
 
 
+if is_python3():
+  from unittest import mock
+  from io import StringIO
+else:
+  import mock
+  from StringIO import StringIO
+
+
 @contextlib.contextmanager
 def TemporaryDirectory():
   """Create a new empty git checkout for testing."""
@@ -56,6 +64,9 @@ class RepoWrapperTestCase(unittest.TestCase):
     wrapper._wrapper_module = None
     self.wrapper = wrapper.Wrapper()
 
+    if not is_python3():
+      self.assertRegex = self.assertRegexpMatches
+
 
 class RepoWrapperUnitTest(RepoWrapperTestCase):
   """Tests helper functions in the repo wrapper
@@ -71,16 +82,6 @@ class RepoWrapperUnitTest(RepoWrapperTestCase):
     self.assertEqual('', stderr.getvalue())
     self.assertIn('repo launcher version', stdout.getvalue())
 
-  def test_python_constraints(self):
-    """The launcher should never require newer than main.py."""
-    self.assertGreaterEqual(main.MIN_PYTHON_VERSION_HARD,
-                            wrapper.MIN_PYTHON_VERSION_HARD)
-    self.assertGreaterEqual(main.MIN_PYTHON_VERSION_SOFT,
-                            wrapper.MIN_PYTHON_VERSION_SOFT)
-    # Make sure the versions are themselves in sync.
-    self.assertGreaterEqual(wrapper.MIN_PYTHON_VERSION_SOFT,
-                            wrapper.MIN_PYTHON_VERSION_HARD)
-
   def test_init_parser(self):
     """Make sure 'init' GetParser works."""
     parser = self.wrapper.GetParser(gitc_init=False)
@@ -256,81 +257,6 @@ class CheckGitVersion(RepoWrapperTestCase):
       self.wrapper._CheckGitVersion()
 
 
-class Requirements(RepoWrapperTestCase):
-  """Check Requirements handling."""
-
-  def test_missing_file(self):
-    """Don't crash if the file is missing (old version)."""
-    testdir = os.path.dirname(os.path.realpath(__file__))
-    self.assertIsNone(self.wrapper.Requirements.from_dir(testdir))
-    self.assertIsNone(self.wrapper.Requirements.from_file(
-        os.path.join(testdir, 'xxxxxxxxxxxxxxxxxxxxxxxx')))
-
-  def test_corrupt_data(self):
-    """If the file can't be parsed, don't blow up."""
-    self.assertIsNone(self.wrapper.Requirements.from_file(__file__))
-    self.assertIsNone(self.wrapper.Requirements.from_data(b'x'))
-
-  def test_valid_data(self):
-    """Make sure we can parse the file we ship."""
-    self.assertIsNotNone(self.wrapper.Requirements.from_data(b'{}'))
-    rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-    self.assertIsNotNone(self.wrapper.Requirements.from_dir(rootdir))
-    self.assertIsNotNone(self.wrapper.Requirements.from_file(os.path.join(
-        rootdir, 'requirements.json')))
-
-  def test_format_ver(self):
-    """Check format_ver can format."""
-    self.assertEqual('1.2.3', self.wrapper.Requirements._format_ver((1, 2, 3)))
-    self.assertEqual('1', self.wrapper.Requirements._format_ver([1]))
-
-  def test_assert_all_unknown(self):
-    """Check assert_all works with incompatible file."""
-    reqs = self.wrapper.Requirements({})
-    reqs.assert_all()
-
-  def test_assert_all_new_repo(self):
-    """Check assert_all accepts new enough repo."""
-    reqs = self.wrapper.Requirements({'repo': {'hard': [1, 0]}})
-    reqs.assert_all()
-
-  def test_assert_all_old_repo(self):
-    """Check assert_all rejects old repo."""
-    reqs = self.wrapper.Requirements({'repo': {'hard': [99999, 0]}})
-    with self.assertRaises(SystemExit):
-      reqs.assert_all()
-
-  def test_assert_all_new_python(self):
-    """Check assert_all accepts new enough python."""
-    reqs = self.wrapper.Requirements({'python': {'hard': sys.version_info}})
-    reqs.assert_all()
-
-  def test_assert_all_old_python(self):
-    """Check assert_all rejects old python."""
-    reqs = self.wrapper.Requirements({'python': {'hard': [99999, 0]}})
-    with self.assertRaises(SystemExit):
-      reqs.assert_all()
-
-  def test_assert_ver_unknown(self):
-    """Check assert_ver works with incompatible file."""
-    reqs = self.wrapper.Requirements({})
-    reqs.assert_ver('xxx', (1, 0))
-
-  def test_assert_ver_new(self):
-    """Check assert_ver allows new enough versions."""
-    reqs = self.wrapper.Requirements({'git': {'hard': [1, 0], 'soft': [2, 0]}})
-    reqs.assert_ver('git', (1, 0))
-    reqs.assert_ver('git', (1, 5))
-    reqs.assert_ver('git', (2, 0))
-    reqs.assert_ver('git', (2, 5))
-
-  def test_assert_ver_old(self):
-    """Check assert_ver rejects old versions."""
-    reqs = self.wrapper.Requirements({'git': {'hard': [1, 0], 'soft': [2, 0]}})
-    with self.assertRaises(SystemExit):
-      reqs.assert_ver('git', (0, 5))
-
-
 class NeedSetupGnuPG(RepoWrapperTestCase):
   """Check NeedSetupGnuPG behavior."""
 
@@ -431,19 +357,7 @@ class GitCheckoutTestCase(RepoWrapperTestCase):
 
     remote = os.path.join(cls.GIT_DIR, 'remote')
     os.mkdir(remote)
-
-    # Tests need to assume, that main is default branch at init,
-    # which is not supported in config until 2.28.
-    if git_command.git_require((2, 28, 0)):
-      initstr = '--initial-branch=main'
-    else:
-      # Use template dir for init.
-      templatedir = tempfile.mkdtemp(prefix='.test-template')
-      with open(os.path.join(templatedir, 'HEAD'), 'w') as fp:
-        fp.write('ref: refs/heads/main\n')
-      initstr = '--template=' + templatedir
-
-    run_git('init', initstr, cwd=remote)
+    run_git('init', cwd=remote)
     run_git('commit', '--allow-empty', '-minit', cwd=remote)
     run_git('branch', 'stable', cwd=remote)
     run_git('tag', 'v1.0', cwd=remote)
@@ -488,8 +402,8 @@ class ResolveRepoRev(GitCheckoutTestCase):
     self.assertEqual('refs/heads/stable', rrev)
     self.assertEqual(self.REV_LIST[1], lrev)
 
-    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'main')
-    self.assertEqual('refs/heads/main', rrev)
+    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'master')
+    self.assertEqual('refs/heads/master', rrev)
     self.assertEqual(self.REV_LIST[0], lrev)
 
   def test_tag_name(self):

tox.ini

@@ -15,14 +15,13 @@
 # https://tox.readthedocs.io/
 
 [tox]
-envlist = py36, py37, py38, py39
+envlist = py36, py37, py38
 
 [gh-actions]
 python =
     3.6: py36
     3.7: py37
     3.8: py38
-    3.9: py39
 
 [testenv]
 deps = pytest

wrapper.py

@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+#
 # Copyright (C) 2014 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 try:
   from importlib.machinery import SourceFileLoader
   _loader = lambda *args: SourceFileLoader(*args).load_module()