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>
2025-06-26 20:17:52 +00:00 · 2024-01-04 17:47:22 +00:00
74 changed files with 611 additions and 2123 deletions
--- a/.github/workflows/test-ci.yml
+++ b/.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:
--- a/.gitignore
+++ b/.gitignore
@ -7,7 +7,6 @@ __pycache__
 .repopickle_*
 /repoc
 /.tox
-/.venv

 # PyCharm related
 /.idea/
--- a/README.md
+++ b/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
--- a/SUBMITTING_PATCHES.md
+++ b/SUBMITTING_PATCHES.md
@ -1,3 +1,6 @@
+> **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
@ -10,7 +13,7 @@
 - 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
@ -150,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

--- a/color.py
+++ b/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");
--- a/command.py
+++ b/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");
--- a/docs/internal-fs-layout.md
+++ b/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!

@ -106,7 +109,7 @@ support, see the [manifest-format.md] file.
    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/`.

@ -142,13 +145,11 @@ User controlled settings are initialized when running `repo init`.
 | repo.partialclone | `--partial-clone`         | Create [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 |

 [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

--- a/docs/manifest-format.md
+++ b/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.
@ -29,7 +32,6 @@ following DTD:
                      project*,
                      extend-project*,
                      repo-hooks?,
-                      superproject?,
                      include*)>

  <!ELEMENT notice (#PCDATA)>
@ -99,22 +101,11 @@ following DTD:
  <!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>
-
  <!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.


@ -122,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

@ -158,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
@ -172,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.
@ -263,13 +250,13 @@ 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.
@ -278,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.
@ -375,41 +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.

-### 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.
-
 ### Element include

 This element provides the capability of including another manifest
@ -419,10 +371,6 @@ 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.

-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

--- a/docs/python-support.md
+++ b/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.

--- a/docs/release-process.md
+++ b/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.

@ -97,7 +100,7 @@ If that tag cannot be verified, it gives up and forces the user to resolve.

 ## 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.
@ -112,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.

@ -120,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

@ -144,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
--- a/docs/repo-hooks.md
+++ b/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
--- a/docs/windows.md
+++ b/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.
--- a/editor.py
+++ b/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
--- a/error.py
+++ b/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");
@ -13,10 +15,6 @@
 # limitations under the License.


-# URL to file bug reports for repo tool issues.
-BUG_REPORT_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue'
-
-
 class ManifestParseError(Exception):
  """Failed to parse the manifest file.
  """
--- a/event_log.py
+++ b/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

--- a/git_command.py
+++ b/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,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
@ -395,7 +398,7 @@ class GitCommand(object):
          s_in.remove(s)
          continue
        if not hasattr(buf, 'encode'):
-          buf = buf.decode('utf-8', 'backslashreplace')
+          buf = buf.decode()
        if s.std_name == 'stdout':
          self.stdout += buf
        else:
--- a/git_config.py
+++ b/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,9 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
+
 import contextlib
 import errno
-from http.client import HTTPException
 import json
 import os
 import re
@ -27,12 +30,25 @@ try:
 except ImportError:
  import dummy_threading as _threading
 import time
-import urllib.error
-import urllib.request
+
+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
+if is_python3():
+  from http.client import HTTPException
+else:
+  from httplib import HTTPException

 from git_command import GitCommand
 from git_command import ssh_sock
@ -161,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.

@ -335,6 +345,8 @@ class GitConfig(object):
    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)
--- a/git_refs.py
+++ b/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");
--- a/git_superproject.py
+++ b/git_superproject.py
@ -1,278 +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()
-  project_commit_ids = superproject.UpdateProjectsRevisionId(projects)
-"""
-
-import os
-import sys
-
-from error import BUG_REPORT_URL
-from git_command import GitCommand
-from git_refs import R_HEADS
-import platform_utils
-
-_SUPERPROJECT_GIT_NAME = 'superproject.git'
-_SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml'
-
-
-class Superproject(object):
-  """Get commit ids from superproject.
-
-  It does a 'git clone' of superproject and 'git ls-tree' to get list 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, superproject_dir='exp-superproject'):
-    """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.
-      superproject_dir: Relative path under |repodir| to checkout superproject.
-    """
-    self._project_commit_ids = None
-    self._manifest = manifest
-    self._branch = self._GetBranch()
-    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)
-    self._work_git = os.path.join(self._superproject_path,
-                                  _SUPERPROJECT_GIT_NAME)
-
-  @property
-  def project_commit_ids(self):
-    """Returns a dictionary of projects and their commit ids."""
-    return self._project_commit_ids
-
-  def _GetBranch(self):
-    """Returns the branch name for getting the approved manifest."""
-    p = self._manifest.manifestProject
-    b = p.GetBranch(p.CurrentBranch)
-    if not b:
-      return None
-    branch = b.merge
-    if branch and branch.startswith(R_HEADS):
-      branch = branch[len(R_HEADS):]
-    return branch
-
-  def _Clone(self, url):
-    """Do a 'git clone' for the given url.
-
-    Args:
-      url: superproject's url to be passed to git clone.
-
-    Returns:
-      True if git clone is successful, or False.
-    """
-    if not os.path.exists(self._superproject_path):
-      os.mkdir(self._superproject_path)
-    cmd = ['clone', url, '--filter', 'blob:none', '--bare']
-    if self._branch:
-      cmd += ['--branch', self._branch]
-    p = GitCommand(None,
-                   cmd,
-                   cwd=self._superproject_path,
-                   capture_stdout=True,
-                   capture_stderr=True)
-    retval = p.Wait()
-    if retval:
-      # `git clone` is documented to produce an exit status of `128` if
-      # the requested url or branch are not present in the configuration.
-      print('repo: error: git clone call failed with return code: %r, stderr: %r' %
-            (retval, p.stderr), file=sys.stderr)
-      return False
-    return True
-
-  def _Fetch(self):
-    """Do a 'git fetch' to to fetch the latest content.
-
-    Returns:
-      True if 'git fetch' is successful, or False.
-    """
-    if not os.path.exists(self._work_git):
-      print('git fetch missing drectory: %s' % self._work_git,
-            file=sys.stderr)
-      return False
-    cmd = ['fetch', 'origin', '+refs/heads/*:refs/heads/*', '--prune']
-    p = GitCommand(None,
-                   cmd,
-                   cwd=self._work_git,
-                   capture_stdout=True,
-                   capture_stderr=True)
-    retval = p.Wait()
-    if retval:
-      print('repo: error: git fetch call failed with return code: %r, stderr: %r' %
-            (retval, p.stderr), file=sys.stderr)
-      return False
-    return True
-
-  def _LsTree(self):
-    """Returns the data from 'git ls-tree ...'.
-
-    Works only in git repositories.
-
-    Returns:
-      data: data returned from 'git ls-tree ...' instead of None.
-    """
-    if not os.path.exists(self._work_git):
-      print('git ls-tree missing drectory: %s' % self._work_git,
-            file=sys.stderr)
-      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:
-      # `git clone` is documented to produce an exit status of `128` if
-      # the requested url or branch are not present in the configuration.
-      print('repo: error: git ls-tree call failed with return code: %r, stderr: %r' % (
-          retval, p.stderr), file=sys.stderr)
-    return data
-
-  def Sync(self):
-    """Sync superproject either by git clone/fetch.
-
-    Returns:
-      True if sync of superproject is successful, or False.
-    """
-    print('WARNING: --use-superproject is experimental and not '
-          'for general use', file=sys.stderr)
-
-    if not self._manifest.superproject:
-      print('error: superproject tag is not defined in manifest',
-            file=sys.stderr)
-      return False
-
-    url = self._manifest.superproject['remote'].url
-    if not url:
-      print('error: superproject URL is not defined in manifest',
-            file=sys.stderr)
-      return False
-
-    do_clone = True
-    if os.path.exists(self._superproject_path):
-      if not self._Fetch():
-        # If fetch fails due to a corrupted git directory, then do a git clone.
-        platform_utils.rmtree(self._superproject_path)
-      else:
-        do_clone = False
-    if do_clone:
-      if not self._Clone(url):
-        print('error: git clone failed for url: %s' % url, file=sys.stderr)
-        return False
-    return True
-
-  def _GetAllProjectsCommitIds(self):
-    """Get commit ids for all projects from superproject and save them in _project_commit_ids.
-
-    Returns:
-      A dictionary with the projects/commit ids on success, otherwise None.
-    """
-    if not self.Sync():
-      return None
-
-    data = self._LsTree()
-    if not data:
-      print('error: git ls-tree failed for superproject', file=sys.stderr)
-      return None
-
-    # 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 commit_ids
-
-  def _WriteManfiestFile(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):
-      print('error: missing superproject directory %s' %
-            self._superproject_path,
-            file=sys.stderr)
-      return None
-    manifest_str = self._manifest.ToXml().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:
-      print('error: cannot write manifest to %s:\n%s'
-            % (manifest_path, e),
-            file=sys.stderr)
-      return None
-    return manifest_path
-
-  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:
-      manifest_path: Path name of the overriding manfiest file instead of None.
-    """
-    commit_ids = self._GetAllProjectsCommitIds()
-    if not commit_ids:
-      print('error: Cannot get project commit ids from manifest', file=sys.stderr)
-      return None
-
-    projects_missing_commit_ids = []
-    for project in projects:
-      path = project.relpath
-      if not path:
-        continue
-      commit_id = commit_ids.get(path)
-      if commit_id:
-        project.SetRevisionId(commit_id)
-      else:
-        projects_missing_commit_ids.append(path)
-    if projects_missing_commit_ids:
-      print('error: please file a bug using %s to report missing commit_ids for: %s' %
-            (BUG_REPORT_URL, projects_missing_commit_ids), file=sys.stderr)
-      return None
-
-    manifest_path = self._WriteManfiestFile()
-    return manifest_path
--- a/git_trace2_event_log.py
+++ b/git_trace2_event_log.py
@ -1,211 +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 _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
--- a/gitc_utils.py
+++ b/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,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 platform
 import re
@ -42,8 +45,7 @@ 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.
@ -71,8 +73,7 @@ def _manifest_groups(manifest):
  This is the same logic used by Command.GetProjects(), which is used during
  repo sync

-  Args:
-    manifest: The XmlManifest object
+  @param manifest: The XmlManifest object
  """
  mp = manifest.manifestProject
  groups = mp.config.GetString('manifest.groups')
@ -84,10 +85,9 @@ def _manifest_groups(manifest):
 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 '
@ -149,15 +149,12 @@ 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:
+    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.
--- a/hooks.py
+++ b/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)
--- a/main.py
+++ b/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
@ -40,7 +50,6 @@ import event_log
 from repo_trace import SetTrace
 from git_command import user_agent
 from git_config import init_ssh, close_ssh, RepoConfig
-from git_trace2_event_log import EventLog
 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, 5)
+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; '
@ -119,8 +129,6 @@ global_options.add_option('--version',
 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):
@ -202,17 +210,15 @@ class _Repo(object):
            file=sys.stderr)
      return 1

-    git_trace2_event_log = EventLog()
    cmd.repodir = self.repodir
-    cmd.client = RepoClient(cmd.repodir)
-    cmd.manifest = cmd.client.manifest
+    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 = GitcClient(cmd.repodir, gitc_client_name)
-      cmd.client.isGitcClient = True
+      cmd.gitc_manifest = GitcManifest(cmd.repodir, gitc_client_name)
+      cmd.manifest.isGitcClient = True

-    Editor.globalConfig = cmd.client.globalConfig
+    Editor.globalConfig = cmd.manifest.globalConfig

    if not isinstance(cmd, MirrorSafeCommand) and cmd.manifest.IsMirror:
      print("fatal: '%s' requires a working directory" % name,
@ -240,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:
@ -253,8 +259,6 @@ 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()
-
    try:
      cmd.ValidateOptions(copts, cargs)
      result = cmd.Execute(copts, cargs)
@ -297,13 +301,10 @@ class _Repo(object):

      cmd.event_log.FinishEvent(cmd_event, finish,
                                result is None or result == 0)
-      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


--- a/manifest_xml.py
+++ b/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,12 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
 import itertools
 import os
 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
@ -176,24 +187,12 @@ class _XmlRemote(object):
 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',
@ -281,21 +280,18 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
    if r.revision is not None:
      e.setAttribute('revision', r.revision)

-  def _ParseList(self, field):
-    """Parse fields that contain flattened lists.
+  def _ParseGroups(self, groups):
+    return [x for x in re.split(r'[,\s]+', groups) if x]

-    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')
@ -403,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)
@ -465,70 +459,6 @@ 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)
-      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',
-    }
-    # 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):
@ -560,11 +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 notice(self):
    self._Load()
@ -612,7 +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._notice = None
    self.branch = None
    self._manifest_server = None
@ -629,11 +553,20 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
      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)
+              local = os.path.join(local_dir, local_file)
              nodes.append(self._ParseManifestXml(local, self.repodir))
        except OSError:
          pass
@ -652,7 +585,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md

      self._loaded = True

-  def _ParseManifestXml(self, path, include_root, parent_groups=''):
+  def _ParseManifestXml(self, path, include_root):
    try:
      root = xml.dom.minidom.parse(path)
    except (OSError, xml.parsers.expat.ExpatError) as e:
@ -671,17 +604,12 @@ 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')
-        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 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):
@ -690,11 +618,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
          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

@ -769,7 +692,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
        path = node.getAttribute('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:
@ -791,7 +714,7 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
      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._ParseList(self._reqatt(node, 'enabled-list'))
+        enabled_repo_hooks = self._reqatt(node, 'enabled-list').split()

        # Only one project can be the hooks project
        if self._repo_hooks_project is not None:
@ -815,23 +738,6 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md

        # Store the enabled hooks in the Project object.
        self._repo_hooks_project.enabled_repo_hooks = enabled_repo_hooks
-      if node.nodeName == 'superproject':
-        name = self._reqatt(node, 'name')
-        # There can only be one superproject.
-        if self._superproject.get('name'):
-          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)
      if node.nodeName == 'remove-project':
        name = self._reqatt(node, 'name')

@ -1021,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 = \
@ -1298,7 +1204,15 @@ 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."""
@ -1309,38 +1223,3 @@ class GitcManifest(XmlManifest):
    """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(RepoClient, self).__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(GitcManifest, self).__init__(
-        repodir, os.path.join(self.gitc_client_dir, '.manifest'))
-    self.isGitcClient = True
--- a/pager.py
+++ b/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
--- a/platform_utils.py
+++ b/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,10 +17,16 @@
 import errno
 import os
 import platform
-from queue import Queue
 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


--- a/platform_utils_win32.py
+++ b/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)
--- a/progress.py
+++ b/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");
--- a/project.py
+++ b/project.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 errno
 import filecmp
 import glob
@ -25,7 +28,6 @@ import sys
 import tarfile
 import tempfile
 import time
-import urllib.parse

 from color import Coloring
 from git_command import GitCommand, git_require
@ -40,6 +42,16 @@ from repo_trace import IsTrace, Trace

 from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M, R_WORKTREE_M

+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
+

 # Maximum sleep time allowed during retries.
 MAXIMUM_RETRY_SLEEP_SEC = 3600.0
@ -50,8 +62,7 @@ RETRY_JITTER_PERCENT = 0.1
 def _lwrite(path, content):
  lock = '%s.lock' % path

-  # Maintain Unix line endings on all OS's to match git behavior.
-  with open(lock, 'w', newline='\n') as fd:
+  with open(lock, 'w') as fd:
    fd.write(content)

  try:
@ -438,7 +449,6 @@ class RemoteSpec(object):
    self.orig_name = orig_name
    self.fetchUrl = fetchUrl

-
 class Project(object):
  # These objects can be shared between several working trees.
  shareable_files = ['description', 'info']
@ -500,7 +510,7 @@ class Project(object):
                     with exponential backoff and jitter.
      old_revision: saved git commit id for open GITC projects.
    """
-    self.client = self.manifest = manifest
+    self.manifest = manifest
    self.name = name
    self.remote = remote
    self.gitdir = gitdir.replace('\\', '/')
@ -541,7 +551,7 @@ class Project(object):
    self.linkfiles = []
    self.annotations = []
    self.config = GitConfig.ForRepository(gitdir=self.gitdir,
-                                          defaults=self.client.globalConfig)
+                                          defaults=self.manifest.globalConfig)

    if self.worktree:
      self.work_git = self._GitGetByExec(self, bare=False, gitdir=gitdir)
@ -1016,11 +1026,10 @@ class Project(object):
    if GitCommand(self, cmd, bare=True).Wait() != 0:
      raise UploadError('Upload failed')

-    if not dryrun:
-      msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
-      self.bare_git.UpdateRef(R_PUB + branch.name,
-                              R_HEADS + branch.name,
-                              message=msg)
+    msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
+    self.bare_git.UpdateRef(R_PUB + branch.name,
+                            R_HEADS + branch.name,
+                            message=msg)

 # Sync ##
  def _ExtractArchive(self, tarpath, path=None):
@ -1159,7 +1168,7 @@ class Project(object):
    self._InitHooks()

  def _CopyAndLinkFiles(self):
-    if self.client.isGitcClient:
+    if self.manifest.isGitcClient:
      return
    for copyfile in self.copyfiles:
      copyfile._Copy()
@ -1198,9 +1207,6 @@ class Project(object):
      raise ManifestInvalidRevisionError('revision %s in %s not found' %
                                         (self.revisionExpr, self.name))

-  def SetRevisionId(self, revisionId):
-    self.revisionId = revisionId
-
  def Sync_LocalHalf(self, syncbuf, force_sync=False, submodules=False):
    """Perform only the local IO portion of the sync process.
       Network access is not required.
@ -1928,8 +1934,7 @@ class Project(object):
    try:
      # if revision (sha or tag) is not present then following function
      # throws an error.
-      self.bare_git.rev_list('-1', '--missing=allow-any',
-                             '%s^0' % self.revisionExpr, '--')
+      self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr)
      return True
    except GitError:
      # There is no such persistent revision. We have to fetch it.
@ -2472,7 +2477,10 @@ class Project(object):
            self.config.SetString(key, m.GetString(key))
        self.config.SetString('filter.lfs.smudge', 'git-lfs smudge --skip -- %f')
        self.config.SetString('filter.lfs.process', 'git-lfs filter-process --skip')
-        self.config.SetBoolean('core.bare', True if self.manifest.IsMirror else None)
+        if self.manifest.IsMirror:
+          self.config.SetString('core.bare', 'true')
+        else:
+          self.config.SetString('core.bare', None)
    except Exception:
      if init_obj_dir and os.path.exists(self.objdir):
        platform_utils.rmtree(self.objdir)
@ -2548,8 +2556,6 @@ class Project(object):

        base = R_WORKTREE_M
        active_git = self.work_git
-
-        self._InitAnyMRef(HEAD, self.bare_git, detach=True)
      else:
        base = R_M
        active_git = self.bare_git
@ -2559,7 +2565,7 @@ class Project(object):
  def _InitMirrorHead(self):
    self._InitAnyMRef(HEAD, self.bare_git)

-  def _InitAnyMRef(self, ref, active_git, detach=False):
+  def _InitAnyMRef(self, ref, active_git):
    cur = self.bare_ref.symref(ref)

    if self.revisionId:
@ -2572,10 +2578,7 @@ class Project(object):
      dst = remote.ToLocal(self.revisionExpr)
      if cur != dst:
        msg = 'manifest set to %s' % self.revisionExpr
-        if detach:
-          active_git.UpdateRef(ref, dst, message=msg, detach=True)
-        else:
-          active_git.symbolic_ref('-m', msg, ref, dst)
+        active_git.symbolic_ref('-m', msg, ref, dst)

  def _CheckDirReference(self, srcdir, destdir, share_refs):
    # Git worktrees don't use symlinks to share at all.
@ -2698,14 +2701,12 @@ class Project(object):
    # Some platforms (e.g. Windows) won't let us update dotgit in situ because
    # of file permissions.  Delete it and recreate it from scratch to avoid.
    platform_utils.remove(dotgit)
-    # Use relative path from checkout->worktree & maintain Unix line endings
-    # on all OS's to match git behavior.
-    with open(dotgit, 'w', newline='\n') as fp:
+    # Use relative path from checkout->worktree.
+    with open(dotgit, 'w') as fp:
      print('gitdir:', os.path.relpath(git_worktree_path, self.worktree),
            file=fp)
-    # Use relative path from worktree->checkout & maintain Unix line endings
-    # on all OS's to match git behavior.
-    with open(os.path.join(git_worktree_path, 'gitdir'), 'w', newline='\n') as fp:
+    # Use relative path from worktree->checkout.
+    with open(os.path.join(git_worktree_path, 'gitdir'), 'w') as fp:
      print(os.path.relpath(dotgit, git_worktree_path), file=fp)

    self._InitMRef()
--- a/pyversion.py
+++ b/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
--- a/release/README.md
+++ b/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.
--- a/145
+++ b/145
@ -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)

@ -147,7 +133,7 @@ if not REPO_REV:
  REPO_REV = 'stable'

 # increment this whenever we make important changes to this script
-VERSION = (2, 12)
+VERSION = (2, 8)

 # increment this if the MAINTAINER_KEYS block is modified
 KEYRING_VERSION = (2, 3)
@ -246,7 +232,6 @@ GITC_FS_ROOT_DIR = '/gitc/manifest-rw/'

 import collections
 import errno
-import json
 import optparse
 import re
 import shutil
@ -324,11 +309,6 @@ def GetParser(gitc_init=False):
                        'each project. See git archive.')
  group.add_option('--submodules', action='store_true',
                   help='sync any submodules associated with the manifest repo')
-  group.add_option('--use-superproject', action='store_true', default=None,
-                   help='use the manifest superproject to sync projects')
-  group.add_option('--no-use-superproject', action='store_false',
-                   dest='use_superproject',
-                   help='disable use of manifest superprojects')
  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]',
@ -338,8 +318,7 @@ def GetParser(gitc_init=False):
                        '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)')
@ -460,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
@ -1042,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():
@ -1283,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,
--- a/repo_trace.py
+++ b/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

--- a/requirements.json
+++ b/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.5 is in Debian Stretch.
-  "python": {
-    "hard": [3, 5],
-    "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]
-  }
-}
--- a/36
+++ b/36
@ -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,28 +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."""
-  # 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(f'{__file__}: unable to find pytest.', file=sys.stderr)
-  print(f'{__file__}: Try installing: sudo apt-get install python-pytest',
-        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):
@ -49,8 +48,7 @@ def main(argv):
    pythonpath += os.pathsep + oldpythonpath
  os.environ['PYTHONPATH'] = pythonpath

-  pytest = find_pytest()
-  return subprocess.run([pytest] + argv, check=True)
+  return run_pytest('pytest', argv)


 if __name__ == '__main__':
--- a/setup.py
+++ b/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

@ -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'],
 )
--- a/subcmds/init.py
+++ b/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");
--- a/subcmds/abandon.py
+++ b/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,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
+
 from collections import defaultdict
 import sys

--- a/subcmds/branches.py
+++ b/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,20 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import itertools
-import multiprocessing
+from __future__ import print_function
 import sys
 from color import Coloring
 from command import Command

-# 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
-

 class BranchColoring(Coloring):
  def __init__(self, config):
@ -104,32 +97,20 @@ is shown, then the branch appears in all projects.

 """

-  def _Options(self, p):
-    """Add flags to CLI parser for this subcommand."""
-    default_jobs = min(multiprocessing.cpu_count(), 8)
-    p.add_option(
-        '-j',
-        '--jobs',
-        type=int,
-        default=default_jobs,
-        help='Number of worker processes to spawn '
-        '(default: %s)' % default_jobs)
-
  def Execute(self, opt, args):
    projects = self.GetProjects(args)
    out = BranchColoring(self.manifest.manifestProject.config)
    all_branches = {}
    project_cnt = len(projects)
-    with multiprocessing.Pool(processes=opt.jobs) as pool:
-      project_branches = pool.imap_unordered(
-          expand_project_to_branches, projects, chunksize=WORKER_BATCH_SIZE)

-      for name, b in itertools.chain.from_iterable(project_branches):
+    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)

-    names = sorted(all_branches)
+    names = list(sorted(all_branches))

    if not names:
      print('   (no branches)', file=sys.stderr)
@ -199,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
--- a/subcmds/checkout.py
+++ b/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,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 command import Command
 from progress import Progress
--- a/subcmds/cherry_pick.py
+++ b/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
--- a/subcmds/diff.py
+++ b/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");
--- a/subcmds/diffmanifests.py
+++ b/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):
@ -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)
--- a/subcmds/download.py
+++ b/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,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

--- a/subcmds/forall.py
+++ b/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,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
 import errno
 import multiprocessing
 import re
--- a/subcmds/gitc_delete.py
+++ b/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,11 +14,16 @@
 # 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
--- a/subcmds/gitc_init.py
+++ b/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

--- a/subcmds/grep.py
+++ b/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,6 +14,8 @@
 # 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
--- a/subcmds/help.py
+++ b/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,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 formatter import AbstractFormatter, DumbWriter
@ -62,7 +65,7 @@ Displays detailed usage information about a command.
    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
@ -124,7 +127,7 @@ Displays detailed usage information about a command.
          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')
--- a/subcmds/info.py
+++ b/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");
@ -42,7 +44,7 @@ class Info(PagedCommand):
                 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')
--- a/subcmds/init.py
+++ b/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,12 +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
@ -25,7 +37,6 @@ 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 git_superproject
 import platform_utils
 from wrapper import Wrapper

@ -135,11 +146,6 @@ to update the working directory files.
    g.add_option('--submodules',
                 dest='submodules', action='store_true',
                 help='sync any submodules associated with the manifest repo')
-    g.add_option('--use-superproject', action='store_true',
-                 help='use the manifest superproject to sync projects')
-    g.add_option('--no-use-superproject', action='store_false',
-                 dest='use_superproject',
-                 help='disable use of manifest superprojects')
    g.add_option('-g', '--groups',
                 dest='groups', default='default',
                 help='restrict manifest projects to ones with specified '
@ -182,14 +188,6 @@ to update the working directory files.
    return {'REPO_MANIFEST_URL': 'manifest_url',
            'REPO_MIRROR_LOCATION': 'reference'}

-  def _CloneSuperproject(self):
-    """Clone the superproject based on the superproject's url and branch."""
-    superproject = git_superproject.Superproject(self.manifest,
-                                                 self.repodir)
-    if not superproject.Sync():
-      print('error: git update of superproject failed', file=sys.stderr)
-      sys.exit(1)
-
  def _SyncManifest(self, opt):
    m = self.manifest.manifestProject
    is_new = not m.Exists
@ -264,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:
@ -275,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)
@ -292,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)
@ -305,7 +303,7 @@ to update the working directory files.
        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)
    else:
@ -314,13 +312,10 @@ to update the working directory files.
    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.use_superproject is not None:
-      m.config.SetBoolean('repo.superproject', opt.use_superproject)
+      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,
@ -370,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.
@ -419,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

@ -526,7 +521,7 @@ to update the working directory files.
          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:
@ -536,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()
-
    if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror:
      if opt.config_name or self._ShouldConfigureUser(opt):
        self._ConfigureUser(opt)
--- a/subcmds/list.py
+++ b/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,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
+
 from command import Command, MirrorSafeCommand


--- a/subcmds/manifest.py
+++ b/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

@ -66,10 +68,6 @@ to indicate the remote ref to push changes to via 'repo upload'.
                 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('-o', '--output-file',
                 dest='output_file',
                 default='-',
@ -85,26 +83,10 @@ to indicate the remote ref to push changes to via 'repo upload'.
      fd = sys.stdout
    else:
      fd = open(opt.output_file, 'w')
-    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)
--- a/subcmds/overview.py
+++ b/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,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
 from color import Coloring
 from command import PagedCommand

--- a/subcmds/prune.py
+++ b/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,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
 from color import Coloring
 from command import PagedCommand

--- a/subcmds/rebase.py
+++ b/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
--- a/subcmds/selfupdate.py
+++ b/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

--- a/subcmds/smartsync.py
+++ b/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");
--- a/subcmds/stage.py
+++ b/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
--- a/subcmds/start.py
+++ b/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,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

--- a/subcmds/status.py
+++ b/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,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
+
 import functools
 import glob
 import multiprocessing
@ -161,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:
--- a/subcmds/sync.py
+++ b/subcmds/sync.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,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import http.cookiejar as cookielib
+from __future__ import print_function
+
 import json
 import netrc
 from optparse import SUPPRESS_HELP
@ -23,10 +26,26 @@ import subprocess
 import sys
 import tempfile
 import time
-import urllib.error
-import urllib.parse
-import urllib.request
-import xmlrpc.client
+
+from pyversion import is_python3
+if is_python3():
+  import http.cookiejar as cookielib
+  import urllib.error
+  import urllib.parse
+  import urllib.request
+  import xmlrpc.client
+else:
+  import cookielib
+  import imp
+  import urllib2
+  import urlparse
+  import xmlrpclib
+  urllib = imp.new_module('urllib')
+  urllib.error = urllib2
+  urllib.parse = urlparse
+  urllib.request = urllib2
+  xmlrpc = imp.new_module('xmlrpc')
+  xmlrpc.client = xmlrpclib

 try:
  import threading as _threading
@ -51,7 +70,6 @@ import event_log
 from git_command import GIT, git_require
 from git_config import GetUrlCookieFile
 from git_refs import R_HEADS, HEAD
-import git_superproject
 import gitc_utils
 from project import Project
 from project import RemoteSpec
@ -242,8 +260,6 @@ later is required to fix a server side protocol bug.
    p.add_option('--fetch-submodules',
                 dest='fetch_submodules', action='store_true',
                 help='fetch submodules from server')
-    p.add_option('--use-superproject', action='store_true',
-                 help='use the manifest superproject to sync projects')
    p.add_option('--no-tags',
                 dest='tags', default=True, action='store_false',
                 help="don't fetch tags")
@ -271,42 +287,6 @@ later is required to fix a server side protocol bug.
                 dest='repo_upgraded', action='store_true',
                 help=SUPPRESS_HELP)

-  def _GetBranch(self):
-    """Returns the branch name for getting the approved manifest."""
-    p = self.manifest.manifestProject
-    b = p.GetBranch(p.CurrentBranch)
-    branch = b.merge
-    if branch.startswith(R_HEADS):
-      branch = branch[len(R_HEADS):]
-    return branch
-
-  def _UpdateProjectsRevisionId(self, opt, args):
-    """Update revisionId of every project with the SHA from superproject.
-
-    This function updates each project's revisionId with SHA from superproject.
-    It writes the updated manifest into a file and reloads the manifest from it.
-
-    Args:
-      opt: Program options returned from optparse.  See _Options().
-      args: Arguments to pass to GetProjects. See the GetProjects
-          docstring for details.
-
-    Returns:
-      Returns path to the overriding manifest file.
-    """
-    superproject = git_superproject.Superproject(self.manifest,
-                                                 self.repodir)
-    all_projects = self.GetProjects(args,
-                                    missing_ok=True,
-                                    submodules_ok=opt.fetch_submodules)
-    manifest_path = superproject.UpdateProjectsRevisionId(all_projects)
-    if not manifest_path:
-      print('error: Update of revsionId from superproject has failed',
-            file=sys.stderr)
-      sys.exit(1)
-    self._ReloadManifest(manifest_path)
-    return manifest_path
-
  def _FetchProjectList(self, opt, projects, sem, *args, **kwargs):
    """Main function of the fetch threads.

@ -597,9 +577,8 @@ later is required to fix a server side protocol bug.
      # Make sure pruning never kicks in with shared projects.
      if (not project.use_git_worktrees and
              len(project.manifest.GetProjectsWithName(project.name)) > 1):
-        if not opt.quiet:
-          print('%s: Shared project %s found, disabling pruning.' %
-                (project.relpath, project.name))
+        print('%s: Shared project %s found, disabling pruning.' %
+              (project.relpath, project.name))
        if git_require((2, 7, 0)):
          project.EnableRepositoryExtension('preciousObjects')
        else:
@ -664,7 +643,7 @@ later is required to fix a server side protocol bug.
      if project.relpath:
        new_project_paths.append(project.relpath)
    file_name = 'project.list'
-    file_path = os.path.join(self.repodir, file_name)
+    file_path = os.path.join(self.manifest.repodir, file_name)
    old_project_paths = []

    if os.path.exists(file_path):
@ -748,7 +727,11 @@ later is required to fix a server side protocol bug.
    try:
      server = xmlrpc.client.Server(manifest_server, transport=transport)
      if opt.smart_sync:
-        branch = self._GetBranch()
+        p = self.manifest.manifestProject
+        b = p.GetBranch(p.CurrentBranch)
+        branch = b.merge
+        if branch.startswith(R_HEADS):
+          branch = branch[len(R_HEADS):]

        if 'SYNC_TARGET' in os.environ:
          target = os.environ['SYNC_TARGET']
@ -797,7 +780,6 @@ later is required to fix a server side protocol bug.
      start = time.time()
      success = mp.Sync_NetworkHalf(quiet=opt.quiet, verbose=opt.verbose,
                                    current_branch_only=opt.current_branch_only,
-                                    force_sync=opt.force_sync,
                                    tags=opt.tags,
                                    optimized_fetch=opt.optimized_fetch,
                                    retry_fetches=opt.retry_fetches,
@ -891,9 +873,6 @@ later is required to fix a server side protocol bug.
    else:
      self._UpdateManifestProject(opt, mp, manifest_name)

-    if opt.use_superproject:
-      manifest_name = self._UpdateProjectsRevisionId(opt, args)
-
    if self.gitc_manifest:
      gitc_manifest_projects = self.GetProjects(args,
                                                missing_ok=True)
--- a/subcmds/upload.py
+++ b/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,17 +14,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
 import copy
 import re
 import sys

 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

@ -197,7 +205,33 @@ Gerrit Code Review:  https://www.gerritcodereview.com/
    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')
+
+    # 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
@ -520,10 +554,10 @@ Gerrit Code Review:  https://www.gerritcodereview.com/
          avail = [up_branch]
        else:
          avail = None
-          print('repo: error: Unable to upload branch "%s". '
-                'You might be able to fix the branch by running:\n'
-                '  git branch --set-upstream-to m/%s' %
-                (str(cbr), self.manifest.branch),
+          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)
      else:
        avail = project.GetUploadableBranches(branch)
@ -538,15 +572,31 @@ Gerrit Code Review:  https://www.gerritcodereview.com/
              (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)
+
+      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)
--- a/subcmds/version.py
+++ b/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,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from __future__ import print_function
+
 import platform
 import sys

@ -33,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:
--- a/tests/test_editor.py
+++ b/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
--- a/tests/test_git_command.py
+++ b/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

--- a/tests/test_git_config.py
+++ b/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,69 +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'))
-
-
 if __name__ == '__main__':
  unittest.main()
--- a/tests/test_git_superproject.py
+++ b/tests/test_git_superproject.py
@ -1,177 +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 os
-import tempfile
-import unittest
-from unittest import mock
-
-import git_superproject
-import manifest_xml
-import platform_utils
-
-
-class SuperprojectTestCase(unittest.TestCase):
-  """TestCase for the Superproject module."""
-
-  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)
-
-    # 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" />
-</manifest>
-""")
-    self._superproject = git_superproject.Superproject(manifest, self.repodir)
-
-  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 test_superproject_get_superproject_no_superproject(self):
-    """Test with no url."""
-    manifest = self.getXmlManifest("""
-<manifest>
-</manifest>
-""")
-    superproject = git_superproject.Superproject(manifest, self.repodir)
-    self.assertFalse(superproject.Sync())
-
-  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.assertFalse(superproject.Sync())
-
-  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>
-""")
-    superproject = git_superproject.Superproject(manifest, self.repodir)
-    with mock.patch.object(self._superproject, '_GetBranch', return_value='junk'):
-      self.assertFalse(superproject.Sync())
-
-  def test_superproject_get_superproject_mock_clone(self):
-    """Test with _Clone failing."""
-    with mock.patch.object(self._superproject, '_Clone', return_value=False):
-      self.assertFalse(self._superproject.Sync())
-
-  def test_superproject_get_superproject_mock_fetch(self):
-    """Test with _Fetch failing and _clone being called."""
-    with mock.patch.object(self._superproject, '_Clone', return_value=True):
-      os.mkdir(self._superproject._superproject_path)
-      with mock.patch.object(self._superproject, '_Fetch', return_value=False):
-        self.assertTrue(self._superproject.Sync())
-
-  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, '_Clone', return_value=True):
-      with mock.patch.object(self._superproject, '_LsTree', return_value=data):
-        commit_ids = self._superproject._GetAllProjectsCommitIds()
-        self.assertEqual(commit_ids, {
-            'art': '2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea',
-            'bootable/recovery': 'e9d25da64d8d365dbba7c8ee00fe8c4473fe9a06',
-            'build/bazel': 'ade9b7a0d874e25fff4bf2552488825c6f111928'
-        })
-
-  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._WriteManfiestFile()
-    self.assertIsNotNone(manifest_path)
-    with open(manifest_path, 'r') as fp:
-      manifest_xml = fp.read()
-    self.assertEqual(
-        manifest_xml,
-        '<?xml version="1.0" ?><manifest>' +
-        '<remote name="default-remote" fetch="http://localhost"/>' +
-        '<default remote="default-remote" revision="refs/heads/main"/>' +
-        '<project name="platform/art" path="art" revision="ABCDEF"/>' +
-        '<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, '_Clone', 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)
-          manifest_path = self._superproject.UpdateProjectsRevisionId(projects)
-          self.assertIsNotNone(manifest_path)
-          with open(manifest_path, 'r') as fp:
-            manifest_xml = fp.read()
-          self.assertEqual(
-              manifest_xml,
-              '<?xml version="1.0" ?><manifest>' +
-              '<remote name="default-remote" fetch="http://localhost"/>' +
-              '<default remote="default-remote" revision="refs/heads/main"/>' +
-              '<project name="platform/art" path="art" ' +
-              'revision="2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea"/>' +
-              '<superproject name="superproject"/>' +
-              '</manifest>')
-
-
-if __name__ == '__main__':
-  unittest.main()
--- a/tests/test_git_trace2_event_log.py
+++ b/tests/test_git_trace2_event_log.py
@ -1,188 +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, 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 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_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()
--- a/tests/test_hooks.py
+++ b/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'
    )
--- a/tests/test_manifest_xml.py
+++ b/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,9 +16,9 @@

 """Unittests for the manifest_xml.py module."""

+from __future__ import print_function
+
 import os
-import shutil
-import tempfile
 import unittest
 import xml.dom.minidom

@ -144,248 +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(unittest.TestCase):
-  """Check manifest processing."""
-
-  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)
-
-  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_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.ToXml().toxml(),
-        '<?xml version="1.0" ?><manifest>' +
-        '<remote name="test-remote" fetch="http://localhost"/>' +
-        '<default remote="test-remote" revision="refs/heads/main"/>' +
-        '<superproject name="superproject"/>' +
-        '</manifest>')
-
-  def test_superproject_with_remote(self):
-    """Check superproject settings."""
-    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.ToXml().toxml(),
-        '<?xml version="1.0" ?><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>')
-
-  def test_superproject_with_defalut_remote(self):
-    """Check superproject settings."""
-    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.ToXml().toxml(),
-        '<?xml version="1.0" ?><manifest>' +
-        '<remote name="default-remote" fetch="http://localhost"/>' +
-        '<default remote="default-remote" revision="refs/heads/main"/>' +
-        '<superproject name="superproject"/>' +
-        '</manifest>')
-
-  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(
-        manifest.ToXml().toxml(),
-        '<?xml version="1.0" ?><manifest>' +
-        '<remote name="test-remote" fetch="http://localhost"/>' +
-        '<default remote="test-remote" revision="refs/heads/main"/>' +
-        '<superproject name="superproject"/>' +
-        '</manifest>')
-
-  def test_project_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'])
-
-  def test_project_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(
-        manifest.ToXml().toxml(),
-        '<?xml version="1.0" ?><manifest>' +
-        '<remote name="default-remote" fetch="http://localhost"/>' +
-        '<default remote="default-remote" revision="refs/heads/main"/>' +
-        '<project name="test-name" revision="ABCDEF"/>' +
-        '</manifest>')
-
-  def test_include_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)
--- a/tests/test_project.py
+++ b/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,6 +16,8 @@

 """Unittests for the project.py module."""

+from __future__ import print_function
+
 import contextlib
 import os
 import shutil
@ -22,7 +26,6 @@ import tempfile
 import unittest

 import error
-import git_command
 import git_config
 import platform_utils
 import project
@ -35,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)
@ -86,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])
@ -99,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.
--- a/tests/test_wrapper.py
+++ b/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_repo(self):
-    """Check assert_all rejects old repo."""
-    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):
--- a/wrapper.py
+++ b/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()