launcher: fix version to latest

We've already released 2.7, and the next tag is 2.8, so this should be pulled up to 2.8 so it'll stay in sync. Change-Id: Id47bdbdb8050b29ea36442ac2149dd948648237f Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/268572 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: David Pursehouse <dpursehouse@digital.ai>
launcher: bump version for cli changes
2025-06-26 20:17:52 +00:00 · 2020-05-21 22:46:11 +00:00 · 2020-05-21 21:04:42 +00:00 · 2020-05-21 19:47:36 +00:00 · 2020-05-19 15:25:42 +00:00 · 2020-05-12 16:15:01 +00:00
85 changed files with 9320 additions and 2693 deletions
--- a/.flake8
+++ b/.flake8
@ -0,0 +1,15 @@
 [flake8]
 max-line-length=100
 ignore=
    # E111: Indentation is not a multiple of four
    E111,
    # E114: Indentation is not a multiple of four (comment)
    E114,
    # E402: Module level import not at top of file
    E402,
    # E731: do not assign a lambda expression, use a def
    E731,
    # W503: Line break before binary operator
    W503,
    # W504: Line break after binary operator
    W504
--- a/.gitattributes
+++ b/.gitattributes
@ -1,4 +1,4 @@
 # Prevent /bin/sh scripts from being clobbered by autocrlf=true
 git_ssh text eol=lf
 main.py text eol=lf
 repo text eol=lf
 hooks/* text eol=lf
--- a/.github/workflows/test-ci.yml
+++ b/.github/workflows/test-ci.yml
@ -0,0 +1,34 @@
 # GitHub actions workflow.
 # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions
 name: Test CI
 on:
  push:
    branches: [master, repo-1, stable, maint]
    tags: [v*]
 jobs:
  test:
    strategy:
      fail-fast: false
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
        python-version: [2.7, 3.6, 3.7, 3.8]
        exclude:
          - os: windows-latest
            python-version: 2.7
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v2
    - name: Set up Python ${{ matrix.python-version }}
      uses: actions/setup-python@v1
      with:
        python-version: ${{ matrix.python-version }}
    - name: Install dependencies
      run: |
        python -m pip install --upgrade pip
        pip install tox tox-gh-actions
    - name: Test with tox
      run: tox
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,12 @@
 *.asc
 *.egg-info/
 *.log
 *.pyc
 __pycache__
 /dist
 .repopickle_*
 /repoc
 /.tox
 # PyCharm related
 /.idea/
--- a/.mailmap
+++ b/.mailmap
@ -0,0 +1,13 @@
 Anthony Newnam <anthony.newnam@garmin.com>    Anthony <anthony@bnovc.com>
 He Ping <tdihp@hotmail.com>                   heping <tdihp@hotmail.com>
 Hu Xiuyun <xiuyun.hu@hisilicon.com>           Hu xiuyun <xiuyun.hu@hisilicon.com>
 Hu Xiuyun <xiuyun.hu@hisilicon.com>           Hu Xiuyun <clouds08@qq.com>
 Jelly Chen <chenguodong@huawei.com>           chenguodong <chenguodong@huawei.com>
 Jia Bi <bijia@xiaomi.com>                     bijia <bijia@xiaomi.com>
 Jiri Tyr <jiri.tyr@gmail.com>                 Jiri tyr <jiri.tyr@gmail.com>
 JoonCheol Park <jooncheol@gmail.com>          Jooncheol Park <jooncheol@gmail.com>
 Sergii Pylypenko <x.pelya.x@gmail.com>        pelya <x.pelya.x@gmail.com>
 Shawn Pearce <sop@google.com>                 Shawn O. Pearce <sop@google.com>
 Ulrik Sjölin <ulrik.sjolin@sonyericsson.com>  Ulrik Sjolin <ulrik.sjolin@gmail.com>
 Ulrik Sjölin <ulrik.sjolin@sonyericsson.com>  Ulrik Sjolin <ulrik.sjolin@sonyericsson.com>
 Ulrik Sjölin <ulrik.sjolin@sonyericsson.com>  Ulrik Sjölin <ulrik.sjolin@sonyericsson.com>
--- a/.pydevproject
+++ b/.pydevproject
@ -5,6 +5,6 @@
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/git-repo</path>
 </pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 </pydev_project>
--- a/.pylintrc
+++ b/.pylintrc
@ -1,298 +0,0 @@
 # lint Python modules using external checkers.
 #
 # This is the main checker controling the other ones and the reports
 # generation. It is itself both a raw checker and an astng checker in order
 # to:
 # * handle message activation / deactivation at the module level
 # * handle some basic but necessary stats'data (number of classes, methods...)
 #
 [MASTER]
 # Specify a configuration file.
 #rcfile=
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().
 #init-hook=
 # Profiled execution.
 profile=no
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
 ignore=SVN
 # Pickle collected data for later comparisons.
 persistent=yes
 # Set the cache size for astng objects.
 cache-size=500
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
 load-plugins=
 [MESSAGES CONTROL]
 # Enable only checker(s) with the given id(s). This option conflicts with the
 # disable-checker option
 #enable-checker=
 # Enable all checker(s) except those with the given id(s). This option
 # conflicts with the enable-checker option
 #disable-checker=
 # Enable all messages in the listed categories.
 #enable-msg-cat=
 # Disable all messages in the listed categories.
 #disable-msg-cat=
 # Enable the message(s) with the given id(s).
 enable=RP0004
 # Disable the message(s) with the given id(s).
 disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801,F0401,E0611,R0801,I0011
 [REPORTS]
 # set the output format. Available formats are text, parseable, colorized, msvs
 # (visual studio) and html
 output-format=text
 # Put messages in a separate file for each module / package specified on the
 # command line instead of printing them on stdout. Reports (if any) will be
 # written in a file name "pylint_global.[txt|html]".
 files-output=no
 # Tells whether to display a full report or only the messages
 reports=yes
 # Python expression which should return a note less than 10 (10 is the highest
 # note).You have access to the variables errors warning, statement which
 # respectivly contain the number of errors / warnings messages and the total
 # number of statements analyzed. This is used by the global evaluation report
 # (R0004).
 evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
 # Add a comment according to your evaluation note. This is used by the global
 # evaluation report (R0004).
 comment=no
 # checks for
 # * unused variables / imports
 # * undefined variables
 # * redefinition of variable from builtins or from an outer scope
 # * use of variable before assigment
 #
 [VARIABLES]
 # Tells whether we should check for unused import in __init__ files.
 init-import=no
 # A regular expression matching names used for dummy variables (i.e. not used).
 dummy-variables-rgx=_|dummy
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.
 additional-builtins=
 # try to find bugs in the code using type inference
 #
 [TYPECHECK]
 # Tells whether missing members accessed in mixin class should be ignored. A
 # mixin class is detected if its name ends with "mixin" (case insensitive).
 ignore-mixin-members=yes
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamicaly set).
 ignored-classes=SQLObject
 # When zope mode is activated, consider the acquired-members option to ignore
 # access to some undefined attributes.
 zope=no
 # List of members which are usually get through zope's acquisition mecanism and
 # so shouldn't trigger E0201 when accessed (need zope=yes to be considered).
 acquired-members=REQUEST,acl_users,aq_parent
 # checks for :
 # * doc strings
 # * modules / classes / functions / methods / arguments / variables name
 # * number of arguments, local variables, branchs, returns and statements in
 # functions, methods
 # * required module attributes
 # * dangerous default values as arguments
 # * redefinition of function / method / class
 # * uses of the global statement
 #
 [BASIC]
 # Required attributes for module, separated by a comma
 required-attributes=
 # Regular expression which should only match functions or classes name which do
 # not require a docstring
 no-docstring-rgx=_main|__.*__
 # Regular expression which should only match correct module names
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 # Regular expression which should only match correct module level names
 const-rgx=(([A-Z_][A-Z1-9_]*)|(__.*__))|(log)$
 # Regular expression which should only match correct class names
 class-rgx=[A-Z_][a-zA-Z0-9]+$
 # Regular expression which should only match correct function names
 function-rgx=[a-z_][a-z0-9_]{2,30}$
 # Regular expression which should only match correct method names
 method-rgx=[a-z_][a-z0-9_]{2,30}$
 # Regular expression which should only match correct instance attribute names
 attr-rgx=[a-z_][a-z0-9_]{2,30}$
 # Regular expression which should only match correct argument names
 argument-rgx=[a-z_][a-z0-9_]{2,30}$
 # Regular expression which should only match correct variable names
 variable-rgx=[a-z_][a-z0-9_]{2,30}$
 # Regular expression which should only match correct list comprehension /
 # generator expression variable names
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 # Good variable names which should always be accepted, separated by a comma
 good-names=i,j,k,ex,Run,_,e,d1,d2,v,f,l,d
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata
 # List of builtins function names that should not be used, separated by a comma
 bad-functions=map,filter,apply,input
 # checks for sign of poor/misdesign:
 # * number of methods, attributes, local variables...
 # * size, complexity of functions, methods
 #
 [DESIGN]
 # Maximum number of arguments for function / method
 max-args=5
 # Maximum number of locals for function / method body
 max-locals=15
 # Maximum number of return / yield for function / method body
 max-returns=6
 # Maximum number of branch for function / method body
 max-branchs=12
 # Maximum number of statements in function / method body
 max-statements=50
 # Maximum number of parents for a class (see R0901).
 max-parents=7
 # Maximum number of attributes for a class (see R0902).
 max-attributes=20
 # Minimum number of public methods for a class (see R0903).
 min-public-methods=2
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=30
 # checks for
 # * external modules dependencies
 # * relative / wildcard imports
 # * cyclic imports
 # * uses of deprecated modules
 #
 [IMPORTS]
 # Deprecated modules which should not be used, separated by a comma
 deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
 # Create a graph of every (i.e. internal and external) dependencies in the
 # given file (report R0402 must not be disabled)
 import-graph=
 # Create a graph of external dependencies in the given file (report R0402 must
 # not be disabled)
 ext-import-graph=
 # Create a graph of internal dependencies in the given file (report R0402 must
 # not be disabled)
 int-import-graph=
 # checks for :
 # * methods without self as first argument
 # * overridden methods signature
 # * access only to existant members via self
 # * attributes not defined in the __init__ method
 # * supported interfaces implementation
 # * unreachable code
 #
 [CLASSES]
 # List of interface methods to ignore, separated by a comma. This is used for
 # instance to not check methods defines in Zope's Interface base class.
 ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
 # List of method names used to declare (i.e. assign) instance attributes.
 defining-attr-methods=__init__,__new__,setUp
 # checks for similarities and duplicated code. This computation may be
 # memory / CPU intensive, so you should disable it if you experiments some
 # problems.
 #
 [SIMILARITIES]
 # Minimum lines number of a similarity.
 min-similarity-lines=4
 # Ignore comments when computing similarities.
 ignore-comments=yes
 # Ignore docstrings when computing similarities.
 ignore-docstrings=yes
 # checks for:
 # * warning notes in the code like FIXME, XXX
 # * PEP 263: source code with non ascii character but no encoding declaration
 #
 [MISCELLANEOUS]
 # List of note tags to take in consideration, separated by a comma.
 notes=FIXME,XXX,TODO
 # checks for :
 # * unauthorized constructions
 # * strict indentation
 # * line length
 # * use of <> instead of !=
 #
 [FORMAT]
 # Maximum number of characters on a single line.
 max-line-length=80
 # Maximum number of lines in a module
 max-module-lines=1000
 # String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
 # tab).  In repo it is 2 spaces.
 indent-string='  '
--- a/0
+++ b/0
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -0,0 +1,6 @@
 graft docs hooks tests
 include *.py
 include LICENSE
 include git_ssh
 include repo
 include run_tests
--- a/README.md
+++ b/README.md
@ -0,0 +1,55 @@
 # repo
 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
 easier to work with Git.  The repo command is an executable Python script
 that you can put anywhere in your path.
 * Homepage: <https://gerrit.googlesource.com/git-repo/>
 * Mailing list: [repo-discuss on Google Groups][repo-discuss]
 * Bug reports: <https://bugs.chromium.org/p/gerrit/issues/list?q=component:repo>
 * Source: <https://gerrit.googlesource.com/git-repo/>
 * Overview: <https://source.android.com/source/developing.html>
 * Docs: <https://source.android.com/source/using-repo.html>
 * [repo Manifest Format](./docs/manifest-format.md)
 * [repo Hooks](./docs/repo-hooks.md)
 * [Submitting patches](./SUBMITTING_PATCHES.md)
 * Running Repo in [Microsoft Windows](./docs/windows.md)
 * GitHub mirror: <https://github.com/GerritCodeReview/git-repo>
 * Postsubmit tests: <https://github.com/GerritCodeReview/git-repo/actions>
 ## Contact
 Please use the [repo-discuss] mailing list or [issue tracker] for questions.
 You can [file a new bug report][new-bug] under the "repo" component.
 Please do not e-mail individual developers for support.
 They do not have the bandwidth for it, and often times questions have already
 been asked on [repo-discuss] or bugs posted to the [issue tracker].
 So please search those sites first.
 ## Install
 Many distros include repo, so you might be able to install from there.
 ```sh
 # Debian/Ubuntu.
 $ sudo apt-get install repo
 # Gentoo.
 $ sudo emerge dev-vcs/repo
 ```
 You can install it manually as well as it's a single script.
 ```sh
 $ mkdir -p ~/.bin
 $ PATH="${HOME}/.bin:${PATH}"
 $ curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
 $ chmod a+rx ~/.bin/repo
 ```
 [new-bug]: https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue
 [issue tracker]: https://bugs.chromium.org/p/gerrit/issues/list?q=component:repo
 [repo-discuss]: https://groups.google.com/forum/#!forum/repo-discuss
--- a/87
+++ b/87
@ -1,87 +0,0 @@
 Short Version:
 - Make small logical changes.
 - Provide a meaningful commit message.
 - Check for coding errors with pylint
 - Make sure all code is under the Apache License, 2.0.
 - Publish your changes for review:
   git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/master
 Long Version:
 I wanted a file describing how to submit patches for repo,
 so I started with the one found in the core Git distribution
 (Documentation/SubmittingPatches), which itself was based on the
 patch submission guidelines for the Linux kernel.
 However there are some differences, so please review and familiarize
 yourself with the following relevant bits:
 (1) Make separate commits for logically separate changes.
 Unless your patch is really trivial, you should not be sending
 out a patch that was generated between your working tree and your
 commit head.  Instead, always make a commit with complete commit
 message and generate a series of patches from your repository.
 It is a good discipline.
 Describe the technical detail of the change(s).
 If your description starts to get too long, that's a sign that you
 probably need to split up your commit to finer grained pieces.
 (2) Check for coding errors with pylint
 Run pylint on changed modules using the provided configuration:
  pylint --rcfile=.pylintrc file.py
 (3) Check the license
 repo is licensed under the Apache License, 2.0.
 Because of this licensing model *every* file within the project
 *must* list the license that covers it in the header of the file.
 Any new contributions to an existing file *must* be submitted under
 the current license of that file.  Any new files *must* clearly
 indicate which license they are provided under in the file header.
 Please verify that you are legally allowed and willing to submit your
 changes under the license covering each file *prior* to submitting
 your patch.  It is virtually impossible to remove a patch once it
 has been applied and pushed out.
 (4) Sending your patches.
 Do not email your patches to anyone.
 Instead, login to the Gerrit Code Review tool at:
  https://gerrit-review.googlesource.com/
 Ensure you have completed one of the necessary contributor
 agreements, providing documentation to the project maintainers that
 they have right to redistribute your work under the Apache License:
  https://gerrit-review.googlesource.com/#/settings/agreements
 Ensure you have obtained an HTTP password to authenticate:
  https://gerrit-review.googlesource.com/new-password
 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/master
   git push review
 You will be automatically emailed a copy of your commits, and any
 comments made by the project maintainers.
--- a/SUBMITTING_PATCHES.md
+++ b/SUBMITTING_PATCHES.md
@ -0,0 +1,173 @@
 [TOC]
 # Short Version
 - Make small logical changes.
 - Provide a meaningful commit message.
 - Check for coding errors and style nits with flake8.
 - Make sure all code is under the Apache License, 2.0.
 - Publish your changes for review.
 - Make corrections if requested.
 - Verify your changes on gerrit so they can be submitted.
   `git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/master`
 # Long Version
 I wanted a file describing how to submit patches for repo,
 so I started with the one found in the core Git distribution
 (Documentation/SubmittingPatches), which itself was based on the
 patch submission guidelines for the Linux kernel.
 However there are some differences, so please review and familiarize
 yourself with the following relevant bits.
 ## Make separate commits for logically separate changes.
 Unless your patch is really trivial, you should not be sending
 out a patch that was generated between your working tree and your
 commit head.  Instead, always make a commit with complete commit
 message and generate a series of patches from your repository.
 It is a good discipline.
 Describe the technical detail of the change(s).
 If your description starts to get too long, that's a sign that you
 probably need to split up your commit to finer grained pieces.
 ## Check for coding errors and style violations with flake8
 Run `flake8` on changed modules:
    flake8 file.py
 Note that repo generally follows [Google's Python Style Guide] rather than
 [PEP 8], with a couple of notable exceptions:
 * Indentation is at 2 columns rather than 4
 * The maximum line length is 100 columns rather than 80
 There should be no new errors or warnings introduced.
 Warnings that cannot be avoided without going against the Google Style Guide
 may be suppressed inline individally using a `# noqa` comment as described
 in the [flake8 documentation].
 If there are many occurrences of the same warning, these may be suppressed for
 the entire project in the included `.flake8` file.
 [Google's Python Style Guide]: https://google.github.io/styleguide/pyguide.html
 [PEP 8]: https://www.python.org/dev/peps/pep-0008/
 [flake8 documentation]: https://flake8.pycqa.org/en/3.1.1/user/ignoring-errors.html#in-line-ignoring-errors
 ## Running tests
 We use [pytest](https://pytest.org/) and [tox](https://tox.readthedocs.io/) for
 running tests.  You should make sure to install those first.
 To run the full suite against all supported Python versions, simply execute:
 ```sh
 $ tox -p auto
 ```
 We have [`./run_tests`](./run_tests) which is a simple wrapper around `pytest`:
 ```sh
 # Run the full suite against the default Python version.
 $ ./run_tests
 # List each test as it runs.
 $ ./run_tests -v
 # Run a specific unittest module (and all tests in it).
 $ ./run_tests tests/test_git_command.py
 # Run a specific testsuite in a specific unittest module.
 $ ./run_tests tests/test_editor.py::EditString
 # Run a single test.
 $ ./run_tests tests/test_editor.py::EditString::test_cat_editor
 # List all available tests.
 $ ./run_tests --collect-only
 # Run a single test using substring match.
 $ ./run_tests -k test_cat_editor
 ```
 The coverage isn't great currently, but it should still be run for all commits.
 Adding more unittests for changes you make would be greatly appreciated :).
 Check out the [tests/](./tests/) subdirectory for more details.
 ## Check the license
 repo is licensed under the Apache License, 2.0.
 Because of this licensing model *every* file within the project
 *must* list the license that covers it in the header of the file.
 Any new contributions to an existing file *must* be submitted under
 the current license of that file.  Any new files *must* clearly
 indicate which license they are provided under in the file header.
 Please verify that you are legally allowed and willing to submit your
 changes under the license covering each file *prior* to submitting
 your patch.  It is virtually impossible to remove a patch once it
 has been applied and pushed out.
 ## Sending your patches.
 Do not email your patches to anyone.
 Instead, login to the Gerrit Code Review tool at:
  https://gerrit-review.googlesource.com/
 Ensure you have completed one of the necessary contributor
 agreements, providing documentation to the project maintainers that
 they have right to redistribute your work under the Apache License:
  https://gerrit-review.googlesource.com/#/settings/agreements
 Ensure you have obtained an HTTP password to authenticate:
  https://gerrit-review.googlesource.com/new-password
 Ensure that you have the local commit hook installed to automatically
 add a ChangeId to your commits:
    curl -Lo `git rev-parse --git-dir`/hooks/commit-msg https://gerrit-review.googlesource.com/tools/hooks/commit-msg
    chmod +x `git rev-parse --git-dir`/hooks/commit-msg
 If you have already committed your changes you will need to amend the commit
 to get the ChangeId added.
    git commit --amend
 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/master
    git push review
 You will be automatically emailed a copy of your commits, and any
 comments made by the project maintainers.
 ## Make changes if requested
 The project maintainer who reviews your changes might request changes to your
 commit. If you make the requested changes you will need to amend your commit
 and push it to the review server again.
 ## Verify your changes on gerrit
 After you receive a Code-Review+2 from the maintainer, select the Verified
 button on the gerrit page for the change. This verifies that you have tested
 your changes and notifies the maintainer that they are ready to be submitted.
 The maintainer will then submit your changes to the repository.
--- a/color.py
+++ b/color.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -83,6 +84,7 @@ def _Color(fg=None, bg=None, attr=None):
    code = ''
  return code
 DEFAULT = None
--- a/command.py
+++ b/command.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -19,6 +20,7 @@ import platform
 import re
 import sys
 from event_log import EventLog
 from error import NoSuchProjectError
 from error import InvalidProjectGroupsError
@ -28,10 +30,11 @@ class Command(object):
  """
  common = False
  event_log = EventLog()
  manifest = None
  _optparse = None
-  def WantPager(self, opt):
+  def WantPager(self, _opt):
    return False
  def ReadEnvironmentOptions(self, opts):
@ -63,7 +66,8 @@ class Command(object):
        usage = self.helpUsage.strip().replace('%prog', me)
      except AttributeError:
        usage = 'repo %s' % self.NAME
-      self._optparse = optparse.OptionParser(usage = usage)
+      epilog = 'Run `repo help %s` to view the detailed manual.' % self.NAME
      self._optparse = optparse.OptionParser(usage=usage, epilog=epilog)
      self._Options(self._optparse)
    return self._optparse
@ -95,6 +99,16 @@ class Command(object):
    self.OptionParser.print_usage()
    sys.exit(1)
  def ValidateOptions(self, opt, args):
    """Validate the user options & arguments before executing.
    This is meant to help break the code up into logical steps.  Some tips:
    * Use self.OptionParser.error to display CLI related errors.
    * Adjust opt member defaults as makes sense.
    * Adjust the args list, but do so inplace so the caller sees updates.
    * Try to avoid updating self state.  Leave that to Execute.
    """
  def Execute(self, opt, args):
    """Perform the action, after option parsing is complete.
    """
@ -106,19 +120,24 @@ class Command(object):
  def _UpdatePathToProjectMap(self, project):
    self._by_path[project.worktree] = project
-  def _GetProjectByPath(self, path):
+  def _GetProjectByPath(self, manifest, path):
    project = None
    if os.path.exists(path):
      oldpath = None
-      while path \
+      while (path and
-        and path != oldpath \
+             path != oldpath and
-        and path != self.manifest.topdir:
+             path != manifest.topdir):
        try:
          project = self._by_path[path]
          break
        except KeyError:
          oldpath = path
          path = os.path.dirname(path)
      if not project and path == manifest.topdir:
        try:
          project = self._by_path[path]
        except KeyError:
          pass
    else:
      try:
        project = self._by_path[path]
@ -126,15 +145,19 @@ class Command(object):
        pass
    return project
-  def GetProjects(self, args, missing_ok=False, submodules_ok=False):
+  def GetProjects(self, args, manifest=None, groups='', missing_ok=False,
                  submodules_ok=False):
    """A list of projects that match the arguments.
    """
-    all_projects_list = self.manifest.projects
+    if not manifest:
      manifest = self.manifest
    all_projects_list = manifest.projects
    result = []
-    mp = self.manifest.manifestProject
+    mp = manifest.manifestProject
-    groups = mp.config.GetString('manifest.groups')
+    if not groups:
      groups = mp.config.GetString('manifest.groups')
    if not groups:
      groups = 'default,platform-' + platform.system().lower()
    groups = [x for x in re.split(r'[,\s]+', groups) if x]
@ -147,29 +170,31 @@ class Command(object):
                                  for p in project.GetDerivedSubprojects())
      all_projects_list.extend(derived_projects.values())
      for project in all_projects_list:
-        if ((missing_ok or project.Exists) and
+        if (missing_ok or project.Exists) and project.MatchesGroups(groups):
            project.MatchesGroups(groups)):
          result.append(project)
    else:
      self._ResetPathToProjectMap(all_projects_list)
      for arg in args:
-        projects = self.manifest.GetProjectsWithName(arg)
+        # We have to filter by manifest groups in case the requested project is
        # checked out multiple times or differently based on them.
        projects = [project for project in manifest.GetProjectsWithName(arg)
                    if project.MatchesGroups(groups)]
        if not projects:
          path = os.path.abspath(arg).replace('\\', '/')
-          project = self._GetProjectByPath(path)
+          project = self._GetProjectByPath(manifest, path)
          # If it's not a derived project, update path->project mapping and
          # search again, as arg might actually point to a derived subproject.
-          if (project and not project.Derived and
+          if (project and not project.Derived and (submodules_ok or
-              (submodules_ok or project.sync_s)):
+                                                   project.sync_s)):
            search_again = False
            for subproject in project.GetDerivedSubprojects():
              self._UpdatePathToProjectMap(subproject)
              search_again = True
            if search_again:
-              project = self._GetProjectByPath(path) or project
+              project = self._GetProjectByPath(manifest, path) or project
          if project:
            projects = [project]
@ -179,7 +204,7 @@ class Command(object):
        for project in projects:
          if not missing_ok and not project.Exists:
-            raise NoSuchProjectError(arg)
+            raise NoSuchProjectError('%s (%s)' % (arg, project.relpath))
          if not project.MatchesGroups(groups):
            raise InvalidProjectGroupsError(arg)
@ -190,39 +215,55 @@ class Command(object):
    result.sort(key=_getpath)
    return result
-  def FindProjects(self, args):
+  def FindProjects(self, args, inverse=False):
    result = []
    patterns = [re.compile(r'%s' % a, re.IGNORECASE) for a in args]
    for project in self.GetProjects(''):
      for pattern in patterns:
-        if pattern.search(project.name) or pattern.search(project.relpath):
+        match = pattern.search(project.name) or pattern.search(project.relpath)
        if not inverse and match:
          result.append(project)
          break
        if inverse and match:
          break
      else:
        if inverse:
          result.append(project)
    result.sort(key=lambda project: project.relpath)
    return result
-# pylint: disable=W0223
+
 # Pylint warns that the `InteractiveCommand` and `PagedCommand` classes do not
 # override method `Execute` which is abstract in `Command`.  Since that method
 # is always implemented in classes derived from `InteractiveCommand` and
 # `PagedCommand`, this warning can be suppressed.
 class InteractiveCommand(Command):
  """Command which requires user interaction on the tty and
     must not run within a pager, even if the user asks to.
  """
-  def WantPager(self, opt):
+
  def WantPager(self, _opt):
    return False
 class PagedCommand(Command):
  """Command which defaults to output in a pager, as its
     display tends to be larger than one screen full.
  """
-  def WantPager(self, opt):
+
  def WantPager(self, _opt):
    return True
 # pylint: enable=W0223
 class MirrorSafeCommand(object):
  """Command permits itself to run within a mirror,
     and does not require a working directory.
  """
 class GitcAvailableCommand(object):
  """Command that requires GITC to be available, but does
     not require the local client to be a GITC client.
  """
 class GitcClientCommand(object):
  """Command that requires the local client to be a GITC
     client.
  """
--- a/docs/internal-fs-layout.md
+++ b/docs/internal-fs-layout.md
@ -0,0 +1,232 @@
 # Repo internal filesystem layout
 A reference to the `.repo/` tree in repo client checkouts.
 Hopefully it's complete & up-to-date, but who knows!
 *** note
 **Warning**:
 This is meant for developers of the repo project itself as a quick reference.
 **Nothing** in here must be construed as ABI, or that repo itself will never
 change its internals in backwards incompatible ways.
 ***
 [TOC]
 ## .repo/ layout
 All content under `.repo/` is managed by `repo` itself with few exceptions.
 In general, you should not make manual changes in here.
 If a setting was initialized using an option to `repo init`, you should use that
 command to change the setting later on.
 It is always safe to re-run `repo init` in existing repo client checkouts.
 For example, if you want to change the manifest branch, you can simply run
 `repo init --manifest-branch=<new name>` and repo will take care of the rest.
 *   `config`: Per-repo client checkout settings using [git-config] file format.
 *   `.repo_config.json`: JSON cache of the `config` file for repo to
    read/process quickly.
 ### repo/ state
 *   `repo/`: A git checkout of the repo project.  This is how `repo` re-execs
    itself to get the latest released version.
    It tracks the git repository at `REPO_URL` using the `REPO_REV` branch.
    Those are specified at `repo init` time using the `--repo-url=<REPO_URL>`
    and `--repo-rev=<REPO_REV>` options.
    Any changes made to this directory will usually be automatically discarded
    by repo itself when it checks for updates.  If you want to update to the
    latest version of repo, use `repo selfupdate` instead.  If you want to
    change the git URL/branch that this tracks, re-run `repo init` with the new
    settings.
 *   `.repo_fetchtimes.json`: Used by `repo sync` to record stats when syncing
    the various projects.
 ### Manifests
 For more documentation on the manifest format, including the local_manifests
 support, see the [manifest-format.md] file.
 *   `manifests/`: A git checkout of the manifest project.  Its `.git/` state
    points to the `manifest.git` bare checkout (see below).  It tracks the git
    branch specified at `repo init` time via `--manifest-branch`.
    The local branch name is always `default` regardless of the remote tracking
    branch.  Do not get confused if the remote branch is not `default`, or if
    there is a remote `default` that is completely different!
    No manual changes should be made in here as it will just confuse repo and
    it won't automatically recover causing no new changes to be picked up.
 *   `manifests.git/`: A bare checkout of the manifest project.  It tracks the
    git repository specified at `repo init` time via `--manifest-url`.
    No manual changes should be made in here as it will just confuse repo.
    If you want to switch the tracking settings, re-run `repo init` with the
    new settings.
 *   `manifest.xml`: The manifest that repo uses.  It is generated at `repo init`
    and uses the `--manifest-name` to determine what manifest file to load next
    out of `manifests/`.
    Do not try to modify this to load other manifests as it will confuse repo.
    If you want to switch manifest files, re-run `repo init` with the new
    setting.
    Older versions of repo managed this with symlinks.
 *   `manifest.xml -> manifests/<manifest-name>.xml`: A symlink to the manifest
    that the user wishes to sync.  It is specified at `repo init` time via
    `--manifest-name`.
 *   `manifests.git/.repo_config.json`: JSON cache of the `manifests.git/config`
    file for repo to read/process quickly.
 *   `local_manifest.xml` (*Deprecated*): User-authored tweaks to the manifest
    used to sync.  See [local manifests] for more details.
 *   `local_manifests/`: Directory of user-authored manifest fragments to tweak
    the manifest used to sync.  See [local manifests] for more details.
 ### Project objects
 *   `project.list`: Tracking file used by `repo sync` to determine when projects
    are added or removed and need corresponding updates in the checkout.
 *   `projects/`: Bare checkouts of every project synced by the manifest.  The
    filesystem layout matches the `<project path=...` setting in the manifest
    (i.e. where it's checked out in the repo client source tree).  Those
    checkouts will symlink their `.git/` state to paths under here.
    Some git state is further split out under `project-objects/`.
 *   `project-objects/`: Git objects that are safe to share across multiple
    git checkouts.  The filesystem layout matches the `<project name=...`
    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-master`, `foo/bar-release`, etc...
    There will be multiple trees under `projects/` for each one, but only one
    under `project-objects/`.
    This layout is designed to allow people to sync against different remotes
    (e.g. a local mirror & a public review server) while avoiding duplicating
    the content.  However, this can run into problems if different remotes use
    the same path on their respective servers.  Best to avoid that.
 *   `subprojects/`: Like `projects/`, but for git submodules.
 *   `subproject-objects/`: Like `project-objects/`, but for git submodules.
 *   `worktrees/`: Bare checkouts of every project synced by the manifest.  The
    filesystem layout matches the `<project name=...` setting in the manifest
    (i.e. the path on the remote server) with a `.git` suffix.  This has the
    same advantages as the `project-objects/` layout above.
    This is used when git worktrees are enabled.
 ### Global settings
 The `.repo/manifests.git/config` file is used to track settings for the entire
 repo client checkout.
 Most settings use the `[repo]` section to avoid conflicts with git.
 User controlled settings are initialized when running `repo init`.
 | Setting           | `repo init` Option        | Use/Meaning |
 |-------------------|---------------------------|-------------|
 | manifest.groups   | `--groups` & `--platform` | The manifest groups to sync |
 | repo.archive      | `--archive`               | Use `git archive` for checkouts |
 | repo.clonebundle  | `--clone-bundle`          | Whether the initial sync used clone.bundle explicitly |
 | repo.clonefilter  | `--clone-filter`          | Filter setting when using [partial git clones] |
 | repo.depth        | `--depth`                 | Create shallow checkouts when cloning |
 | repo.dissociate   | `--dissociate`            | Dissociate from any reference/mirrors after initial clone |
 | repo.mirror       | `--mirror`                | Checkout is a repo mirror |
 | repo.partialclone | `--partial-clone`         | Create [partial git clones] |
 | repo.reference    | `--reference`             | Reference repo client checkout |
 | repo.submodules   | `--submodules`            | Sync git submodules |
 | repo.worktree     | `--worktree`              | Use `git worktree` for checkouts |
 | user.email        | `--config-name`           | User's e-mail address; Copied into `.git/config` when checking out a new project |
 | user.name         | `--config-name`           | User's name; Copied into `.git/config` when checking out a new project |
 [partial git clones]: https://git-scm.com/docs/gitrepository-layout#_code_partialclone_code
 ### Repo hooks settings
 For more details on this feature, see the [repo-hooks docs](./repo-hooks.md).
 We'll just discuss the internal configuration settings.
 These are stored in the registered `<repo-hooks>` project itself, so if the
 manifest switches to a different project, the settings will not be copied.
 | Setting                              | Use/Meaning |
 |--------------------------------------|-------------|
 | repo.hooks.\<hook\>.approvedmanifest | User approval for secure manifest sources (e.g. https://) |
 | repo.hooks.\<hook\>.approvedhash     | User approval for insecure manifest sources (e.g. http://) |
 For example, if our manifest had the following entries, we would store settings
 under `.repo/projects/src/repohooks.git/config` (which would be reachable via
 `git --git-dir=src/repohooks/.git config`).
 ```xml
  <project path="src/repohooks" name="chromiumos/repohooks" ... />
  <repo-hooks in-project="chromiumos/repohooks" ... />
 ```
 If `<hook>` is `pre-upload`, the `.git/config` setting might be:
 ```ini
 [repo "hooks.pre-upload"]
 	approvedmanifest = https://chromium.googlesource.com/chromiumos/manifest
 ```
 ## Per-project settings
 These settings are somewhat meant to be tweaked by the user on a per-project
 basis (e.g. `git config` in a checked out source repo).
 Where possible, we re-use standard git settings to avoid confusion, and we
 refrain from documenting those, so see [git-config] documentation instead.
 See `repo help upload` for documentation on `[review]` settings.
 The `[remote]` settings are automatically populated/updated from the manifest.
 The `[branch]` settings are updated by `repo start` and `git branch`.
 | Setting                       | Subcommands   | Use/Meaning |
 |-------------------------------|---------------|-------------|
 | review.\<url\>.autocopy       | upload        | Automatically add to `--cc=<value>` |
 | review.\<url\>.autoreviewer   | upload        | Automatically add to `--reviewers=<value>` |
 | review.\<url\>.autoupload     | upload        | Automatically answer "yes" or "no" to all prompts |
 | review.\<url\>.uploadhashtags | upload        | Automatically add to `--hashtag=<value>` |
 | review.\<url\>.uploadlabels   | upload        | Automatically add to `--label=<value>` |
 | review.\<url\>.uploadnotify   | upload        | [Notify setting][upload-notify] to use |
 | review.\<url\>.uploadtopic    | upload        | Default [topic] to use |
 | review.\<url\>.username       | upload        | Override username with `ssh://` review URIs |
 | remote.\<remote\>.fetch       | sync          | Set of refs to fetch |
 | remote.\<remote\>.projectname | \<network\>   | The name of the project as it exists in Gerrit review |
 | remote.\<remote\>.pushurl     | upload        | The base URI for pushing CLs |
 | remote.\<remote\>.review      | upload        | The URI of the Gerrit review server |
 | remote.\<remote\>.url         | sync & upload | The URI of the git project to fetch |
 | branch.\<branch\>.merge       | sync & upload | The branch to merge & upload & track |
 | branch.\<branch\>.remote      | sync & upload | The remote to track |
 ## ~/ dotconfig layout
 Repo will create & maintain a few files in the user's home directory.
 *   `.repoconfig/`: Repo's per-user directory for all random config files/state.
 *   `.repoconfig/config`: Per-user settings using [git-config] file format.
 *   `.repoconfig/keyring-version`: Cache file for checking if the gnupg subdir
    has all the same keys as the repo launcher.  Used to avoid running gpg
    constantly as that can be quite slow.
 *   `.repoconfig/gnupg/`: GnuPG's internal state directory used when repo needs
    to run `gpg`.  This provides isolation from the user's normal `~/.gnupg/`.
 *   `.repoconfig/.repo_config.json`: JSON cache of the `.repoconfig/config`
    file for repo to read/process quickly.
 *   `.repo_.gitconfig.json`: JSON cache of the `.gitconfig` file for repo to
    read/process quickly.
 [git-config]: https://git-scm.com/docs/git-config
 [manifest-format.md]: ./manifest-format.md
 [local manifests]: ./manifest-format.md#Local-Manifests
 [topic]: https://gerrit-review.googlesource.com/Documentation/intro-user.html#topics
 [upload-notify]: https://gerrit-review.googlesource.com/Documentation/user-upload.html#notify
--- a/docs/manifest-format.txt
+++ b/docs/manifest-format.txt
@ -1,100 +1,117 @@
-repo Manifest Format
+# repo Manifest Format
 ====================
 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.
 The basic structure of a manifest is a bare Git repository holding
-a single 'default.xml' XML file in the top level directory.
+a single `default.xml` XML file in the top level directory.
 Manifests are inherently version controlled, since they are kept
 within a Git repository.  Updates to manifests are automatically
 obtained by clients during `repo sync`.
 [TOC]
 XML File Format
 ---------------
-A manifest XML file (e.g. 'default.xml') roughly conforms to the
+## XML File Format
 A manifest XML file (e.g. `default.xml`) roughly conforms to the
 following DTD:
-  <!DOCTYPE manifest [
+```xml
-    <!ELEMENT manifest (notice?,
+<!DOCTYPE manifest [
-                        remote*,
+  <!ELEMENT manifest (notice?,
-                        default?,
+                      remote*,
-                        manifest-server?,
+                      default?,
-                        remove-project*,
+                      manifest-server?,
-                        project*,
+                      remove-project*,
-                        extend-project*,
+                      project*,
-                        repo-hooks?)>
+                      extend-project*,
                      repo-hooks?,
                      include*)>
-    <!ELEMENT notice (#PCDATA)>
+  <!ELEMENT notice (#PCDATA)>
-    <!ELEMENT remote (EMPTY)>
+  <!ELEMENT remote EMPTY>
-    <!ATTLIST remote name         ID    #REQUIRED>
+  <!ATTLIST remote name         ID    #REQUIRED>
-    <!ATTLIST remote alias        CDATA #IMPLIED>
+  <!ATTLIST remote alias        CDATA #IMPLIED>
-    <!ATTLIST remote fetch        CDATA #REQUIRED>
+  <!ATTLIST remote fetch        CDATA #REQUIRED>
-    <!ATTLIST remote review       CDATA #IMPLIED>
+  <!ATTLIST remote pushurl      CDATA #IMPLIED>
-    <!ATTLIST remote revision     CDATA #IMPLIED>
+  <!ATTLIST remote review       CDATA #IMPLIED>
  <!ATTLIST remote revision     CDATA #IMPLIED>
-    <!ELEMENT default (EMPTY)>
+  <!ELEMENT default EMPTY>
-    <!ATTLIST default remote      IDREF #IMPLIED>
+  <!ATTLIST default remote      IDREF #IMPLIED>
-    <!ATTLIST default revision    CDATA #IMPLIED>
+  <!ATTLIST default revision    CDATA #IMPLIED>
-    <!ATTLIST default dest-branch CDATA #IMPLIED>
+  <!ATTLIST default dest-branch CDATA #IMPLIED>
-    <!ATTLIST default sync-j      CDATA #IMPLIED>
+  <!ATTLIST default upstream    CDATA #IMPLIED>
-    <!ATTLIST default sync-c      CDATA #IMPLIED>
+  <!ATTLIST default sync-j      CDATA #IMPLIED>
-    <!ATTLIST default sync-s      CDATA #IMPLIED>
+  <!ATTLIST default sync-c      CDATA #IMPLIED>
  <!ATTLIST default sync-s      CDATA #IMPLIED>
  <!ATTLIST default sync-tags   CDATA #IMPLIED>
-    <!ELEMENT manifest-server (EMPTY)>
+  <!ELEMENT manifest-server EMPTY>
-    <!ATTLIST url              CDATA #REQUIRED>
+  <!ATTLIST manifest-server url CDATA #REQUIRED>
-    <!ELEMENT project (annotation*,
+  <!ELEMENT project (annotation*,
-                       project*)>
+                     project*,
-    <!ATTLIST project name        CDATA #REQUIRED>
+                     copyfile*,
-    <!ATTLIST project path        CDATA #IMPLIED>
+                     linkfile*)>
-    <!ATTLIST project remote      IDREF #IMPLIED>
+  <!ATTLIST project name        CDATA #REQUIRED>
-    <!ATTLIST project revision    CDATA #IMPLIED>
+  <!ATTLIST project path        CDATA #IMPLIED>
-    <!ATTLIST project dest-branch CDATA #IMPLIED>
+  <!ATTLIST project remote      IDREF #IMPLIED>
-    <!ATTLIST project groups      CDATA #IMPLIED>
+  <!ATTLIST project revision    CDATA #IMPLIED>
-    <!ATTLIST project sync-c      CDATA #IMPLIED>
+  <!ATTLIST project dest-branch CDATA #IMPLIED>
-    <!ATTLIST project sync-s      CDATA #IMPLIED>
+  <!ATTLIST project groups      CDATA #IMPLIED>
-    <!ATTLIST project upstream CDATA #IMPLIED>
+  <!ATTLIST project sync-c      CDATA #IMPLIED>
-    <!ATTLIST project clone-depth CDATA #IMPLIED>
+  <!ATTLIST project sync-s      CDATA #IMPLIED>
-    <!ATTLIST project force-path CDATA #IMPLIED>
+  <!ATTLIST project sync-tags   CDATA #IMPLIED>
  <!ATTLIST project upstream CDATA #IMPLIED>
  <!ATTLIST project clone-depth CDATA #IMPLIED>
  <!ATTLIST project force-path CDATA #IMPLIED>
-    <!ELEMENT annotation (EMPTY)>
+  <!ELEMENT annotation EMPTY>
-    <!ATTLIST annotation name  CDATA #REQUIRED>
+  <!ATTLIST annotation name  CDATA #REQUIRED>
-    <!ATTLIST annotation value CDATA #REQUIRED>
+  <!ATTLIST annotation value CDATA #REQUIRED>
-    <!ATTLIST annotation keep  CDATA "true">
+  <!ATTLIST annotation keep  CDATA "true">
-    <!ELEMENT extend-project>
+  <!ELEMENT copyfile EMPTY>
-    <!ATTLIST extend-project name CDATA #REQUIRED>
+  <!ATTLIST copyfile src  CDATA #REQUIRED>
-    <!ATTLIST extend-project path CDATA #IMPLIED>
+  <!ATTLIST copyfile dest CDATA #REQUIRED>
    <!ATTLIST extend-project groups CDATA #IMPLIED>
-    <!ELEMENT remove-project (EMPTY)>
+  <!ELEMENT linkfile EMPTY>
-    <!ATTLIST remove-project name  CDATA #REQUIRED>
+  <!ATTLIST linkfile src CDATA #REQUIRED>
  <!ATTLIST linkfile dest CDATA #REQUIRED>
-    <!ELEMENT repo-hooks (EMPTY)>
+  <!ELEMENT extend-project EMPTY>
-    <!ATTLIST repo-hooks in-project CDATA #REQUIRED>
+  <!ATTLIST extend-project name CDATA #REQUIRED>
-    <!ATTLIST repo-hooks enabled-list CDATA #REQUIRED>
+  <!ATTLIST extend-project path CDATA #IMPLIED>
  <!ATTLIST extend-project groups CDATA #IMPLIED>
  <!ATTLIST extend-project revision CDATA #IMPLIED>
  <!ATTLIST extend-project remote CDATA #IMPLIED>
-    <!ELEMENT include      (EMPTY)>
+  <!ELEMENT remove-project EMPTY>
-    <!ATTLIST include name CDATA #REQUIRED>
+  <!ATTLIST remove-project name  CDATA #REQUIRED>
-  ]>
+
  <!ELEMENT repo-hooks EMPTY>
  <!ATTLIST repo-hooks in-project CDATA #REQUIRED>
  <!ATTLIST repo-hooks enabled-list CDATA #REQUIRED>
  <!ELEMENT include EMPTY>
  <!ATTLIST include name CDATA #REQUIRED>
 ]>
 ```
 A description of the elements and their attributes follows.
-Element manifest
+### Element manifest
 ----------------
 The root element of the file.
-Element remote
+### Element remote
 --------------
 One or more remote elements may be specified.  Each remote element
 specifies a Git URL shared by one or more projects and (optionally)
@ -115,6 +132,12 @@ Attribute `fetch`: The Git URL prefix for all projects which use
 this remote.  Each project's name is appended to this prefix to
 form the actual URL used to clone the project.
 Attribute `pushurl`: The Git "push" URL prefix for all projects
 which use this remote.  Each project's name is appended to this
 prefix to form the actual URL used to "git push" the project.
 This attribute is optional; if not specified then "git push"
 will use the same URL as the `fetch` attribute.
 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.
@ -123,8 +146,7 @@ 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
+### Element default
 ---------------
 At most one default element may be specified.  Its remote and
 revision attributes are used when a project element does not
@ -143,6 +165,11 @@ 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.
 Attribute `upstream`: Name of the Git ref in which a sha1
 can be found.  Used when syncing a revision locked manifest in
 -c mode to avoid having to sync the entire ref space. Project elements
 not setting their own `upstream` will inherit this value.
 Attribute `sync-j`: Number of parallel jobs to use when synching.
 Attribute `sync-c`: Set to true to only sync the given Git
@ -152,9 +179,12 @@ their own will use this value.
 Attribute `sync-s`: Set to true to also sync sub-projects.
 Attribute `sync-tags`: Set to false to only sync the given Git
 branch (specified in the `revision` attribute) rather than
 the other ref tags.
-Element manifest-server
+
-----------------------
+### Element manifest-server
 At most one manifest-server may be specified. The url attribute
 is used to specify the URL of a manifest server, which is an
@ -162,10 +192,11 @@ XML RPC service.
 The manifest server should implement the following RPC methods:
-  GetApprovedManifest(branch, target)
+    GetApprovedManifest(branch, target)
 Return a manifest in which each project is pegged to a known good revision
-for the current branch and target.
+for the current branch and target. This is used by repo sync when the
 --smart-sync option is given.
 The target to use is defined by environment variables TARGET_PRODUCT
 and TARGET_BUILD_VARIANT. These variables are used to create a string
@ -174,14 +205,14 @@ If one of those variables or both are not present, the program will call
 GetApprovedManifest without the target parameter and the manifest server
 should choose a reasonable default target.
-  GetManifest(tag)
+    GetManifest(tag)
 Return a manifest in which each project is pegged to the revision at
-the specified tag.
+the specified tag. This is used by repo sync when the --smart-tag option
 is given.
-Element project
+### Element project
 ---------------
 One or more project elements may be specified.  Each element
 describes a single Git repository to be cloned into the repo
@ -194,7 +225,7 @@ Attribute `name`: A unique name for this project.  The project's
 name is appended onto its remote's fetch URL to generate the actual
 URL to configure the Git remote with.  The URL gets formed as:
-  ${remote_fetch}/${project_name}.git
+    ${remote_fetch}/${project_name}.git
 where ${remote_fetch} is the remote's fetch attribute and
 ${project_name} is the project's name attribute.  The suffix ".git"
@ -258,8 +289,7 @@ rather than the `name` attribute.  This attribute only applies to the
 local mirrors syncing, it will be ignored when syncing the projects in a
 client working directory.
-Element extend-project
+### Element extend-project
 ----------------------
 Modify the attributes of the named project.
@ -274,8 +304,13 @@ at the specified path, rather than all projects with the given name.
 Attribute `groups`: List of additional groups to which this project
 belongs.  Same syntax as the corresponding element of `project`.
-Element annotation
+Attribute `revision`: If specified, overrides the revision of the original
------------------
+project.  Same syntax as the corresponding element of `project`.
 Attribute `remote`: If specified, overrides the remote of the original
 project.  Same syntax as the corresponding element of `project`.
 ### Element annotation
 Zero or more annotation elements may be specified as children of a
 project element. Each element describes a name-value pair that will be
@ -285,8 +320,36 @@ prefixed with REPO__.  In addition, there is an optional attribute
 "false".  This attribute determines whether or not the annotation will
 be kept when exported with the manifest subcommand.
-Element remove-project
+### Element copyfile
----------------------
+
 Zero or more copyfile elements may be specified as children of a
 project element. Each element describes a src-dest pair of files;
 the "src" file will be copied to the "dest" place during `repo sync`
 command.
 "src" is project relative, "dest" is relative to the top of the tree.
 Copying from paths outside of the project or to paths outside of the repo
 client is not allowed.
 "src" and "dest" must be files.  Directories or symlinks are not allowed.
 Intermediate paths must not be symlinks either.
 Parent directories of "dest" will be automatically created if missing.
 ### Element linkfile
 It's just like copyfile and runs at the same time as copyfile but
 instead of copying it creates a symlink.
 The symlink is created at "dest" (relative to the top of the tree) and
 points to the path specified by "src" which is a path in the project.
 Parent directories of "dest" will be automatically created if missing.
 The symlink target may be a file or directory, but it may not point outside
 of the repo client.
 ### Element remove-project
 Deletes the named project from the internal manifest table, possibly
 allowing a subsequent project element in the same manifest file to
@ -296,8 +359,7 @@ 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 include
+### Element include
 ---------------
 This element provides the capability of including another manifest
 file into the originating manifest.  Normal rules apply for the
@ -307,26 +369,25 @@ Attribute `name`: the manifest to include, specified relative to
 the manifest repository's root.
-Local Manifests
+## Local Manifests
 ===============
 Additional remotes and projects may be added through local manifest
 files stored in `$TOP_DIR/.repo/local_manifests/*.xml`.
 For example:
-  $ ls .repo/local_manifests
+    $ ls .repo/local_manifests
-  local_manifest.xml
+    local_manifest.xml
-  another_local_manifest.xml
+    another_local_manifest.xml
-  $ cat .repo/local_manifests/local_manifest.xml
+    $ cat .repo/local_manifests/local_manifest.xml
-  <?xml version="1.0" encoding="UTF-8"?>
+    <?xml version="1.0" encoding="UTF-8"?>
-  <manifest>
+    <manifest>
-    <project path="manifest"
+      <project path="manifest"
-             name="tools/manifest" />
+               name="tools/manifest" />
-    <project path="platform-manifest"
+      <project path="platform-manifest"
-             name="platform/manifest" />
+               name="platform/manifest" />
-  </manifest>
+    </manifest>
 Users may add projects to the local manifest(s) prior to a `repo sync`
 invocation, instructing repo to automatically download and manage
--- a/docs/python-support.md
+++ b/docs/python-support.md
@ -0,0 +1,47 @@
 # Supported Python Versions
 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
 their old LTS/corp systems and have little power to change the system.
 ## Summary
 * Python 3.6 (released Dec 2016) is required by default starting with repo-2.x.
 * Older versions of Python (e.g. v2.7) may use the legacy feature-frozen branch
  based on repo-1.x.
 ## Overview
 We provide a branch for Python 2 users that is feature-frozen.
 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 & 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 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.
 ### repo hooks
 Projects that use [repo hooks] run on independent schedules.
 They might migrate to Python 3 earlier or later than us.
 To support them, we'll probe the shebang of the hook script and if we find an
 interpreter in there that indicates a different version than repo is currently
 running under, we'll attempt to reexec ourselves under that.
 For example, a hook with a header like `#!/usr/bin/python2` will have repo
 execute `/usr/bin/python2` to execute the hook code specifically if repo is
 currently running Python 3.
 For more details, consult the [repo hooks] documentation.
 [repo hooks]: ./repo-hooks.md
 [repo launcher]: ../repo
--- a/docs/release-process.md
+++ b/docs/release-process.md
@ -0,0 +1,251 @@
 # repo release process
 This is the process for creating a new release of repo, as well as all the
 related topics and flows.
 [TOC]
 ## Launcher script
 The main repo script serves as a standalone program and is often referred to as
 the "launcher script".
 This makes it easy to copy around and install as you don't have to install any
 other files from the git repo.
 Whenever major changes are made to the launcher script, you should increment the
 `VERSION` variable in the launcher itself.
 At runtime, repo will check this to see if it needs to be updated (and notify
 the user automatically).
 ## Key management
 Every release has a git tag that is signed with a key that repo recognizes.
 Those keys are hardcoded inside of the repo launcher itself -- look for the
 `KEYRING_VERSION` and `MAINTAINER_KEYS` settings.
 Adding new keys to the repo launcher will allow tags to be recognized by new
 keys, but only people using that updated version will be able to.
 Since the majority of users will be using an official launcher version, their
 version will simply ignore any new signed tags.
 If you want to add new keys, it's best to register them long ahead of time,
 and then wait for that updated launcher to make its way out to everyone.
 Even then, there will be a long tail of users with outdated launchers, so be
 prepared for people asking questions.
 ### Registering a new key
 The process of actually adding a new key is quite simple.
 1.  Add the public half of the key to `MAINTAINER_KEYS`.
 2.  Increment `KEYRING_VERSION` so repo knows it needs to update.
 3.  Wait a long time after that version is in a release (~months) before trying
    to create a new release using those new keys.
 ## Self update algorithm
 When creating a new repo checkout with `repo init`, there are a few options that
 control how repo finds updates:
 *   `--repo-url`: This tells repo where to clone the full repo project itself.
    It defaults to the official project (`REPO_URL` in the launcher script).
 *   `--repo-rev`: This tells repo which branch to use for the full project.
    It defaults to the `stable` branch (`REPO_REV` in the launcher script).
 Whenever `repo sync` is run, repo will check to see if an update is available.
 It fetches the latest repo-rev from the repo-url.
 Then it verifies that the latest commit in the branch has a valid signed tag
 using `git tag -v` (which uses gpg).
 If the tag is valid, then repo will update its internal checkout to it.
 If the latest commit doesn't have a signed tag, repo will fall back to the
 most recent tag it can find (via `git describe`).
 If that tag is valid, then repo will warn and use that commit instead.
 If that tag cannot be verified, it gives up and forces the user to resolve.
 ## Branch management
 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.
 If something goes wrong with a new release, an older release can be force pushed
 and clients will automatically downgrade.
 The `maint` branch is used to track the previous major release of repo.
 It is not normally meant to be used by people as `stable` should be good enough.
 Once a new major release is pushed to the `stable` branch, then the previous
 major release can be pushed to `maint`.
 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 `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.
 ## Creating a new release
 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 `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 `master`.
 ### Creating a signed tag
 Lets assume your keys live in a dedicated directory, e.g. `~/.gnupg/repo/`.
 *** note
 If you need access to the official keys, check out the internal documentation
 at [go/repo-release].
 Note that only official maintainers of repo will have access as it describes
 internal processes for accessing the restricted keys.
 ***
 ```sh
 # Set the gpg key directory.
 $ export GNUPGHOME=~/.gnupg/repo/
 # Verify the listed key is “Repo Maintainer”.
 $ gpg -K
 # Pick whatever branch or commit you want to tag.
 $ r=master
 # Pick the new version.
 $ t=1.12.10
 # Create the signed tag.
 $ git tag -s v$t -u "Repo Maintainer <repo@android.kernel.org>" -m "repo $t" $r
 # Verify the signed tag.
 $ git show v$t
 ```
 ### Push the new release
 Once you're ready to make the release available to everyone, push it to the
 `stable` branch.
 Make sure you never push the tag itself to the stable branch!
 Only push the commit -- notice the use of `$t` and `$r` below.
 ```sh
 $ git push https://gerrit-review.googlesource.com/git-repo v$t
 $ git push https://gerrit-review.googlesource.com/git-repo $r:stable
 ```
 If something goes horribly wrong, you can force push the previous version to the
 `stable` branch and people should automatically recover.
 Again, make sure you never push the tag itself!
 ```sh
 $ oldrev="whatever-old-commit"
 $ git push https://gerrit-review.googlesource.com/git-repo $oldrev:stable --force
 ```
 ### Announce the release
 Once you do push a new release to `stable`, make sure to announce it on the
 [repo-discuss@googlegroups.com] group.
 Here is an [example announcement].
 You can create a short changelog using the command:
 ```sh
 # If you haven't pushed to the stable branch yet, you can use origin/stable.
 # If you have pushed, change origin/stable to the previous release tag.
 $ git log --format="%h (%aN) %s" --no-merges origin/stable..$r
 ```
 ## Project References
 Here's a table showing the relationship of major tools, their EOL dates, and
 their status in Ubuntu & Debian.
 Those distros tend to be good indicators of how long we need to support things.
 Things in bold indicate stuff to take note of, but does not guarantee that we
 still support them.
 Things in italics are things we used to care about but probably don't anymore.
 |   Date   |     EOL      | [Git][rel-g] | [Python][rel-p] | [Ubuntu][rel-u] / [Debian][rel-d] | Git | Python |
 |:--------:|:------------:|--------------|-----------------|-----------------------------------|-----|--------|
 | Oct 2008 | *Oct 2013*   |              | 2.6.0           | *10.04 Lucid* - 10.10 Maverick / *Squeeze* |
 | Dec 2008 | *Feb 2009*   |              | 3.0.0           |
 | Feb 2009 | *Mar 2012*   |              |                 | Debian 5 Lenny       | 1.5.6.5 | 2.5.2 |
 | Jun 2009 | *Jun 2016*   |              | 3.1.0           | *10.04 Lucid* - 10.10 Maverick / *Squeeze* |
 | Feb 2010 | *Oct 2012*   | 1.7.0        |                 | *10.04 Lucid* - *12.04 Precise* - 12.10 Quantal |
 | Apr 2010 | *Apr 2015*   |              |                 | *10.04 Lucid*        | 1.7.0.4  | 2.6.5 3.1.2  |
 | Jul 2010 | *Dec 2019*   |              | **2.7.0**       | 11.04 Natty - **<current>** |
 | Oct 2010 |              |              |                 | 10.10 Maverick       | 1.7.1    | 2.6.6 3.1.3  |
 | Feb 2011 | *Feb 2016*   |              |                 | Debian 6 Squeeze     | 1.7.2.5  | 2.6.6 3.1.3  |
 | Apr 2011 |              |              |                 | 11.04 Natty          | 1.7.4    | 2.7.1 3.2.0  |
 | Oct 2011 | *Feb 2016*   |              | 3.2.0           | 11.04 Natty - 12.10 Quantal |
 | Oct 2011 |              |              |                 | 11.10 Ocelot         | 1.7.5.4  | 2.7.2 3.2.2  |
 | Apr 2012 | *Apr 2019*   |              |                 | *12.04 Precise*      | 1.7.9.5  | 2.7.3 3.2.3  |
 | Sep 2012 | *Sep 2017*   |              | 3.3.0           | 13.04 Raring - 13.10 Saucy |
 | Oct 2012 | *Dec 2014*   | 1.8.0        |                 | 13.04 Raring - 13.10 Saucy |
 | Oct 2012 |              |              |                 | 12.10 Quantal        | 1.7.10.4 | 2.7.3 3.2.3  |
 | Apr 2013 |              |              |                 | 13.04 Raring         | 1.8.1.2  | 2.7.4 3.3.1  |
 | May 2013 | *May 2018*   |              |                 | Debian 7 Wheezy      | 1.7.10.4 | 2.7.3 3.2.3  |
 | Oct 2013 |              |              |                 | 13.10 Saucy          | 1.8.3.2  | 2.7.5 3.3.2  |
 | Feb 2014 | *Dec 2014*   | **1.9.0**    |                 | **14.04 Trusty** |
 | Mar 2014 | *Mar 2019*   |              | **3.4.0**       | **14.04 Trusty** - 15.10 Wily / **Jessie** |
 | Apr 2014 | **Apr 2022** |              |                 | **14.04 Trusty**     | 1.9.1    | 2.7.5 3.4.0  |
 | May 2014 | *Dec 2014*   | 2.0.0        |
 | Aug 2014 | *Dec 2014*   | **2.1.0**    |                 | 14.10 Utopic - 15.04 Vivid / **Jessie** |
 | Oct 2014 |              |              |                 | 14.10 Utopic         | 2.1.0    | 2.7.8 3.4.2  |
 | Nov 2014 | *Sep 2015*   | 2.2.0        |
 | Feb 2015 | *Sep 2015*   | 2.3.0        |
 | Apr 2015 | *May 2017*   | 2.4.0        |
 | Apr 2015 | **Jun 2020** |              |                 | **Debian 8 Jessie**  | 2.1.4    | 2.7.9 3.4.2  |
 | Apr 2015 |              |              |                 | 15.04 Vivid          | 2.1.4    | 2.7.9 3.4.3  |
 | Jul 2015 | *May 2017*   | 2.5.0        |                 | 15.10 Wily |
 | Sep 2015 | *May 2017*   | 2.6.0        |
 | Sep 2015 | **Sep 2020** |              | **3.5.0**       | **16.04 Xenial** - 17.04 Zesty / **Stretch** |
 | Oct 2015 |              |              |                 | 15.10 Wily           | 2.5.0    | 2.7.9 3.4.3  |
 | Jan 2016 | *Jul 2017*   | **2.7.0**    |                 | **16.04 Xenial** |
 | Mar 2016 | *Jul 2017*   | 2.8.0        |
 | Apr 2016 | **Apr 2024** |              |                 | **16.04 Xenial**     | 2.7.4    | 2.7.11 3.5.1 |
 | Jun 2016 | *Jul 2017*   | 2.9.0        |                 | 16.10 Yakkety |
 | Sep 2016 | *Sep 2017*   | 2.10.0       |
 | Oct 2016 |              |              |                 | 16.10 Yakkety        | 2.9.3    | 2.7.11 3.5.1 |
 | Nov 2016 | *Sep 2017*   | **2.11.0**   |                 | 17.04 Zesty / **Stretch** |
 | Dec 2016 | **Dec 2021** |              | **3.6.0**       | 17.10 Artful - **18.04 Bionic** - 18.10 Cosmic |
 | Feb 2017 | *Sep 2017*   | 2.12.0       |
 | Apr 2017 |              |              |                 | 17.04 Zesty          | 2.11.0   | 2.7.13 3.5.3 |
 | May 2017 | *May 2018*   | 2.13.0       |
 | Jun 2017 | **Jun 2022** |              |                 | **Debian 9 Stretch** | 2.11.0   | 2.7.13 3.5.3 |
 | Aug 2017 | *Dec 2019*   | 2.14.0       |                 | 17.10 Artful |
 | Oct 2017 | *Dec 2019*   | 2.15.0       |
 | Oct 2017 |              |              |                 | 17.10 Artful         | 2.14.1   | 2.7.14 3.6.3 |
 | Jan 2018 | *Dec 2019*   | 2.16.0       |
 | Apr 2018 | *Dec 2019*   | 2.17.0       |                 | **18.04 Bionic**     |
 | Apr 2018 | **Apr 2028** |              |                 | **18.04 Bionic**     | 2.17.0   | 2.7.15 3.6.5 |
 | Jun 2018 | *Dec 2019*   | 2.18.0       |
 | Jun 2018 | **Jun 2023** |              | 3.7.0           | 19.04 Disco - **20.04 Focal** / **Buster** |
 | Sep 2018 | *Dec 2019*   | 2.19.0       |                 | 18.10 Cosmic |
 | Oct 2018 |              |              |                 | 18.10 Cosmic         | 2.19.1   | 2.7.15 3.6.6 |
 | Dec 2018 | *Dec 2019*   | **2.20.0**   |                 | 19.04 Disco / **Buster** |
 | Feb 2019 | *Dec 2019*   | 2.21.0       |
 | Apr 2019 |              |              |                 | 19.04 Disco          | 2.20.1   | 2.7.16 3.7.3 |
 | Jun 2019 |              | 2.22.0       |
 | Jul 2019 | **Jul 2024** |              |                 | **Debian 10 Buster** | 2.20.1   | 2.7.16 3.7.3 |
 | Aug 2019 |              | 2.23.0       |
 | Oct 2019 | **Oct 2024** |              | 3.8.0           |
 | Oct 2019 |              |              |                 | 19.10 Eoan           | 2.20.1   | 2.7.17 3.7.5 |
 | Nov 2019 |              | 2.24.0       |
 | Jan 2020 |              | 2.25.0       |                 | **20.04 Focal** |
 | Apr 2020 | **Apr 2030** |              |                 | **20.04 Focal**      | 2.25.0   | 2.7.17 3.7.5 |
 [rel-d]: https://en.wikipedia.org/wiki/Debian_version_history
 [rel-g]: https://en.wikipedia.org/wiki/Git#Releases
 [rel-p]: https://en.wikipedia.org/wiki/History_of_Python#Table_of_versions
 [rel-u]: https://en.wikipedia.org/wiki/Ubuntu_version_history#Table_of_versions
 [example announcement]: https://groups.google.com/d/topic/repo-discuss/UGBNismWo1M/discussion
 [repo-discuss@googlegroups.com]: https://groups.google.com/forum/#!forum/repo-discuss
 [go/repo-release]: https://goto.google.com/repo-release
--- a/docs/repo-hooks.md
+++ b/docs/repo-hooks.md
@ -0,0 +1,135 @@
 # repo hooks
 [TOC]
 Repo provides a mechanism to hook specific stages of the runtime with custom
 python modules.  All the hooks live in one git project which is checked out by
 the manifest (specified during `repo init`), and the manifest itself defines
 which hooks are registered.
 These are useful to run linters, check formatting, and run quick unittests
 before allowing a step to proceed (e.g. before uploading a commit to Gerrit).
 A complete example can be found in the Android project.  It can be easily
 re-used by any repo based project and is not specific to Android.<br>
 https://android.googlesource.com/platform/tools/repohooks
 ## Approvals
 When a hook is processed the first time, the user is prompted for approval.
 We don't want to execute arbitrary code without explicit consent.  For manifests
 fetched via secure protocols (e.g. https://), the user is prompted once.  For
 insecure protocols (e.g. http://), the user is prompted whenever the registered
 repohooks project is updated and a hook is triggered.
 ## Manifest Settings
 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/+/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
 `pre-upload` phase.
 ```xml
 <project path="tools/repohooks" name="platform/tools/repohooks" />
 <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 ```
 ## Source Layout
 The repohooks git repo should have a python file with the same name as the hook.
 So if you want to support the `pre-upload` hook, you'll need to create a file
 named `pre-upload.py`.  Repo will dynamically load that module when processing
 the hook and then call the `main` function in it.
 Hooks should have their `main` accept `**kwargs` for future compatibility.
 ## Runtime
 Hook return values are ignored.
 Any uncaught exceptions from the hook will cause the step to fail.  This is
 intended as a fallback safety check though rather than the normal flow.  If
 you want your hook to trigger a failure, it should call `sys.exit()` (after
 displaying relevant diagnostics).
 Output (stdout & stderr) are not filtered in any way.  Hooks should generally
 not be too verbose.  A short summary is nice, and some status information when
 long running operations occur, but long/verbose output should be used only if
 the hook ultimately fails.
 The hook runs from the top level of the repo client where the operation is
 started.
 For example, if the repo client is under `~/tree/`, then that is where the hook
 runs, even if you ran repo in a git repository at `~/tree/src/foo/`, or in a
 subdirectory of that git repository in `~/tree/src/foo/bar/`.
 Hooks frequently start off by doing a `os.chdir` to the specific project they're
 called on (see below) and then changing back to the original dir when they're
 finished.
 Python's `sys.path` is modified so that the top of repohooks directory comes
 first.  This should help simplify the hook logic to easily allow importing of
 local modules.
 Repo does not modify the state of the git checkout.  This means that the hooks
 might be running in a dirty git repo with many commits and checked out to the
 latest one.  If the hook wants to operate on specific git commits, it needs to
 manually discover the list of pending commits, extract the diff/commit, and
 then check it directly.  Hooks should not normally modify the active git repo
 (such as checking out a specific commit to run checks) without first prompting
 the user.  Although user interaction is discouraged in the common case, it can
 be useful when deploying automatic fixes.
 ### Shebang Handling
 *** note
 This is intended as a transitional feature.  Hooks are expected to eventually
 migrate to Python 3 only as Python 2 is EOL & deprecated.
 ***
 If the hook is written against a specific version of Python (either 2 or 3),
 the script can declare that explicitly.  Repo will then attempt to execute it
 under the right version of Python regardless of the version repo itself might
 be executing under.
 Here are the shebangs that are recognized.
 * `#!/usr/bin/env python` & `#!/usr/bin/python`: The hook is compatible with
  Python 2 & Python 3.  For maximum compatibility, these are recommended.
 * `#!/usr/bin/env python2` & `#!/usr/bin/python2`: The hook requires Python 2.
  Version specific names like `python2.7` are also recognized.
 * `#!/usr/bin/env python3` & `#!/usr/bin/python3`: The hook requires Python 3.
  Version specific names like `python3.6` are also recognized.
 If no shebang is detected, or does not match the forms above, we assume that the
 hook is compatible with both Python 2 & Python 3 as if `#!/usr/bin/python` was
 used.
 ## Hooks
 Here are all the points available for hooking.
 ### pre-upload
 This hook runs when people run `repo upload`.
 The `pre-upload.py` file should be defined like:
 ```py
 def main(project_list, worktree_list=None, **kwargs):
    """Main function invoked directly by repo.
    We must use the name "main" as that is what repo requires.
    Args:
      project_list: List of projects to run on.
      worktree_list: A list of directories.  It should be the same length as
          project_list, so that each entry in project_list matches with a
          directory in worktree_list.  If None, we will attempt to calculate
          the directories automatically.
      kwargs: Leave this here for forward-compatibility.
    """
 ```
--- a/docs/windows.md
+++ b/docs/windows.md
@ -0,0 +1,169 @@
 # Microsoft Windows Details
 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.
 Keep in mind that Windows in general is "best effort" and "community supported".
 That means we don't actively test or verify behavior, but rely heavily on users
 to report problems back to us, and to contribute fixes as needed.
 [TOC]
 ## Windows
 We only support Windows 10 or newer.
 This is largely due to symlinks not being available in older versions, but it's
 also due to most developers not using Windows.
 We will never add code specific to older versions of Windows.
 It might work, but it most likely won't, so please don't bother asking.
 ## Git worktrees
 *** note
 **Warning**: Repo's support for Git worktrees is new & experimental.
 Please report any bugs and be sure to maintain backups!
 ***
 The Repo 2.4 release introduced support for [Git worktrees][git-worktree].
 You don't have to worry about or understand this particular feature, so don't
 worry if this section of the Git manual is particularly impenetrable.
 The salient point is that Git worktrees allow Repo to create repo client
 checkouts that do not require symlinks at all under Windows.
 This means users no longer need Administrator access to sync code.
 Simply use `--worktree` when running `repo init` to opt in.
 This does not effect specific Git repositories that use symlinks themselves.
 [git-worktree]: https://git-scm.com/docs/git-worktree
 ## Symlinks by default
 *** note
 **NB**: This section applies to the default Repo behavior which does not use
 Git worktrees (see the previous section for more info).
 ***
 Repo will use symlinks heavily internally.
 On *NIX platforms, this isn't an issue, but Windows makes it a bit difficult.
 There are some documents out there for how to do this, but usually the easiest
 answer is to run your shell as an Administrator and invoke repo/git in that.
 This isn't a great solution, but Windows doesn't make this easy, so here we are.
 ### Launch Git Bash
 If you install Git Bash (see below), you can launch that with appropriate
 permissions so that all programs "just work".
 * Open the Start Menu (i.e. press the ⊞ key).
 * Find/search for "Git Bash".
 * Right click it and select "Run as administrator".
 *** note
 **NB**: This environment is only needed when running `repo`, or any specific `git`
 command that might involve symlinks (e.g. `pull` or `checkout`).
 You do not need to run all your commands in here such as your editor.
 ***
 ### Symlinks with GNU tools
 If you want to use `ln -s` inside of the default Git/bash shell, you might need
 to export this environment variable:
 ```sh
 $ export MSYS="winsymlinks:nativestrict"
 ```
 Otherwise `ln -s` will copy files and not actually create a symlink.
 This also helps `tar` unpack symlinks, so that's nice.
 ### References
 * https://github.com/git-for-windows/git/wiki/Symbolic-Links
 * https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/
 ## Python
 Python 3.6 or newer is required.
 Python 2 is known to be broken when running under Windows.
 See our [Python Support](./python-support.md) document for more details.
 You can grab the latest Windows installer here:<br>
 https://www.python.org/downloads/release/python-3
 ## Git
 You should install the most recent version of Git for Windows:<br>
 https://git-scm.com/download/win
 When installing, make sure to turn on "Enable symbolic links" when prompted.
 If you've already installed Git for Windows, you can simply download the latest
 installer from above and run it again.
 It should safely upgrade things in situ for you.
 This is useful if you want to switch the symbolic link option after the fact.
 ## Shell
 We don't have a specific requirement for shell environments when running repo.
 Most developers use MinTTY/bash that's included with the Git for Windows install
 (so see above for installing Git).
 Command & Powershell & the Windows Terminal probably work.
 Who knows!
 ## FAQ
 ### repo upload always complains about allowing hooks or using --no-verify!
 When using `repo upload` in projects that have custom repohooks, you might get
 an error like the following:
 ```sh
 $ repo upload
 ERROR: You must allow the pre-upload hook or use --no-verify.
 ```
 This can be confusing as you never get prompted.
 [MinTTY has a bug][mintty] that breaks isatty checking inside of repo which
 causes repo to never interactively prompt the user which means the upload check
 always fails.
 You can workaround this by manually granting consent when uploading.
 Simply add the `--verify` option whenever uploading:
 ```sh
 $ repo upload --verify
 ```
 You will have to specify this flag every time you upload.
 [mintty]: https://github.com/mintty/mintty/issues/56
 ### repohooks always fail with an close_fds error.
 When using the [reference repohooks project][repohooks] included in AOSP,
 you might see errors like this when running `repo upload`:
 ```sh
 $ repo upload
 ERROR: Traceback (most recent call last):
  ...
  File "C:\...\lib\subprocess.py", line 351, in __init__
    raise ValueError("close_fds is not supported on Windows "
 ValueError: close_fds is not supported on Windows platforms if you redirect stdin/stderr/stdout
 Failed to run main() for pre-upload hook; see traceback above.
 ```
 This error shows up when using Python 2.
 You should upgrade to Python 3 instead (see above).
 If you already have Python 3 installed, make sure it's the default version.
 Running `python --version` should say `Python 3`, not `Python 2`.
 If you didn't install the Python versions, or don't have permission to change
 the default version, you can probably workaround this by changing `$PATH` in
 your shell so the Python 3 version is found first.
 [repohooks]: https://android.googlesource.com/platform/tools/repohooks
--- a/editor.py
+++ b/editor.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -21,6 +22,8 @@ import subprocess
 import tempfile
 from error import EditorError
 import platform_utils
 class Editor(object):
  """Manages the user's preferred text editor."""
@ -55,7 +58,7 @@ class Editor(object):
    if os.getenv('TERM') == 'dumb':
      print(
-"""No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR.
+          """No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR.
 Tried to fall back to vi but terminal is dumb.  Please configure at
 least one of these before using this command.""", file=sys.stderr)
      sys.exit(1)
@ -66,11 +69,14 @@ least one of these before using this command.""", file=sys.stderr)
  def EditString(cls, data):
    """Opens an editor to edit the given content.
-       Args:
+    Args:
-         data        : the text to edit
+      data: The text to edit.
-      Returns:
+    Returns:
-        new value of edited text; None if editing did not succeed
+      New value of edited text.
    Raises:
      EditorError: The editor failed to run.
    """
    editor = cls._GetEditor()
    if editor == ':':
@ -78,11 +84,16 @@ least one of these before using this command.""", file=sys.stderr)
    fd, path = tempfile.mkstemp()
    try:
-      os.write(fd, data)
+      os.write(fd, data.encode('utf-8'))
      os.close(fd)
      fd = None
-      if re.compile("^.*[$ \t'].*$").match(editor):
+      if platform_utils.isWindows():
        # Split on spaces, respecting quoted strings
        import shlex
        args = shlex.split(editor)
        shell = False
      elif re.compile("^.*[$ \t'].*$").match(editor):
        args = [editor + ' "$@"', 'sh']
        shell = True
      else:
@ -94,17 +105,14 @@ least one of these before using this command.""", file=sys.stderr)
        rc = subprocess.Popen(args, shell=shell).wait()
      except OSError as e:
        raise EditorError('editor failed, %s: %s %s'
-          % (str(e), editor, path))
+                          % (str(e), editor, path))
      if rc != 0:
        raise EditorError('editor failed with exit status %d: %s %s'
-          % (rc, editor, path))
+                          % (rc, editor, path))
-      fd2 = open(path)
+      with open(path, mode='rb') as fd2:
-      try:
+        return fd2.read().decode('utf-8')
        return fd2.read()
      finally:
        fd2.close()
    finally:
      if fd:
        os.close(fd)
-      os.remove(path)
+      platform_utils.remove(path)
--- a/error.py
+++ b/error.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -13,17 +14,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 class ManifestParseError(Exception):
  """Failed to parse the manifest file.
  """
 class ManifestInvalidRevisionError(Exception):
  """The revision value in a project is incorrect.
  """
 class ManifestInvalidPathError(Exception):
  """A path used in <copyfile> or <linkfile> is incorrect.
  """
 class NoManifestException(Exception):
  """The required manifest does not exist.
  """
  def __init__(self, path, reason):
    super(NoManifestException, self).__init__()
    self.path = path
@ -32,9 +42,11 @@ class NoManifestException(Exception):
  def __str__(self):
    return self.reason
 class EditorError(Exception):
  """Unspecified error from the user's text editor.
  """
  def __init__(self, reason):
    super(EditorError, self).__init__()
    self.reason = reason
@ -42,9 +54,11 @@ class EditorError(Exception):
  def __str__(self):
    return self.reason
 class GitError(Exception):
  """Unspecified internal error from git.
  """
  def __init__(self, command):
    super(GitError, self).__init__()
    self.command = command
@ -52,9 +66,11 @@ class GitError(Exception):
  def __str__(self):
    return self.command
 class UploadError(Exception):
  """A bundle upload to Gerrit did not succeed.
  """
  def __init__(self, reason):
    super(UploadError, self).__init__()
    self.reason = reason
@ -62,9 +78,11 @@ class UploadError(Exception):
  def __str__(self):
    return self.reason
 class DownloadError(Exception):
  """Cannot download a repository.
  """
  def __init__(self, reason):
    super(DownloadError, self).__init__()
    self.reason = reason
@ -72,9 +90,11 @@ class DownloadError(Exception):
  def __str__(self):
    return self.reason
 class NoSuchProjectError(Exception):
  """A specified project does not exist in the work tree.
  """
  def __init__(self, name=None):
    super(NoSuchProjectError, self).__init__()
    self.name = name
@ -88,6 +108,7 @@ class NoSuchProjectError(Exception):
 class InvalidProjectGroupsError(Exception):
  """A specified project is not suitable for the specified groups
  """
  def __init__(self, name=None):
    super(InvalidProjectGroupsError, self).__init__()
    self.name = name
@ -97,15 +118,18 @@ class InvalidProjectGroupsError(Exception):
      return 'in current directory'
    return self.name
 class RepoChangedException(Exception):
  """Thrown if 'repo sync' results in repo updating its internal
     repo or manifest repositories.  In this special case we must
     use exec to re-execute repo with the new code and manifest.
  """
  def __init__(self, extra_args=None):
    super(RepoChangedException, self).__init__()
    self.extra_args = extra_args or []
 class HookError(Exception):
  """Thrown if a 'repo-hook' could not be run.
--- a/event_log.py
+++ b/event_log.py
@ -0,0 +1,179 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2017 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.
 from __future__ import print_function
 import json
 import multiprocessing
 TASK_COMMAND = 'command'
 TASK_SYNC_NETWORK = 'sync-network'
 TASK_SYNC_LOCAL = 'sync-local'
 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.
  Each entry contains the following keys:
  - id: A ('RepoOp', ID) tuple, suitable for storing in a datastore.
        The ID is only unique for the invocation of the repo command.
  - name: Name of the object being operated upon.
  - task_name: The task that was performed.
  - start: Timestamp of when the operation started.
  - finish: Timestamp of when the operation finished.
  - success: Boolean indicating if the operation was successful.
  - try_count: A counter indicating the try count of this task.
  Optionally:
  - parent: A ('RepoOp', ID) tuple indicating the parent event for nested
            events.
  Valid task_names include:
  - command: The invocation of a subcommand.
  - sync-network: The network component of a sync command.
  - sync-local: The local component of a sync command.
  Specific tasks may include additional informational properties.
  """
  def __init__(self):
    """Initializes the event log."""
    self._log = []
    self._parent = None
  def Add(self, name, task_name, start, finish=None, success=None,
          try_count=1, kind='RepoOp'):
    """Add an event to the log.
    Args:
      name: Name of the object being operated upon.
      task_name: A sub-task that was performed for name.
      start: Timestamp of when the operation started.
      finish: Timestamp of when the operation finished.
      success: Boolean indicating if the operation was successful.
      try_count: A counter indicating the try count of this task.
      kind: The kind of the object for the unique identifier.
    Returns:
      A dictionary of the event added to the log.
    """
    event = {
        'id': (kind, _NextEventId()),
        'name': name,
        'task_name': task_name,
        'start_time': start,
        'try': try_count,
    }
    if self._parent:
      event['parent'] = self._parent['id']
    if success is not None or finish is not None:
        self.FinishEvent(event, finish, success)
    self._log.append(event)
    return event
  def AddSync(self, project, task_name, start, finish, success):
    """Add a event to the log for a sync command.
    Args:
      project: Project being synced.
      task_name: A sub-task that was performed for name.
                 One of (TASK_SYNC_NETWORK, TASK_SYNC_LOCAL)
      start: Timestamp of when the operation started.
      finish: Timestamp of when the operation finished.
      success: Boolean indicating if the operation was successful.
    Returns:
      A dictionary of the event added to the log.
    """
    event = self.Add(project.relpath, task_name, start, finish, success)
    if event is not None:
      event['project'] = project.name
      if project.revisionExpr:
        event['revision'] = project.revisionExpr
      if project.remote.url:
        event['project_url'] = project.remote.url
      if project.remote.fetchUrl:
        event['remote_url'] = project.remote.fetchUrl
      try:
        event['git_hash'] = project.GetCommitRevisionId()
      except Exception:
        pass
    return event
  def GetStatusString(self, success):
    """Converst a boolean success to a status string.
    Args:
      success: Boolean indicating if the operation was successful.
    Returns:
      status string.
    """
    return 'pass' if success else 'fail'
  def FinishEvent(self, event, finish, success):
    """Finishes an incomplete event.
    Args:
      event: An event that has been added to the log.
      finish: Timestamp of when the operation finished.
      success: Boolean indicating if the operation was successful.
    Returns:
      A dictionary of the event added to the log.
    """
    event['status'] = self.GetStatusString(success)
    event['finish_time'] = finish
    return event
  def SetParent(self, event):
    """Set a parent event for all new entities.
    Args:
      event: The event to use as a parent.
    """
    self._parent = event
  def Write(self, filename):
    """Writes the log out to a file.
    Args:
      filename: The file to write the log to.
    """
    with open(filename, 'w+') as f:
      for e in self._log:
        json.dump(e, f, sort_keys=True)
        f.write('\n')
 # An integer id that is unique across this invocation of the program.
 _EVENT_ID = multiprocessing.Value('i', 1)
 def _NextEventId():
  """Helper function for grabbing the next unique id.
  Returns:
    A unique, to this invocation of the program, integer id.
  """
  with _EVENT_ID.get_lock():
    val = _EVENT_ID.value
    _EVENT_ID.value += 1
  return val
--- a/git_command.py
+++ b/git_command.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -14,19 +15,31 @@
 # limitations under the License.
 from __future__ import print_function
 import fcntl
 import os
-import select
+import re
 import sys
 import subprocess
 import tempfile
 from signal import SIGTERM
 from error import GitError
-from trace import REPO_TRACE, IsTrace, Trace
+from git_refs import HEAD
 import platform_utils
 from repo_trace import REPO_TRACE, IsTrace, Trace
 from wrapper import Wrapper
 GIT = 'git'
-MIN_GIT_VERSION = (1, 5, 4)
+# 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
 # different repo releases while source versions might require a newer git.
 #
 # The soft version is when we start warning users that the version is old and
 # we'll be dropping support for it.  We'll refuse to work with versions older
 # than the hard version.
 #
 # git-1.7 is in (EOL) Ubuntu Precise.  git-1.9 is in Ubuntu Trusty.
 MIN_GIT_VERSION_SOFT = (1, 9, 1)
 MIN_GIT_VERSION_HARD = (1, 7, 2)
 GIT_DIR = 'GIT_DIR'
 LAST_GITDIR = None
@ -35,6 +48,36 @@ LAST_CWD = None
 _ssh_proxy_path = None
 _ssh_sock_path = None
 _ssh_clients = []
 _ssh_version = None
 def _run_ssh_version():
  """run ssh -V to display the version number"""
  return subprocess.check_output(['ssh', '-V'], stderr=subprocess.STDOUT).decode()
 def _parse_ssh_version(ver_str=None):
  """parse a ssh version string into a tuple"""
  if ver_str is None:
    ver_str = _run_ssh_version()
  m = re.match(r'^OpenSSH_([0-9.]+)(p[0-9]+)?\s', ver_str)
  if m:
    return tuple(int(x) for x in m.group(1).split('.'))
  else:
    return ()
 def ssh_version():
  """return ssh version as a tuple"""
  global _ssh_version
  if _ssh_version is None:
    try:
      _ssh_version = _parse_ssh_version()
    except subprocess.CalledProcessError:
      print('fatal: unable to detect ssh version', file=sys.stderr)
      sys.exit(1)
  return _ssh_version
 def ssh_sock(create=True):
  global _ssh_sock_path
@ -44,28 +87,36 @@ def ssh_sock(create=True):
    tmp_dir = '/tmp'
    if not os.path.exists(tmp_dir):
      tmp_dir = tempfile.gettempdir()
    if ssh_version() < (6, 7):
      tokens = '%r@%h:%p'
    else:
      tokens = '%C'  # hash of %l%h%p%r
    _ssh_sock_path = os.path.join(
-      tempfile.mkdtemp('', 'ssh-', tmp_dir),
+        tempfile.mkdtemp('', 'ssh-', tmp_dir),
-      'master-%r@%h:%p')
+        'master-' + tokens)
  return _ssh_sock_path
 def _ssh_proxy():
  global _ssh_proxy_path
  if _ssh_proxy_path is None:
    _ssh_proxy_path = os.path.join(
-      os.path.dirname(__file__),
+        os.path.dirname(__file__),
-      'git_ssh')
+        'git_ssh')
  return _ssh_proxy_path
 def _add_ssh_client(p):
  _ssh_clients.append(p)
 def _remove_ssh_client(p):
  try:
    _ssh_clients.remove(p)
  except ValueError:
    pass
 def terminate_ssh_clients():
  global _ssh_clients
  for p in _ssh_clients:
@ -76,98 +127,161 @@ def terminate_ssh_clients():
      pass
  _ssh_clients = []
 _git_version = None
 class _sfd(object):
  """select file descriptor class"""
  def __init__(self, fd, dest, std_name):
    assert std_name in ('stdout', 'stderr')
    self.fd = fd
    self.dest = dest
    self.std_name = std_name
  def fileno(self):
    return self.fd.fileno()
 class _GitCall(object):
  def version(self):
    p = GitCommand(None, ['--version'], capture_stdout=True)
    if p.Wait() == 0:
      if hasattr(p.stdout, 'decode'):
        return p.stdout.decode('utf-8')
      else:
        return p.stdout
    return None
  def version_tuple(self):
    global _git_version
    if _git_version is None:
-      ver_str = git.version()
+      _git_version = Wrapper().ParseGitVersion()
      _git_version = Wrapper().ParseGitVersion(ver_str)
      if _git_version is None:
-        print('fatal: "%s" unsupported' % ver_str, file=sys.stderr)
+        print('fatal: unable to detect git version', file=sys.stderr)
        sys.exit(1)
    return _git_version
  def __getattr__(self, name):
-    name = name.replace('_','-')
+    name = name.replace('_', '-')
    def fun(*cmdv):
      command = [name]
      command.extend(cmdv)
      return GitCommand(None, command).Wait() == 0
    return fun
 git = _GitCall()
-def git_require(min_version, fail=False):
+
 def RepoSourceVersion():
  """Return the version of the repo.git tree."""
  ver = getattr(RepoSourceVersion, 'version', None)
  # We avoid GitCommand so we don't run into circular deps -- GitCommand needs
  # to initialize version info we provide.
  if ver is None:
    env = GitCommand._GetBasicEnv()
    proj = os.path.dirname(os.path.abspath(__file__))
    env[GIT_DIR] = os.path.join(proj, '.git')
    p = subprocess.Popen([GIT, 'describe', HEAD], stdout=subprocess.PIPE,
                         env=env)
    if p.wait() == 0:
      ver = p.stdout.read().strip().decode('utf-8')
      if ver.startswith('v'):
        ver = ver[1:]
    else:
      ver = 'unknown'
    setattr(RepoSourceVersion, 'version', ver)
  return ver
 class UserAgent(object):
  """Mange User-Agent settings when talking to external services
  We follow the style as documented here:
  https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent
  """
  _os = None
  _repo_ua = None
  _git_ua = None
  @property
  def os(self):
    """The operating system name."""
    if self._os is None:
      os_name = sys.platform
      if os_name.lower().startswith('linux'):
        os_name = 'Linux'
      elif os_name == 'win32':
        os_name = 'Win32'
      elif os_name == 'cygwin':
        os_name = 'Cygwin'
      elif os_name == 'darwin':
        os_name = 'Darwin'
      self._os = os_name
    return self._os
  @property
  def repo(self):
    """The UA when connecting directly from repo."""
    if self._repo_ua is None:
      py_version = sys.version_info
      self._repo_ua = 'git-repo/%s (%s) git/%s Python/%d.%d.%d' % (
          RepoSourceVersion(),
          self.os,
          git.version_tuple().full,
          py_version.major, py_version.minor, py_version.micro)
    return self._repo_ua
  @property
  def git(self):
    """The UA when running git."""
    if self._git_ua is None:
      self._git_ua = 'git/%s (%s) git-repo/%s' % (
          git.version_tuple().full,
          self.os,
          RepoSourceVersion())
    return self._git_ua
 user_agent = UserAgent()
 def git_require(min_version, fail=False, msg=''):
  git_version = git.version_tuple()
  if min_version <= git_version:
    return True
  if fail:
    need = '.'.join(map(str, min_version))
-    print('fatal: git %s or later required' % need, file=sys.stderr)
+    if msg:
      msg = ' for ' + msg
    print('fatal: git %s or later required%s' % (need, msg), file=sys.stderr)
    sys.exit(1)
  return False
 def _setenv(env, name, value):
  env[name] = value.encode()
 class GitCommand(object):
  def __init__(self,
               project,
               cmdv,
-               bare = False,
+               bare=False,
-               provide_stdin = False,
+               provide_stdin=False,
-               capture_stdout = False,
+               capture_stdout=False,
-               capture_stderr = False,
+               capture_stderr=False,
-               disable_editor = False,
+               merge_output=False,
-               ssh_proxy = False,
+               disable_editor=False,
-               cwd = None,
+               ssh_proxy=False,
-               gitdir = None):
+               cwd=None,
-    env = os.environ.copy()
+               gitdir=None):
-
+    env = self._GetBasicEnv()
    for key in [REPO_TRACE,
              GIT_DIR,
              'GIT_ALTERNATE_OBJECT_DIRECTORIES',
              'GIT_OBJECT_DIRECTORY',
              'GIT_WORK_TREE',
              'GIT_GRAFT_FILE',
              'GIT_INDEX_FILE']:
      if key in env:
        del env[key]
    # If we are not capturing std* then need to print it.
    self.tee = {'stdout': not capture_stdout, 'stderr': not capture_stderr}
    if disable_editor:
-      _setenv(env, 'GIT_EDITOR', ':')
+      env['GIT_EDITOR'] = ':'
    if ssh_proxy:
-      _setenv(env, 'REPO_SSH_SOCK', ssh_sock())
+      env['REPO_SSH_SOCK'] = ssh_sock()
-      _setenv(env, 'GIT_SSH', _ssh_proxy())
+      env['GIT_SSH'] = _ssh_proxy()
      env['GIT_SSH_VARIANT'] = 'ssh'
    if 'http_proxy' in env and 'darwin' == sys.platform:
      s = "'http.proxy=%s'" % (env['http_proxy'],)
      p = env.get('GIT_CONFIG_PARAMETERS')
      if p is not None:
        s = p + ' ' + s
-      _setenv(env, 'GIT_CONFIG_PARAMETERS', s)
+      env['GIT_CONFIG_PARAMETERS'] = s
    if 'GIT_ALLOW_PROTOCOL' not in env:
      env['GIT_ALLOW_PROTOCOL'] = (
          'file:git:http:https:ssh:persistent-http:persistent-https:sso:rpc')
    env['GIT_HTTP_USER_AGENT'] = user_agent.git
    if project:
      if not cwd:
@ -178,7 +292,7 @@ class GitCommand(object):
    command = [GIT]
    if bare:
      if gitdir:
-        _setenv(env, GIT_DIR, gitdir)
+        env[GIT_DIR] = gitdir
      cwd = None
    command.append(cmdv[0])
    # Need to use the --progress flag for fetch/clone so output will be
@ -194,7 +308,7 @@ class GitCommand(object):
      stdin = None
    stdout = subprocess.PIPE
-    stderr = subprocess.PIPE
+    stderr = subprocess.STDOUT if merge_output else subprocess.PIPE
    if IsTrace():
      global LAST_CWD
@ -222,15 +336,17 @@ class GitCommand(object):
        dbg += ' 1>|'
      if stderr == subprocess.PIPE:
        dbg += ' 2>|'
      elif stderr == subprocess.STDOUT:
        dbg += ' 2>&1'
      Trace('%s', dbg)
    try:
      p = subprocess.Popen(command,
-                           cwd = cwd,
+                           cwd=cwd,
-                           env = env,
+                           env=env,
-                           stdin = stdin,
+                           stdin=stdin,
-                           stdout = stdout,
+                           stdout=stdout,
-                           stderr = stderr)
+                           stderr=stderr)
    except Exception as e:
      raise GitError('%s: %s' % (command[1], e))
@ -240,6 +356,23 @@ class GitCommand(object):
    self.process = p
    self.stdin = p.stdin
  @staticmethod
  def _GetBasicEnv():
    """Return a basic env for running git under.
    This is guaranteed to be side-effect free.
    """
    env = os.environ.copy()
    for key in (REPO_TRACE,
                GIT_DIR,
                'GIT_ALTERNATE_OBJECT_DIRECTORIES',
                'GIT_OBJECT_DIRECTORY',
                'GIT_WORK_TREE',
                'GIT_GRAFT_FILE',
                'GIT_INDEX_FILE'):
      env.pop(key, None)
    return env
  def Wait(self):
    try:
      p = self.process
@ -250,19 +383,17 @@ class GitCommand(object):
  def _CaptureOutput(self):
    p = self.process
-    s_in = [_sfd(p.stdout, sys.stdout, 'stdout'),
+    s_in = platform_utils.FileDescriptorStreams.create()
-            _sfd(p.stderr, sys.stderr, 'stderr')]
+    s_in.add(p.stdout, sys.stdout, 'stdout')
    if p.stderr is not None:
      s_in.add(p.stderr, sys.stderr, 'stderr')
    self.stdout = ''
    self.stderr = ''
-    for s in s_in:
+    while not s_in.is_done:
-      flags = fcntl.fcntl(s.fd, fcntl.F_GETFL)
+      in_ready = s_in.select()
      fcntl.fcntl(s.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
    while s_in:
      in_ready, _, _ = select.select(s_in, [], [])
      for s in in_ready:
-        buf = s.fd.read(4096)
+        buf = s.read()
        if not buf:
          s_in.remove(s)
          continue
--- a/git_config.py
+++ b/git_config.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -15,9 +16,13 @@
 from __future__ import print_function
 import contextlib
 import errno
 import json
 import os
 import re
 import signal
 import ssl
 import subprocess
 import sys
 try:
@ -37,9 +42,9 @@ else:
  urllib.request = urllib2
  urllib.error = urllib2
 from signal import SIGTERM
 from error import GitError, UploadError
-from trace import Trace
+import platform_utils
 from repo_trace import Trace
 if is_python3():
  from http.client import HTTPException
 else:
@ -48,37 +53,53 @@ else:
 from git_command import GitCommand
 from git_command import ssh_sock
 from git_command import terminate_ssh_clients
 from git_refs import R_CHANGES, R_HEADS, R_TAGS
 R_HEADS = 'refs/heads/'
 R_TAGS  = 'refs/tags/'
 ID_RE = re.compile(r'^[0-9a-f]{40}$')
 REVIEW_CACHE = dict()
 def IsChange(rev):
  return rev.startswith(R_CHANGES)
 def IsId(rev):
  return ID_RE.match(rev)
 def IsTag(rev):
  return rev.startswith(R_TAGS)
 def IsImmutable(rev):
    return IsChange(rev) or IsId(rev) or IsTag(rev)
 def _key(name):
  parts = name.split('.')
  if len(parts) < 2:
    return name.lower()
-  parts[ 0] = parts[ 0].lower()
+  parts[0] = parts[0].lower()
  parts[-1] = parts[-1].lower()
  return '.'.join(parts)
 class GitConfig(object):
  _ForUser = None
  _USER_CONFIG = '~/.gitconfig'
  @classmethod
  def ForUser(cls):
    if cls._ForUser is None:
-      cls._ForUser = cls(configfile = os.path.expanduser('~/.gitconfig'))
+      cls._ForUser = cls(configfile=os.path.expanduser(cls._USER_CONFIG))
    return cls._ForUser
  @classmethod
  def ForRepository(cls, gitdir, defaults=None):
-    return cls(configfile = os.path.join(gitdir, 'config'),
+    return cls(configfile=os.path.join(gitdir, 'config'),
-               defaults = defaults)
+               defaults=defaults)
  def __init__(self, configfile, defaults=None, jsonFile=None):
    self.file = configfile
@ -91,18 +112,55 @@ class GitConfig(object):
    self._json = jsonFile
    if self._json is None:
      self._json = os.path.join(
-        os.path.dirname(self.file),
+          os.path.dirname(self.file),
-        '.repo_' + os.path.basename(self.file) + '.json')
+          '.repo_' + os.path.basename(self.file) + '.json')
-  def Has(self, name, include_defaults = True):
+  def Has(self, name, include_defaults=True):
    """Return true if this configuration file has the key.
    """
    if _key(name) in self._cache:
      return True
    if include_defaults and self.defaults:
-      return self.defaults.Has(name, include_defaults = True)
+      return self.defaults.Has(name, include_defaults=True)
    return False
  def GetInt(self, name):
    """Returns an integer from the configuration file.
    This follows the git config syntax.
    Args:
      name: The key to lookup.
    Returns:
      None if the value was not defined, or is not a boolean.
      Otherwise, the number itself.
    """
    v = self.GetString(name)
    if v is None:
      return None
    v = v.strip()
    mult = 1
    if v.endswith('k'):
      v = v[:-1]
      mult = 1024
    elif v.endswith('m'):
      v = v[:-1]
      mult = 1024 * 1024
    elif v.endswith('g'):
      v = v[:-1]
      mult = 1024 * 1024 * 1024
    base = 10
    if v.startswith('0x'):
      base = 16
    try:
      return int(v, base=base) * mult
    except ValueError:
      return None
  def GetBoolean(self, name):
    """Returns a boolean from the configuration file.
       None : The value was not defined, or is not a boolean.
@ -129,7 +187,7 @@ class GitConfig(object):
      v = self._cache[_key(name)]
    except KeyError:
      if self.defaults:
-        return self.defaults.GetString(name, all_keys = all_keys)
+        return self.defaults.GetString(name, all_keys=all_keys)
      v = []
    if not all_keys:
@ -140,7 +198,7 @@ class GitConfig(object):
    r = []
    r.extend(v)
    if self.defaults:
-      r.extend(self.defaults.GetString(name, all_keys = True))
+      r.extend(self.defaults.GetString(name, all_keys=True))
    return r
  def SetString(self, name, value):
@ -204,7 +262,7 @@ class GitConfig(object):
    """
    return self._sections.get(section, set())
-  def HasSection(self, section, subsection = ''):
+  def HasSection(self, section, subsection=''):
    """Does at least one key in section.subsection exist?
    """
    try:
@ -255,33 +313,26 @@ class GitConfig(object):
  def _ReadJson(self):
    try:
-      if os.path.getmtime(self._json) \
+      if os.path.getmtime(self._json) <= os.path.getmtime(self.file):
-      <= os.path.getmtime(self.file):
+        platform_utils.remove(self._json)
        os.remove(self._json)
        return None
    except OSError:
      return None
    try:
      Trace(': parsing %s', self.file)
-      fd = open(self._json)
+      with open(self._json) as fd:
      try:
        return json.load(fd)
      finally:
        fd.close()
    except (IOError, ValueError):
-      os.remove(self._json)
+      platform_utils.remove(self._json)
      return None
  def _SaveJson(self, cache):
    try:
-      fd = open(self._json, 'w')
+      with open(self._json, 'w') as fd:
      try:
        json.dump(cache, fd, indent=2)
      finally:
        fd.close()
    except (IOError, TypeError):
      if os.path.exists(self._json):
-        os.remove(self._json)
+        platform_utils.remove(self._json)
  def _ReadGit(self):
    """
@ -294,8 +345,9 @@ class GitConfig(object):
    d = self._do('--null', '--list')
    if d is None:
      return c
-    for line in d.decode('utf-8').rstrip('\0').split('\0'):  # pylint: disable=W1401
+    if not is_python3():
-                                                             # Backslash is not anomalous
+      d = d.decode('utf-8')
    for line in d.rstrip('\0').split('\0'):
      if '\n' in line:
        key, val = line.split('\n', 1)
      else:
@ -310,19 +362,25 @@ class GitConfig(object):
    return c
  def _do(self, *args):
-    command = ['config', '--file', self.file]
+    command = ['config', '--file', self.file, '--includes']
    command.extend(args)
    p = GitCommand(None,
                   command,
-                   capture_stdout = True,
+                   capture_stdout=True,
-                   capture_stderr = True)
+                   capture_stderr=True)
    if p.Wait() == 0:
      return p.stdout
    else:
      GitError('git config %s: %s' % (str(args), p.stderr))
 class RepoConfig(GitConfig):
  """User settings for repo itself."""
  _USER_CONFIG = '~/.repoconfig/config'
 class RefSpec(object):
  """A Git refspec line, split into its components:
@ -384,6 +442,7 @@ _master_keys = set()
 _ssh_master = True
 _master_keys_lock = None
 def init_ssh():
  """Should be called once at the start of repo to init ssh master handling.
@ -393,6 +452,7 @@ def init_ssh():
  assert _master_keys_lock is None, "Should only call init_ssh once"
  _master_keys_lock = _threading.Lock()
 def _open_ssh(host, port=None):
  global _ssh_master
@ -413,17 +473,17 @@ def _open_ssh(host, port=None):
    if key in _master_keys:
      return True
-    if not _ssh_master \
+    if (not _ssh_master
-    or 'GIT_SSH' in os.environ \
+            or 'GIT_SSH' in os.environ
-    or sys.platform in ('win32', 'cygwin'):
+            or sys.platform in ('win32', 'cygwin')):
      # failed earlier, or cygwin ssh can't do this
      #
      return False
    # We will make two calls to ssh; this is the common part of both calls.
    command_base = ['ssh',
-                     '-o','ControlPath %s' % ssh_sock(),
+                    '-o', 'ControlPath %s' % ssh_sock(),
-                     host]
+                    host]
    if port is not None:
      command_base[1:1] = ['-p', str(port)]
@ -431,13 +491,13 @@ def _open_ssh(host, port=None):
    # ...but before actually starting a master, we'll double-check.  This can
    # be important because we can't tell that that 'git@myhost.com' is the same
    # as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file.
-    check_command = command_base + ['-O','check']
+    check_command = command_base + ['-O', 'check']
    try:
      Trace(': %s', ' '.join(check_command))
      check_process = subprocess.Popen(check_command,
                                       stdout=subprocess.PIPE,
                                       stderr=subprocess.PIPE)
-      check_process.communicate() # read output, but ignore it...
+      check_process.communicate()  # read output, but ignore it...
      isnt_running = check_process.wait()
      if not isnt_running:
@ -450,25 +510,28 @@ def _open_ssh(host, port=None):
      # to the log there.
      pass
-    command = command_base[:1] + \
+    command = command_base[:1] + ['-M', '-N'] + command_base[1:]
              ['-M', '-N'] + \
              command_base[1:]
    try:
      Trace(': %s', ' '.join(command))
      p = subprocess.Popen(command)
    except Exception as e:
      _ssh_master = False
      print('\nwarn: cannot enable ssh control master for %s:%s\n%s'
-             % (host,port, str(e)), file=sys.stderr)
+            % (host, port, str(e)), file=sys.stderr)
      return False
    time.sleep(1)
    ssh_died = (p.poll() is not None)
    if ssh_died:
      return False
    _master_processes.append(p)
    _master_keys.add(key)
    time.sleep(1)
    return True
  finally:
    _master_keys_lock.release()
 def close_ssh():
  global _master_keys_lock
@ -476,7 +539,7 @@ def close_ssh():
  for p in _master_processes:
    try:
-      os.kill(p.pid, SIGTERM)
+      os.kill(p.pid, signal.SIGTERM)
      p.wait()
    except OSError:
      pass
@ -486,22 +549,66 @@ def close_ssh():
  d = ssh_sock(create=False)
  if d:
    try:
-      os.rmdir(os.path.dirname(d))
+      platform_utils.rmdir(os.path.dirname(d))
    except OSError:
      pass
  # We're done with the lock, so we can delete it.
  _master_keys_lock = None
 URI_SCP = re.compile(r'^([^@:]*@?[^:/]{1,}):')
 URI_ALL = re.compile(r'^([a-z][a-z+-]*)://([^@/]*@?[^/]*)/')
 def GetSchemeFromUrl(url):
  m = URI_ALL.match(url)
  if m:
    return m.group(1)
  return None
@contextlib.contextmanager
 def GetUrlCookieFile(url, quiet):
  if url.startswith('persistent-'):
    try:
      p = subprocess.Popen(
          ['git-remote-persistent-https', '-print_config', url],
          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
          stderr=subprocess.PIPE)
      try:
        cookieprefix = 'http.cookiefile='
        proxyprefix = 'http.proxy='
        cookiefile = None
        proxy = None
        for line in p.stdout:
          line = line.strip().decode('utf-8')
          if line.startswith(cookieprefix):
            cookiefile = os.path.expanduser(line[len(cookieprefix):])
          if line.startswith(proxyprefix):
            proxy = line[len(proxyprefix):]
        # Leave subprocess open, as cookie file may be transient.
        if cookiefile or proxy:
          yield cookiefile, proxy
          return
      finally:
        p.stdin.close()
        if p.wait():
          err_msg = p.stderr.read().decode('utf-8')
          if ' -print_config' in err_msg:
            pass  # Persistent proxy doesn't support -print_config.
          elif not quiet:
            print(err_msg, file=sys.stderr)
    except OSError as e:
      if e.errno == errno.ENOENT:
        pass  # No persistent proxy.
      raise
  cookiefile = GitConfig.ForUser().GetString('http.cookiefile')
  if cookiefile:
    cookiefile = os.path.expanduser(cookiefile)
  yield cookiefile, None
 def _preconnect(url):
  m = URI_ALL.match(url)
  if m:
@ -522,17 +629,20 @@ def _preconnect(url):
  return False
 class Remote(object):
  """Configuration options related to a remote.
  """
  def __init__(self, config, name):
    self._config = config
    self.name = name
    self.url = self._Get('url')
    self.pushUrl = self._Get('pushurl')
    self.review = self._Get('review')
    self.projectname = self._Get('projectname')
    self.fetch = list(map(RefSpec.FromString,
-                      self._Get('fetch', all_keys=True)))
+                          self._Get('fetch', all_keys=True)))
    self._review_url = None
  def _InsteadOf(self):
@ -546,8 +656,8 @@ class Remote(object):
      insteadOfList = globCfg.GetString(key, all_keys=True)
      for insteadOf in insteadOfList:
-        if self.url.startswith(insteadOf) \
+        if (self.url.startswith(insteadOf)
-        and len(insteadOf) > len(longest):
+                and len(insteadOf) > len(longest)):
          longest = insteadOf
          longestUrl = url
@ -560,7 +670,7 @@ class Remote(object):
    connectionUrl = self._InsteadOf()
    return _preconnect(connectionUrl)
-  def ReviewUrl(self, userEmail):
+  def ReviewUrl(self, userEmail, validate_certs):
    if self._review_url is None:
      if self.review is None:
        return None
@ -568,7 +678,7 @@ class Remote(object):
      u = self.review
      if u.startswith('persistent-'):
        u = u[len('persistent-'):]
-      if u.split(':')[0] not in ('http', 'https', 'sso'):
+      if u.split(':')[0] not in ('http', 'https', 'sso', 'ssh'):
        u = 'http://%s' % u
      if u.endswith('/Gerrit'):
        u = u[:len(u) - len('/Gerrit')]
@ -584,20 +694,28 @@ class Remote(object):
        host, port = os.environ['REPO_HOST_PORT_INFO'].split()
        self._review_url = self._SshReviewUrl(userEmail, host, port)
        REVIEW_CACHE[u] = self._review_url
-      elif u.startswith('sso:'):
+      elif u.startswith('sso:') or u.startswith('ssh:'):
        self._review_url = u  # Assume it's right
        REVIEW_CACHE[u] = self._review_url
      elif 'REPO_IGNORE_SSH_INFO' in os.environ:
        self._review_url = http_url
        REVIEW_CACHE[u] = self._review_url
      else:
        try:
          info_url = u + 'ssh_info'
-          info = urllib.request.urlopen(info_url).read()
+          if not validate_certs:
-          if info == 'NOT_AVAILABLE' or '<' in info:
+              context = ssl._create_unverified_context()
              info = urllib.request.urlopen(info_url, context=context).read()
          else:
              info = urllib.request.urlopen(info_url).read()
          if info == b'NOT_AVAILABLE' or b'<' in info:
            # If `info` contains '<', we assume the server gave us some sort
            # of HTML response back, like maybe a login page.
            #
            # Assume HTTP if SSH is not enabled or ssh_info doesn't look right.
            self._review_url = http_url
          else:
            info = info.decode('utf-8')
            host, port = info.split()
            self._review_url = self._SshReviewUrl(userEmail, host, port)
        except urllib.error.HTTPError as e:
@ -632,7 +750,8 @@ class Remote(object):
    if not rev.startswith(R_HEADS):
      return rev
-    raise GitError('remote %s does not have %s' % (self.name, rev))
+    raise GitError('%s: remote %s does not have %s' %
                   (self.projectname, self.name, rev))
  def WritesTo(self, ref):
    """True if the remote stores to the tracking ref.
@ -655,6 +774,10 @@ class Remote(object):
    """Save this remote to the configuration.
    """
    self._Set('url', self.url)
    if self.pushUrl is not None:
      self._Set('pushurl', self.pushUrl + '/' + self.projectname)
    else:
      self._Set('pushurl', self.pushUrl)
    self._Set('review', self.review)
    self._Set('projectname', self.projectname)
    self._Set('fetch', list(map(str, self.fetch)))
@ -665,12 +788,13 @@ class Remote(object):
  def _Get(self, key, all_keys=False):
    key = 'remote.%s.%s' % (self.name, key)
-    return self._config.GetString(key, all_keys = all_keys)
+    return self._config.GetString(key, all_keys=all_keys)
 class Branch(object):
  """Configuration options related to a single branch.
  """
  def __init__(self, config, name):
    self._config = config
    self.name = name
@ -701,15 +825,12 @@ class Branch(object):
      self._Set('merge', self.merge)
    else:
-      fd = open(self._config.file, 'a')
+      with open(self._config.file, 'a') as fd:
      try:
        fd.write('[branch "%s"]\n' % self.name)
        if self.remote:
          fd.write('\tremote = %s\n' % self.remote.name)
        if self.merge:
          fd.write('\tmerge = %s\n' % self.merge)
      finally:
        fd.close()
  def _Set(self, key, value):
    key = 'branch.%s.%s' % (self.name, key)
@ -717,4 +838,4 @@ class Branch(object):
  def _Get(self, key, all_keys=False):
    key = 'branch.%s.%s' % (self.name, key)
-    return self._config.GetString(key, all_keys = all_keys)
+    return self._config.GetString(key, all_keys=all_keys)
--- a/git_refs.py
+++ b/git_refs.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -14,13 +15,17 @@
 # limitations under the License.
 import os
-from trace import Trace
+from repo_trace import Trace
 import platform_utils
-HEAD    = 'HEAD'
+HEAD = 'HEAD'
 R_CHANGES = 'refs/changes/'
 R_HEADS = 'refs/heads/'
-R_TAGS  = 'refs/tags/'
+R_TAGS = 'refs/tags/'
-R_PUB   = 'refs/published/'
+R_PUB = 'refs/published/'
-R_M     = 'refs/remotes/m/'
+R_WORKTREE = 'refs/worktree/'
 R_WORKTREE_M = R_WORKTREE + 'm/'
 R_M = 'refs/remotes/m/'
 class GitRefs(object):
@ -126,9 +131,9 @@ class GitRefs(object):
  def _ReadLoose(self, prefix):
    base = os.path.join(self._gitdir, prefix)
-    for name in os.listdir(base):
+    for name in platform_utils.listdir(base):
      p = os.path.join(base, name)
-      if os.path.isdir(p):
+      if platform_utils.isdir(p):
        self._mtime[prefix] = os.path.getmtime(base)
        self._ReadLoose(prefix + name + '/')
      elif name.endswith('.lock'):
@ -138,18 +143,11 @@ class GitRefs(object):
  def _ReadLoose1(self, path, name):
    try:
-      fd = open(path, 'rb')
+      with open(path) as fd:
    except IOError:
      return
    try:
      try:
        mtime = os.path.getmtime(path)
        ref_id = fd.readline()
-      except (IOError, OSError):
+    except (IOError, OSError):
-        return
+      return
    finally:
      fd.close()
    try:
      ref_id = ref_id.decode()
--- a/15
+++ b/15
@ -1,2 +1,17 @@
 #!/bin/sh
 #
 # Copyright (C) 2009 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.
 exec ssh -o "ControlMaster no" -o "ControlPath $REPO_SSH_SOCK" "$@"
--- a/gitc_utils.py
+++ b/gitc_utils.py
@ -0,0 +1,161 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2015 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.
 from __future__ import print_function
 import os
 import platform
 import re
 import sys
 import time
 import git_command
 import git_config
 import wrapper
 from error import ManifestParseError
 NUM_BATCH_RETRIEVE_REVISIONID = 32
 def get_gitc_manifest_dir():
  return wrapper.Wrapper().get_gitc_manifest_dir()
 def parse_clientdir(gitc_fs_path):
  return wrapper.Wrapper().gitc_parse_clientdir(gitc_fs_path)
 def _set_project_revisions(projects):
  """Sets the revisionExpr for a list of projects.
  Because of the limit of open file descriptors allowed, length of projects
  should not be overly large. Recommend calling this function multiple times
  with each call not exceeding NUM_BATCH_RETRIEVE_REVISIONID projects.
  @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.
  project_gitcmds = [(
      project, git_command.GitCommand(None,
                                      ['ls-remote',
                                       project.remote.url,
                                       project.revisionExpr],
                                      capture_stdout=True, cwd='/tmp'))
                     for project in projects if not git_config.IsId(project.revisionExpr)]
  for proj, gitcmd in project_gitcmds:
    if gitcmd.Wait():
      print('FATAL: Failed to retrieve revisionExpr for %s' % proj)
      sys.exit(1)
    revisionExpr = gitcmd.stdout.split('\t')[0]
    if not revisionExpr:
      raise ManifestParseError('Invalid SHA-1 revision project %s (%s)' %
                               (proj.remote.url, proj.revisionExpr))
    proj.revisionExpr = revisionExpr
 def _manifest_groups(manifest):
  """Returns the manifest group string that should be synced
  This is the same logic used by Command.GetProjects(), which is used during
  repo sync
  @param manifest: The XmlManifest object
  """
  mp = manifest.manifestProject
  groups = mp.config.GetString('manifest.groups')
  if not groups:
    groups = 'default,platform-' + platform.system().lower()
  return groups
 def generate_gitc_manifest(gitc_manifest, manifest, paths=None):
  """Generate a manifest for shafsd to use for this GITC client.
  @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 '
        'project.')
  if paths is None:
    paths = list(manifest.paths.keys())
  groups = [x for x in re.split(r'[,\s]+', _manifest_groups(manifest)) if x]
  # Convert the paths to projects, and filter them to the matched groups.
  projects = [manifest.paths[p] for p in paths]
  projects = [p for p in projects if p.MatchesGroups(groups)]
  if gitc_manifest is not None:
    for path, proj in manifest.paths.items():
      if not proj.MatchesGroups(groups):
        continue
      if not proj.upstream and not git_config.IsId(proj.revisionExpr):
        proj.upstream = proj.revisionExpr
      if path not in gitc_manifest.paths:
        # Any new projects need their first revision, even if we weren't asked
        # for them.
        projects.append(proj)
      elif path not in paths:
        # And copy revisions from the previous manifest if we're not updating
        # them now.
        gitc_proj = gitc_manifest.paths[path]
        if gitc_proj.old_revision:
          proj.revisionExpr = None
          proj.old_revision = gitc_proj.old_revision
        else:
          proj.revisionExpr = gitc_proj.revisionExpr
  index = 0
  while index < len(projects):
    _set_project_revisions(
        projects[index:(index + NUM_BATCH_RETRIEVE_REVISIONID)])
    index += NUM_BATCH_RETRIEVE_REVISIONID
  if gitc_manifest is not None:
    for path, proj in gitc_manifest.paths.items():
      if proj.old_revision and path in paths:
        # If we updated a project that has been started, keep the old-revision
        # updated.
        repo_proj = manifest.paths[path]
        repo_proj.old_revision = repo_proj.revisionExpr
        repo_proj.revisionExpr = None
  # Convert URLs from relative to absolute.
  for _name, remote in manifest.remotes.items():
    remote.fetchUrl = remote.resolvedFetchUrl
  # Save the manifest.
  save_manifest(manifest)
 def save_manifest(manifest, client_dir=None):
  """Save the manifest file in the client_dir.
  @param client_dir: Client directory to save the manifest in.
  @param manifest: Manifest object to save.
  """
  if not client_dir:
    client_dir = manifest.gitc_client_dir
  with open(os.path.join(client_dir, '.manifest'), 'w') as f:
    manifest.Save(f, groups=_manifest_groups(manifest))
  # TODO(sbasi/jorg): Come up with a solution to remove the sleep below.
  # Give the GITC filesystem time to register the manifest changes.
  time.sleep(3)
--- a/hooks/commit-msg
+++ b/hooks/commit-msg
@ -1,6 +1,7 @@
 #!/bin/sh
 # From Gerrit Code Review 3.1.3
 #
-# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
+# Part of Gerrit Code Review (https://www.gerritcodereview.com/)
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -15,166 +16,48 @@
 # 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.
 #
-unset GREP_OPTIONS
+# avoid [[ which is not POSIX sh.
 if test "$#" != 1 ; then
  echo "$0 requires an argument."
  exit 1
 fi
-CHANGE_ID_AFTER="Bug|Issue"
+if test ! -f "$1" ; then
-MSG="$1"
+  echo "file does not exist: $1"
  exit 1
 fi
-# Check for, and add if missing, a unique Change-Id
+# Do not create a change id if requested
-#
+if test "false" = "`git config --bool --get gerrit.createChangeId`" ; then
-add_ChangeId() {
+  exit 0
-	clean_message=`sed -e '
+fi
 		/^diff --git .*/{
 			s///
 			q
 		}
 		/^Signed-off-by:/d
 		/^#/d
 	' "$MSG" | git stripspace`
 	if test -z "$clean_message"
 	then
 		return
 	fi
-	if test "false" = "`git config --bool --get gerrit.createChangeId`"
+# $RANDOM will be undefined if not using bash, so don't use set -u
-	then
+random=$( (whoami ; hostname ; date; cat $1 ; echo $RANDOM) | git hash-object --stdin)
-		return
+dest="$1.tmp.${random}"
 	fi
-	# Does Change-Id: already exist? if so, exit (no change).
+trap 'rm -f "${dest}"' EXIT
 	if grep -i '^Change-Id:' "$MSG" >/dev/null
 	then
 		return
 	fi
-	id=`_gen_ChangeId`
+if ! git stripspace --strip-comments < "$1" > "${dest}" ; then
-	T="$MSG.tmp.$$"
+   echo "cannot strip comments from $1"
-	AWK=awk
+   exit 1
-	if [ -x /usr/xpg4/bin/awk ]; then
+fi
 		# Solaris AWK is just too broken
 		AWK=/usr/xpg4/bin/awk
 	fi
-	# How this works:
+if test ! -s "${dest}" ; then
-	# - parse the commit message as (textLine+ blankLine*)*
+  echo "file is empty: $1"
-	# - assume textLine+ to be a footer until proven otherwise
+  exit 1
-	# - exception: the first block is not footer (as it is the title)
+fi
 	# - read textLine+ into a variable
 	# - then count blankLines
 	# - once the next textLine appears, print textLine+ blankLine* as these
 	#   aren't footer
 	# - in END, the last textLine+ block is available for footer parsing
 	$AWK '
 	BEGIN {
 		# while we start with the assumption that textLine+
 		# is a footer, the first block is not.
 		isFooter = 0
 		footerComment = 0
 		blankLines = 0
 	}
-	# Skip lines starting with "#" without any spaces before it.
+# Avoid the --in-place option which only appeared in Git 2.8
-	/^#/ { next }
+# Avoid the --if-exists option which only appeared in Git 2.15
 if ! git -c trailer.ifexists=doNothing interpret-trailers \
      --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then
  echo "cannot insert change-id line in $1"
  exit 1
 fi
-	# Skip the line starting with the diff command and everything after it,
+if ! mv "${dest}" "$1" ; then
-	# up to the end of the file, assuming it is only patch data.
+  echo "cannot mv ${dest} to $1"
-	# If more than one line before the diff was empty, strip all but one.
+  exit 1
-	/^diff --git / {
+fi
 		blankLines = 0
 		while (getline) { }
 		next
 	}
 	# Count blank lines outside footer comments
 	/^$/ && (footerComment == 0) {
 		blankLines++
 		next
 	}
 	# Catch footer comment
 	/^\[[a-zA-Z0-9-]+:/ && (isFooter == 1) {
 		footerComment = 1
 	}
 	/]$/ && (footerComment == 1) {
 		footerComment = 2
 	}
 	# We have a non-blank line after blank lines. Handle this.
 	(blankLines > 0) {
 		print lines
 		for (i = 0; i < blankLines; i++) {
 			print ""
 		}
 		lines = ""
 		blankLines = 0
 		isFooter = 1
 		footerComment = 0
 	}
 	# Detect that the current block is not the footer
 	(footerComment == 0) && (!/^\[?[a-zA-Z0-9-]+:/ || /^[a-zA-Z0-9-]+:\/\//) {
 		isFooter = 0
 	}
 	{
 		# We need this information about the current last comment line
 		if (footerComment == 2) {
 			footerComment = 0
 		}
 		if (lines != "") {
 			lines = lines "\n";
 		}
 		lines = lines $0
 	}
 	# Footer handling:
 	# If the last block is considered a footer, splice in the Change-Id at the
 	# right place.
 	# Look for the right place to inject Change-Id by considering
 	# CHANGE_ID_AFTER. Keys listed in it (case insensitive) come first,
 	# then Change-Id, then everything else (eg. Signed-off-by:).
 	#
 	# Otherwise just print the last block, a new line and the Change-Id as a
 	# block of its own.
 	END {
 		unprinted = 1
 		if (isFooter == 0) {
 			print lines "\n"
 			lines = ""
 		}
 		changeIdAfter = "^(" tolower("'"$CHANGE_ID_AFTER"'") "):"
 		numlines = split(lines, footer, "\n")
 		for (line = 1; line <= numlines; line++) {
 			if (unprinted && match(tolower(footer[line]), changeIdAfter) != 1) {
 				unprinted = 0
 				print "Change-Id: I'"$id"'"
 			}
 			print footer[line]
 		}
 		if (unprinted) {
 			print "Change-Id: I'"$id"'"
 		}
 	}' "$MSG" > "$T" && mv "$T" "$MSG" || rm -f "$T"
 }
 _gen_ChangeIdInput() {
 	echo "tree `git write-tree`"
 	if parent=`git rev-parse "HEAD^0" 2>/dev/null`
 	then
 		echo "parent $parent"
 	fi
 	echo "author `git var GIT_AUTHOR_IDENT`"
 	echo "committer `git var GIT_COMMITTER_IDENT`"
 	echo
 	printf '%s' "$clean_message"
 }
 _gen_ChangeId() {
 	_gen_ChangeIdInput |
 	git hash-object -t commit --stdin
 }
 add_ChangeId
--- a/hooks/pre-auto-gc
+++ b/hooks/pre-auto-gc
@ -1,9 +1,9 @@
 #!/bin/sh
 #
 # An example hook script to verify if you are on battery, in case you
-# are running Linux or OS X. Called by git-gc --auto with no arguments.
+# are running Windows, Linux or OS X. Called by git-gc --auto with no
-# The hook should exit with non-zero status after issuing an appropriate
+# arguments. The hook should exit with non-zero status after issuing an
-# message if it wants to stop the auto repacking.
+# appropriate message if it wants to stop the auto repacking.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -19,7 +19,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-if test -x /sbin/on_ac_power && /sbin/on_ac_power
+if uname -s | grep -q "_NT-"
 then
 	if test -x $SYSTEMROOT/System32/Wbem/wmic
 	then
 		STATUS=$(wmic path win32_battery get batterystatus /format:list | tr -d '\r\n')
 		[ "$STATUS" = "BatteryStatus=2" ] && exit 0 || exit 1
 	fi
 	exit 0
 fi
 if test -x /sbin/on_ac_power && (/sbin/on_ac_power;test $? -ne 1)
 then
 	exit 0
 elif test "$(cat /sys/class/power_supply/AC/online 2>/dev/null)" = 1
--- a/main.py
+++ b/main.py
@ -1,4 +1,5 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -14,19 +15,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """The repo tool.
 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 imp
 import netrc
 import optparse
 import os
 import shlex
 import sys
 import textwrap
 import time
 from pyversion import is_python3
 if is_python3():
  import urllib.request
 else:
  import imp
  import urllib2
  urllib = imp.new_module('urllib')
  urllib.request = urllib2
@ -37,11 +46,13 @@ except ImportError:
  kerberos = None
 from color import SetDefaultColoring
-from trace import SetTrace
+import event_log
-from git_command import git, GitCommand
+from repo_trace import SetTrace
-from git_config import init_ssh, close_ssh
+from git_command import user_agent
 from git_config import init_ssh, close_ssh, RepoConfig
 from command import InteractiveCommand
 from command import MirrorSafeCommand
 from command import GitcAvailableCommand, GitcClientCommand
 from subcmds.version import Version
 from editor import Editor
 from error import DownloadError
@ -51,48 +62,82 @@ from error import ManifestParseError
 from error import NoManifestException
 from error import NoSuchProjectError
 from error import RepoChangedException
-from manifest_xml import XmlManifest
+import gitc_utils
-from pager import RunPager
+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():
-  # pylint:disable=W0622
+  input = raw_input  # noqa: F821
-  input = raw_input
+
-  # pylint:enable=W0622
+# 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
 # different repo releases while source versions might require a newer python.
 #
 # The soft version is when we start warning users that the version is old and
 # we'll be dropping support for it.  We'll refuse to work with versions older
 # than the hard version.
 #
 # python-3.6 is in Ubuntu Bionic.
 MIN_PYTHON_VERSION_SOFT = (3, 6)
 MIN_PYTHON_VERSION_HARD = (3, 4)
 if sys.version_info.major < 3:
  print('repo: warning: Python 2 is no longer supported; '
        'Please upgrade to Python {}.{}+.'.format(*MIN_PYTHON_VERSION_SOFT),
        file=sys.stderr)
 else:
  if sys.version_info < MIN_PYTHON_VERSION_HARD:
    print('repo: error: Python 3 version is too old; '
          'Please upgrade to Python {}.{}+.'.format(*MIN_PYTHON_VERSION_SOFT),
          file=sys.stderr)
    sys.exit(1)
  elif sys.version_info < MIN_PYTHON_VERSION_SOFT:
    print('repo: warning: your Python 3 version is no longer supported; '
          'Please upgrade to Python {}.{}+.'.format(*MIN_PYTHON_VERSION_SOFT),
          file=sys.stderr)
 global_options = optparse.OptionParser(
-                 usage="repo [-p|--paginate|--no-pager] COMMAND [ARGS]"
+    usage='repo [-p|--paginate|--no-pager] COMMAND [ARGS]',
-                 )
+    add_help_option=False)
 global_options.add_option('-h', '--help', action='store_true',
                          help='show this help message and exit')
 global_options.add_option('-p', '--paginate',
                          dest='pager', action='store_true',
                          help='display command output in the pager')
 global_options.add_option('--no-pager',
-                          dest='no_pager', action='store_true',
+                          dest='pager', action='store_false',
                          help='disable the pager')
 global_options.add_option('--color',
                          choices=('auto', 'always', 'never'), default=None,
                          help='control color usage: auto, always, never')
 global_options.add_option('--trace',
                          dest='trace', action='store_true',
-                          help='trace git command execution')
+                          help='trace git command execution (REPO_TRACE=1)')
 global_options.add_option('--trace-python',
                          dest='trace_python', action='store_true',
                          help='trace python command execution')
 global_options.add_option('--time',
                          dest='time', action='store_true',
                          help='time repo command execution')
 global_options.add_option('--version',
                          dest='show_version', action='store_true',
                          help='display this version of repo')
 global_options.add_option('--event-log',
                          dest='event_log', action='store',
                          help='filename of event log to append timeline to')
 class _Repo(object):
  def __init__(self, repodir):
    self.repodir = repodir
    self.commands = all_commands
    # add 'branch' as an alias for 'branches'
    all_commands['branch'] = all_commands['branches']
-  def _Run(self, argv):
+  def _ParseArgs(self, argv):
-    result = 0
+    """Parse the main `repo` command line options."""
    name = None
    glob = []
@ -109,6 +154,44 @@ class _Repo(object):
      argv = []
    gopts, _gargs = global_options.parse_args(glob)
    name, alias_args = self._ExpandAlias(name)
    argv = alias_args + argv
    if gopts.help:
      global_options.print_help()
      commands = ' '.join(sorted(self.commands))
      wrapped_commands = textwrap.wrap(commands, width=77)
      print('\nAvailable commands:\n  %s' % ('\n  '.join(wrapped_commands),))
      print('\nRun `repo help <command>` for command-specific details.')
      global_options.exit()
    return (name, gopts, argv)
  def _ExpandAlias(self, name):
    """Look up user registered aliases."""
    # We don't resolve aliases for existing subcommands.  This matches git.
    if name in self.commands:
      return name, []
    key = 'alias.%s' % (name,)
    alias = RepoConfig.ForRepository(self.repodir).GetString(key)
    if alias is None:
      alias = RepoConfig.ForUser().GetString(key)
    if alias is None:
      return name, []
    args = alias.strip().split(' ', 1)
    name = args[0]
    if len(args) == 2:
      args = shlex.split(args[1])
    else:
      args = []
    return name, args
  def _Run(self, name, gopts, argv):
    """Execute the requested subcommand."""
    result = 0
    if gopts.trace:
      SetTrace()
    if gopts.show_version:
@ -121,7 +204,7 @@ class _Repo(object):
    SetDefaultColoring(gopts.color)
    try:
-      cmd = self.commands[name]
+      cmd = self.commands[name]()
    except KeyError:
      print("repo: '%s' is not a repo command.  See 'repo help'." % name,
            file=sys.stderr)
@ -129,6 +212,12 @@ class _Repo(object):
    cmd.repodir = self.repodir
    cmd.manifest = XmlManifest(cmd.repodir)
    cmd.gitc_manifest = None
    gitc_client_name = gitc_utils.parse_clientdir(os.getcwd())
    if gitc_client_name:
      cmd.gitc_manifest = GitcManifest(cmd.repodir, gitc_client_name)
      cmd.manifest.isGitcClient = True
    Editor.globalConfig = cmd.manifest.globalConfig
    if not isinstance(cmd, MirrorSafeCommand) and cmd.manifest.IsMirror:
@ -136,17 +225,27 @@ class _Repo(object):
            file=sys.stderr)
      return 1
    if isinstance(cmd, GitcAvailableCommand) and not gitc_utils.get_gitc_manifest_dir():
      print("fatal: '%s' requires GITC to be available" % name,
            file=sys.stderr)
      return 1
    if isinstance(cmd, GitcClientCommand) and not gitc_client_name:
      print("fatal: '%s' requires a GITC client" % name,
            file=sys.stderr)
      return 1
    try:
      copts, cargs = cmd.OptionParser.parse_args(argv)
      copts = cmd.ReadEnvironmentOptions(copts)
    except NoManifestException as e:
      print('error: in `%s`: %s' % (' '.join([name] + argv), str(e)),
-        file=sys.stderr)
+            file=sys.stderr)
      print('error: manifest missing or unreadable -- please run init',
            file=sys.stderr)
      return 1
-    if not gopts.no_pager and not isinstance(cmd, InteractiveCommand):
+    if gopts.pager is not False and not isinstance(cmd, InteractiveCommand):
      config = cmd.manifest.globalConfig
      if gopts.pager:
        use_pager = True
@ -158,12 +257,15 @@ class _Repo(object):
        RunPager(config)
    start = time.time()
    cmd_event = cmd.event_log.Add(name, event_log.TASK_COMMAND, start)
    cmd.event_log.SetParent(cmd_event)
    try:
      cmd.ValidateOptions(copts, cargs)
      result = cmd.Execute(copts, cargs)
    except (DownloadError, ManifestInvalidRevisionError,
-        NoManifestException) as e:
+            NoManifestException) as e:
      print('error: in `%s`: %s' % (' '.join([name] + argv), str(e)),
-        file=sys.stderr)
+            file=sys.stderr)
      if isinstance(e, NoManifestException):
        print('error: manifest missing or unreadable -- please run init',
              file=sys.stderr)
@ -178,10 +280,16 @@ class _Repo(object):
      if e.name:
        print('error: project group must be enabled for project %s' % e.name, file=sys.stderr)
      else:
-        print('error: project group must be enabled for the project in the current directory', file=sys.stderr)
+        print('error: project group must be enabled for the project in the current directory',
              file=sys.stderr)
      result = 1
    except SystemExit as e:
      if e.code:
        result = e.code
      raise
    finally:
-      elapsed = time.time() - start
+      finish = time.time()
      elapsed = finish - start
      hours, remainder = divmod(elapsed, 3600)
      minutes, seconds = divmod(remainder, 60)
      if gopts.time:
@ -191,49 +299,75 @@ class _Repo(object):
          print('real\t%dh%dm%.3fs' % (hours, minutes, seconds),
                file=sys.stderr)
      cmd.event_log.FinishEvent(cmd_event, finish,
                                result is None or result == 0)
      if gopts.event_log:
        cmd.event_log.Write(os.path.abspath(
                            os.path.expanduser(gopts.event_log)))
    return result
-def _MyRepoPath():
+def _CheckWrapperVersion(ver_str, repo_path):
-  return os.path.dirname(__file__)
+  """Verify the repo launcher is new enough for this checkout.
  Args:
    ver_str: The version string passed from the repo launcher when it ran us.
    repo_path: The path to the repo launcher that loaded us.
  """
  # Refuse to work with really old wrapper versions.  We don't test these,
  # so might as well require a somewhat recent sane version.
  # v1.15 of the repo launcher was released in ~Mar 2012.
  MIN_REPO_VERSION = (1, 15)
  min_str = '.'.join(str(x) for x in MIN_REPO_VERSION)
 def _CheckWrapperVersion(ver, repo_path):
  if not repo_path:
    repo_path = '~/bin/repo'
-  if not ver:
+  if not ver_str:
    print('no --wrapper-version argument', file=sys.stderr)
    sys.exit(1)
  # Pull out the version of the repo launcher we know about to compare.
  exp = Wrapper().VERSION
-  ver = tuple(map(int, ver.split('.')))
+  ver = tuple(map(int, ver_str.split('.')))
  if len(ver) == 1:
    ver = (0, ver[0])
  exp_str = '.'.join(map(str, exp))
-  if exp[0] > ver[0] or ver < (0, 4):
+  if ver < MIN_REPO_VERSION:
    print("""
-!!! A new repo command (%5s) is available.    !!!
+repo: error:
-!!! You must upgrade before you can continue:   !!!
+!!! Your version of repo %s is too old.
 !!! We need at least version %s.
 !!! A new version of repo (%s) is available.
 !!! You must upgrade before you can continue:
    cp %s %s
-""" % (exp_str, WrapperPath(), repo_path), file=sys.stderr)
+""" % (ver_str, min_str, exp_str, WrapperPath(), repo_path), file=sys.stderr)
    sys.exit(1)
  if exp > ver:
-    print("""
+    print('\n... A new version of repo (%s) is available.' % (exp_str,),
-... A new repo command (%5s) is available.
+          file=sys.stderr)
    if os.access(repo_path, os.W_OK):
      print("""\
 ... You should upgrade soon:
    cp %s %s
-""" % (exp_str, WrapperPath(), repo_path), file=sys.stderr)
+""" % (WrapperPath(), repo_path), file=sys.stderr)
    else:
      print("""\
 ... New version is available at: %s
 ... The launcher is run from: %s
 !!! The launcher is not writable.  Please talk to your sysadmin or distro
 !!! to get an update installed.
 """ % (WrapperPath(), repo_path), file=sys.stderr)
 def _CheckRepoDir(repo_dir):
  if not repo_dir:
    print('no --repo-dir argument', file=sys.stderr)
    sys.exit(1)
 def _PruneOptions(argv, opt):
  i = 0
  while i < len(argv):
@ -249,53 +383,17 @@ def _PruneOptions(argv, opt):
      continue
    i += 1
 _user_agent = None
 def _UserAgent():
  global _user_agent
  if _user_agent is None:
    py_version = sys.version_info
    os_name = sys.platform
    if os_name == 'linux2':
      os_name = 'Linux'
    elif os_name == 'win32':
      os_name = 'Win32'
    elif os_name == 'cygwin':
      os_name = 'Cygwin'
    elif os_name == 'darwin':
      os_name = 'Darwin'
    p = GitCommand(
      None, ['describe', 'HEAD'],
      cwd = _MyRepoPath(),
      capture_stdout = True)
    if p.Wait() == 0:
      repo_version = p.stdout
      if len(repo_version) > 0 and repo_version[-1] == '\n':
        repo_version = repo_version[0:-1]
      if len(repo_version) > 0 and repo_version[0] == 'v':
        repo_version = repo_version[1:]
    else:
      repo_version = 'unknown'
    _user_agent = 'git-repo/%s (%s) git/%s Python/%d.%d.%d' % (
      repo_version,
      os_name,
      '.'.join(map(str, git.version_tuple())),
      py_version[0], py_version[1], py_version[2])
  return _user_agent
 class _UserAgentHandler(urllib.request.BaseHandler):
  def http_request(self, req):
-    req.add_header('User-Agent', _UserAgent())
+    req.add_header('User-Agent', user_agent.repo)
    return req
  def https_request(self, req):
-    req.add_header('User-Agent', _UserAgent())
+    req.add_header('User-Agent', user_agent.repo)
    return req
 def _AddPasswordFromUserInput(handler, msg, req):
  # If repo could not find auth info from netrc, try to get it from user input
  url = req.get_full_url()
@ -309,22 +407,24 @@ def _AddPasswordFromUserInput(handler, msg, req):
      return
    handler.passwd.add_password(None, url, user, password)
 class _BasicAuthHandler(urllib.request.HTTPBasicAuthHandler):
  def http_error_401(self, req, fp, code, msg, headers):
    _AddPasswordFromUserInput(self, msg, req)
    return urllib.request.HTTPBasicAuthHandler.http_error_401(
-      self, req, fp, code, msg, headers)
+        self, req, fp, code, msg, headers)
  def http_error_auth_reqed(self, authreq, host, req, headers):
    try:
      old_add_header = req.add_header
      def _add_header(name, val):
        val = val.replace('\n', '')
        old_add_header(name, val)
      req.add_header = _add_header
      return urllib.request.AbstractBasicAuthHandler.http_error_auth_reqed(
-        self, authreq, host, req, headers)
+          self, authreq, host, req, headers)
-    except:
+    except Exception:
      reset = getattr(self, 'reset_retry_count', None)
      if reset is not None:
        reset()
@ -332,22 +432,24 @@ class _BasicAuthHandler(urllib.request.HTTPBasicAuthHandler):
        self.retried = 0
      raise
 class _DigestAuthHandler(urllib.request.HTTPDigestAuthHandler):
  def http_error_401(self, req, fp, code, msg, headers):
    _AddPasswordFromUserInput(self, msg, req)
    return urllib.request.HTTPDigestAuthHandler.http_error_401(
-      self, req, fp, code, msg, headers)
+        self, req, fp, code, msg, headers)
  def http_error_auth_reqed(self, auth_header, host, req, headers):
    try:
      old_add_header = req.add_header
      def _add_header(name, val):
        val = val.replace('\n', '')
        old_add_header(name, val)
      req.add_header = _add_header
      return urllib.request.AbstractDigestAuthHandler.http_error_auth_reqed(
-        self, auth_header, host, req, headers)
+          self, auth_header, host, req, headers)
-    except:
+    except Exception:
      reset = getattr(self, 'reset_retry_count', None)
      if reset is not None:
        reset()
@ -355,6 +457,7 @@ class _DigestAuthHandler(urllib.request.HTTPDigestAuthHandler):
        self.retried = 0
      raise
 class _KerberosAuthHandler(urllib.request.BaseHandler):
  def __init__(self):
    self.retried = 0
@ -373,7 +476,7 @@ class _KerberosAuthHandler(urllib.request.BaseHandler):
      if self.retried > 3:
        raise urllib.request.HTTPError(req.get_full_url(), 401,
-          "Negotiate auth failed", headers, None)
+                                       "Negotiate auth failed", headers, None)
      else:
        self.retried += 1
@ -389,7 +492,7 @@ class _KerberosAuthHandler(urllib.request.BaseHandler):
        return response
    except kerberos.GSSError:
      return None
-    except:
+    except Exception:
      self.reset_retry_count()
      raise
    finally:
@ -435,6 +538,7 @@ class _KerberosAuthHandler(urllib.request.BaseHandler):
      kerberos.authGSSClientClean(self.context)
      self.context = None
 def init_http():
  handlers = [_UserAgentHandler()]
@ -443,7 +547,7 @@ def init_http():
    n = netrc.netrc()
    for host in n.hosts:
      p = n.hosts[host]
-      mgr.add_password(p[1], 'http://%s/'  % host, p[0], p[2])
+      mgr.add_password(p[1], 'http://%s/' % host, p[0], p[2])
      mgr.add_password(p[1], 'https://%s/' % host, p[0], p[2])
  except netrc.NetrcParseError:
    pass
@ -462,6 +566,7 @@ def init_http():
    handlers.append(urllib.request.HTTPSHandler(debuglevel=1))
  urllib.request.install_opener(urllib.request.build_opener(*handlers))
 def _Main(argv):
  result = 0
@ -486,7 +591,15 @@ def _Main(argv):
    try:
      init_ssh()
      init_http()
-      result = repo._Run(argv) or 0
+      name, gopts, argv = repo._ParseArgs(argv)
      run = lambda: repo._Run(name, gopts, argv) or 0
      if gopts.trace_python:
        import trace
        tracer = trace.Trace(count=False, trace=True, timing=True,
                             ignoredirs=set(sys.path[1:]))
        result = tracer.runfunc(run)
      else:
        result = run()
    finally:
      close_ssh()
  except KeyboardInterrupt:
@ -501,13 +614,15 @@ def _Main(argv):
    argv = list(sys.argv)
    argv.extend(rce.extra_args)
    try:
-      os.execv(__file__, argv)
+      os.execv(sys.executable, [__file__] + argv)
    except OSError as e:
      print('fatal: cannot restart repo after upgrade', file=sys.stderr)
      print('fatal: %s' % e, file=sys.stderr)
      result = 128
  TerminatePager()
  sys.exit(result)
 if __name__ == '__main__':
  _Main(sys.argv[1:])
--- a/manifest_xml.py
+++ b/manifest_xml.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -29,28 +30,98 @@ else:
  urllib = imp.new_module('urllib')
  urllib.parse = urlparse
 import gitc_utils
 from git_config import GitConfig
 from git_refs import R_HEADS, HEAD
 import platform_utils
 from project import RemoteSpec, Project, MetaProject
-from error import ManifestParseError, ManifestInvalidRevisionError
+from error import (ManifestParseError, ManifestInvalidPathError,
                   ManifestInvalidRevisionError)
 MANIFEST_FILE_NAME = 'manifest.xml'
 LOCAL_MANIFEST_NAME = 'local_manifest.xml'
 LOCAL_MANIFESTS_DIR_NAME = 'local_manifests'
 # urljoin gets confused if the scheme is not known.
-urllib.parse.uses_relative.extend(['ssh', 'git', 'persistent-https', 'rpc'])
+urllib.parse.uses_relative.extend([
-urllib.parse.uses_netloc.extend(['ssh', 'git', 'persistent-https', 'rpc'])
+    'ssh',
    'git',
    'persistent-https',
    'sso',
    'rpc'])
 urllib.parse.uses_netloc.extend([
    'ssh',
    'git',
    'persistent-https',
    'sso',
    'rpc'])
 def XmlBool(node, attr, default=None):
  """Determine boolean value of |node|'s |attr|.
  Invalid values will issue a non-fatal warning.
  Args:
    node: XML node whose attributes we access.
    attr: The attribute to access.
    default: If the attribute is not set (value is empty), then use this.
  Returns:
    True if the attribute is a valid string representing true.
    False if the attribute is a valid string representing false.
    |default| otherwise.
  """
  value = node.getAttribute(attr)
  s = value.lower()
  if s == '':
    return default
  elif s in {'yes', 'true', '1'}:
    return True
  elif s in {'no', 'false', '0'}:
    return False
  else:
    print('warning: manifest: %s="%s": ignoring invalid XML boolean' %
          (attr, value), file=sys.stderr)
    return default
 def XmlInt(node, attr, default=None):
  """Determine integer value of |node|'s |attr|.
  Args:
    node: XML node whose attributes we access.
    attr: The attribute to access.
    default: If the attribute is not set (value is empty), then use this.
  Returns:
    The number if the attribute is a valid number.
  Raises:
    ManifestParseError: The number is invalid.
  """
  value = node.getAttribute(attr)
  if not value:
    return default
  try:
    return int(value)
  except ValueError:
    raise ManifestParseError('manifest: invalid %s="%s" integer' %
                             (attr, value))
 class _Default(object):
  """Project defaults within the manifest."""
  revisionExpr = None
  destBranchExpr = None
  upstreamExpr = None
  remote = None
  sync_j = 1
  sync_c = False
  sync_s = False
  sync_tags = True
  def __eq__(self, other):
    return self.__dict__ == other.__dict__
@ -58,16 +129,19 @@ class _Default(object):
  def __ne__(self, other):
    return self.__dict__ != other.__dict__
 class _XmlRemote(object):
  def __init__(self,
               name,
               alias=None,
               fetch=None,
               pushUrl=None,
               manifestUrl=None,
               review=None,
               revision=None):
    self.name = name
    self.fetchUrl = fetch
    self.pushUrl = pushUrl
    self.manifestUrl = manifestUrl
    self.remoteAlias = alias
    self.reviewUrl = review
@ -97,11 +171,18 @@ class _XmlRemote(object):
    return url
  def ToRemoteSpec(self, projectName):
-    url = self.resolvedFetchUrl.rstrip('/') + '/' + projectName
+    fetchUrl = self.resolvedFetchUrl.rstrip('/')
    url = fetchUrl + '/' + projectName
    remoteName = self.name
    if self.remoteAlias:
      remoteName = self.remoteAlias
-    return RemoteSpec(remoteName, url, self.reviewUrl)
+    return RemoteSpec(remoteName,
                      url=url,
                      pushUrl=self.pushUrl,
                      review=self.reviewUrl,
                      orig_name=self.name,
                      fetchUrl=self.fetchUrl)
 class XmlManifest(object):
  """manages the repo configuration file"""
@ -112,26 +193,47 @@ class XmlManifest(object):
    self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME)
    self.globalConfig = GitConfig.ForUser()
    self.localManifestWarning = False
    self.isGitcClient = False
    self._load_local_manifests = True
    self.repoProject = MetaProject(self, 'repo',
-      gitdir   = os.path.join(repodir, 'repo/.git'),
+                                   gitdir=os.path.join(repodir, 'repo/.git'),
-      worktree = os.path.join(repodir, 'repo'))
+                                   worktree=os.path.join(repodir, 'repo'))
-    self.manifestProject = MetaProject(self, 'manifests',
+    mp = MetaProject(self, 'manifests',
-      gitdir   = os.path.join(repodir, 'manifests.git'),
+                     gitdir=os.path.join(repodir, 'manifests.git'),
-      worktree = os.path.join(repodir, 'manifests'))
+                     worktree=os.path.join(repodir, 'manifests'))
    self.manifestProject = mp
    # This is a bit hacky, but we're in a chicken & egg situation: all the
    # normal repo settings live in the manifestProject which we just setup
    # above, so we couldn't easily query before that.  We assume Project()
    # init doesn't care if this changes afterwards.
    if os.path.exists(mp.gitdir) and mp.config.GetBoolean('repo.worktree'):
      mp.use_git_worktrees = True
    self._Unload()
-  def Override(self, name):
+  def Override(self, name, load_local_manifests=True):
    """Use a different manifest, just for the current instantiation.
    """
-    path = os.path.join(self.manifestProject.worktree, name)
+    path = None
-    if not os.path.isfile(path):
+
-      raise ManifestParseError('manifest %s not found' % name)
+    # Look for a manifest by path in the filesystem (including the cwd).
    if not load_local_manifests:
      local_path = os.path.abspath(name)
      if os.path.isfile(local_path):
        path = local_path
    # Look for manifests by name from the manifests repo.
    if path is None:
      path = os.path.join(self.manifestProject.worktree, name)
      if not os.path.isfile(path):
        raise ManifestParseError('manifest %s not found' % name)
    old = self.manifestFile
    try:
      self._load_local_manifests = load_local_manifests
      self.manifestFile = path
      self._Unload()
      self._Load()
@ -143,18 +245,35 @@ class XmlManifest(object):
    """
    self.Override(name)
-    try:
+    # Old versions of repo would generate symlinks we need to clean up.
-      if os.path.lexists(self.manifestFile):
+    if os.path.lexists(self.manifestFile):
-        os.remove(self.manifestFile)
+      platform_utils.remove(self.manifestFile)
-      os.symlink('manifests/%s' % name, self.manifestFile)
+    # This file is interpreted as if it existed inside the manifest repo.
-    except OSError as e:
+    # That allows us to use <include> with the relative file name.
-      raise ManifestParseError('cannot link manifest %s: %s' % (name, str(e)))
+    with open(self.manifestFile, 'w') as fp:
      fp.write("""<?xml version="1.0" encoding="UTF-8"?>
 <!--
 DO NOT EDIT THIS FILE!  It is generated by repo and changes will be discarded.
 If you want to use a different manifest, use `repo init -m <file>` instead.
 If you want to customize your checkout by overriding manifest settings, use
 the local_manifests/ directory instead.
 For more information on repo manifests, check out:
 https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
 -->
 <manifest>
  <include name="%s" />
 </manifest>
 """ % (name,))
  def _RemoteToXml(self, r, doc, root):
    e = doc.createElement('remote')
    root.appendChild(e)
    e.setAttribute('name', r.name)
    e.setAttribute('fetch', r.fetchUrl)
    if r.pushUrl is not None:
      e.setAttribute('pushurl', r.pushUrl)
    if r.remoteAlias is not None:
      e.setAttribute('alias', r.remoteAlias)
    if r.reviewUrl is not None:
@ -165,12 +284,13 @@ class XmlManifest(object):
  def _ParseGroups(self, groups):
    return [x for x in re.split(r'[,\s]+', groups) if x]
-  def Save(self, fd, peg_rev=False, peg_rev_upstream=True):
+  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.
    """
    mp = self.manifestProject
-    groups = mp.config.GetString('manifest.groups')
+    if groups is None:
      groups = mp.config.GetString('manifest.groups')
    if groups:
      groups = self._ParseGroups(groups)
@ -184,7 +304,7 @@ class XmlManifest(object):
    if self.notice:
      notice_element = root.appendChild(doc.createElement('notice'))
      notice_lines = self.notice.splitlines()
-      indented_notice = ('\n'.join(" "*4 + line for line in notice_lines))[4:]
+      indented_notice = ('\n'.join(" " * 4 + line for line in notice_lines))[4:]
      notice_element.appendChild(doc.createTextNode(indented_notice))
    d = self.default
@ -202,6 +322,12 @@ class XmlManifest(object):
    if d.revisionExpr:
      have_default = True
      e.setAttribute('revision', d.revisionExpr)
    if d.destBranchExpr:
      have_default = True
      e.setAttribute('dest-branch', d.destBranchExpr)
    if d.upstreamExpr:
      have_default = True
      e.setAttribute('upstream', d.upstreamExpr)
    if d.sync_j > 1:
      have_default = True
      e.setAttribute('sync-j', '%d' % d.sync_j)
@ -211,6 +337,9 @@ class XmlManifest(object):
    if d.sync_s:
      have_default = True
      e.setAttribute('sync-s', 'true')
    if not d.sync_tags:
      have_default = True
      e.setAttribute('sync-tags', 'false')
    if have_default:
      root.appendChild(e)
      root.appendChild(doc.createTextNode(''))
@ -243,9 +372,9 @@ class XmlManifest(object):
        e.setAttribute('path', relpath)
      remoteName = None
      if d.remote:
-        remoteName = d.remote.remoteAlias or d.remote.name
+        remoteName = d.remote.name
-      if not d.remote or p.remote.name != remoteName:
+      if not d.remote or p.remote.orig_name != remoteName:
-        remoteName = p.remote.name
+        remoteName = p.remote.orig_name
        e.setAttribute('remote', remoteName)
      if peg_rev:
        if self.IsMirror:
@ -260,13 +389,24 @@ class XmlManifest(object):
            # Only save the origin if the origin is not a sha1, and the default
            # isn't our value
            e.setAttribute('upstream', p.revisionExpr)
        if peg_rev_dest_branch:
          if p.dest_branch:
            e.setAttribute('dest-branch', p.dest_branch)
          elif value != p.revisionExpr:
            e.setAttribute('dest-branch', p.revisionExpr)
      else:
-        revision = self.remotes[remoteName].revision or d.revisionExpr
+        revision = self.remotes[p.remote.orig_name].revision or d.revisionExpr
        if not revision or revision != p.revisionExpr:
          e.setAttribute('revision', p.revisionExpr)
-        if p.upstream and p.upstream != p.revisionExpr:
+        if (p.upstream and (p.upstream != p.revisionExpr or
                            p.upstream != d.upstreamExpr)):
          e.setAttribute('upstream', p.upstream)
      if p.dest_branch and p.dest_branch != d.destBranchExpr:
        e.setAttribute('dest-branch', p.dest_branch)
      for c in p.copyfiles:
        ce = doc.createElement('copyfile')
        ce.setAttribute('src', c.src)
@ -297,6 +437,14 @@ class XmlManifest(object):
      if p.sync_s:
        e.setAttribute('sync-s', 'true')
      if not p.sync_tags:
        e.setAttribute('sync-tags', 'false')
      if p.clone_depth:
        e.setAttribute('clone-depth', str(p.clone_depth))
      self._output_manifest_project_extras(p, e)
      if p.subprojects:
        subprojects = set(subp.name for subp in p.subprojects)
        output_projects(p, e, list(sorted(subprojects)))
@ -314,6 +462,10 @@ class XmlManifest(object):
    doc.writexml(fd, '', '  ', '\n', 'UTF-8')
  def _output_manifest_project_extras(self, p, e):
    """Manifests can modify e if they support extra project attributes."""
    pass
  @property
  def paths(self):
    self._Load()
@ -349,14 +501,36 @@ class XmlManifest(object):
    self._Load()
    return self._manifest_server
  @property
  def CloneBundle(self):
    clone_bundle = self.manifestProject.config.GetBoolean('repo.clonebundle')
    if clone_bundle is None:
      return False if self.manifestProject.config.GetBoolean('repo.partialclone') else True
    else:
      return clone_bundle
  @property
  def CloneFilter(self):
    if self.manifestProject.config.GetBoolean('repo.partialclone'):
      return self.manifestProject.config.GetString('repo.clonefilter')
    return None
  @property
  def IsMirror(self):
    return self.manifestProject.config.GetBoolean('repo.mirror')
  @property
  def UseGitWorktrees(self):
    return self.manifestProject.config.GetBoolean('repo.worktree')
  @property
  def IsArchive(self):
    return self.manifestProject.config.GetBoolean('repo.archive')
  @property
  def HasSubmodules(self):
    return self.manifestProject.config.GetBoolean('repo.submodules')
  def _Unload(self):
    self._loaded = False
    self._projects = {}
@ -380,23 +554,26 @@ class XmlManifest(object):
      nodes.append(self._ParseManifestXml(self.manifestFile,
                                          self.manifestProject.worktree))
-      local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME)
+      if self._load_local_manifests:
-      if os.path.exists(local):
+        local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME)
-        if not self.localManifestWarning:
+        if os.path.exists(local):
-          self.localManifestWarning = True
+          if not self.localManifestWarning:
-          print('warning: %s is deprecated; put local manifests in `%s` instead'
+            self.localManifestWarning = True
-                % (LOCAL_MANIFEST_NAME, os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
+            print('warning: %s is deprecated; put local manifests '
-                file=sys.stderr)
+                  'in `%s` instead' % (LOCAL_MANIFEST_NAME,
-        nodes.append(self._ParseManifestXml(local, self.repodir))
+                                       os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
                  file=sys.stderr)
          nodes.append(self._ParseManifestXml(local, self.repodir))
-      local_dir = os.path.abspath(os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME))
+        local_dir = os.path.abspath(os.path.join(self.repodir,
-      try:
+                                                 LOCAL_MANIFESTS_DIR_NAME))
-        for local_file in sorted(os.listdir(local_dir)):
+        try:
-          if local_file.endswith('.xml'):
+          for local_file in sorted(platform_utils.listdir(local_dir)):
-            local = os.path.join(local_dir, local_file)
+            if local_file.endswith('.xml'):
-            nodes.append(self._ParseManifestXml(local, self.repodir))
+              local = os.path.join(local_dir, local_file)
-      except OSError:
+              nodes.append(self._ParseManifestXml(local, self.repodir))
-        pass
+        except OSError:
          pass
      try:
        self._ParseManifest(nodes)
@ -428,14 +605,13 @@ class XmlManifest(object):
      raise ManifestParseError("no <manifest> in %s" % (path,))
    nodes = []
-    for node in manifest.childNodes:  # pylint:disable=W0631
+    for node in manifest.childNodes:
                                      # We only get here if manifest is initialised
      if node.nodeName == 'include':
        name = self._reqatt(node, 'name')
        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,))
+                                   % (name,))
        try:
          nodes.extend(self._ParseManifestXml(fp, include_root))
        # should isolate this to the exact exception, but that's
@ -444,7 +620,7 @@ class XmlManifest(object):
          raise
        except Exception as e:
          raise ManifestParseError(
-              "failed parsing included manifest %s: %s", (name, e))
+              "failed parsing included manifest %s: %s" % (name, e))
      else:
        nodes.append(node)
    return nodes
@ -521,12 +697,20 @@ class XmlManifest(object):
        groups = node.getAttribute('groups')
        if groups:
          groups = self._ParseGroups(groups)
        revision = node.getAttribute('revision')
        remote = node.getAttribute('remote')
        if remote:
          remote = self._get_remote(node)
        for p in self._projects[name]:
          if path and p.relpath != path:
            continue
          if groups:
            p.groups.extend(groups)
          if revision:
            p.revisionExpr = revision
          if remote:
            p.remote = remote.ToRemoteSpec(name)
      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')
@ -570,7 +754,6 @@ class XmlManifest(object):
        if self._repo_hooks_project and (self._repo_hooks_project.name == name):
          self._repo_hooks_project = None
  def _AddMetaProjectMirror(self, m):
    name = None
    m_url = m.GetRemote(m.remote.name).url
@ -597,15 +780,15 @@ class XmlManifest(object):
    if name not in self._projects:
      m.PreSync()
      gitdir = os.path.join(self.topdir, '%s.git' % name)
-      project = Project(manifest = self,
+      project = Project(manifest=self,
-                        name = name,
+                        name=name,
-                        remote = remote.ToRemoteSpec(name),
+                        remote=remote.ToRemoteSpec(name),
-                        gitdir = gitdir,
+                        gitdir=gitdir,
-                        objdir = gitdir,
+                        objdir=gitdir,
-                        worktree = None,
+                        worktree=None,
-                        relpath = name or None,
+                        relpath=name or None,
-                        revisionExpr = m.revisionExpr,
+                        revisionExpr=m.revisionExpr,
-                        revisionId = None)
+                        revisionId=None)
      self._projects[project.name] = [project]
      self._paths[project.relpath] = project
@ -618,6 +801,9 @@ class XmlManifest(object):
    if alias == '':
      alias = None
    fetch = self._reqatt(node, 'fetch')
    pushUrl = node.getAttribute('pushurl')
    if pushUrl == '':
      pushUrl = None
    review = node.getAttribute('review')
    if review == '':
      review = None
@ -625,7 +811,7 @@ class XmlManifest(object):
    if revision == '':
      revision = None
    manifestUrl = self.manifestProject.config.GetString('remote.origin.url')
-    return _XmlRemote(name, alias, fetch, manifestUrl, review, revision)
+    return _XmlRemote(name, alias, fetch, pushUrl, manifestUrl, review, revision)
  def _ParseDefault(self, node):
    """
@ -638,24 +824,16 @@ class XmlManifest(object):
      d.revisionExpr = None
    d.destBranchExpr = node.getAttribute('dest-branch') or None
    d.upstreamExpr = node.getAttribute('upstream') or None
-    sync_j = node.getAttribute('sync-j')
+    d.sync_j = XmlInt(node, 'sync-j', 1)
-    if sync_j == '' or sync_j is None:
+    if d.sync_j <= 0:
-      d.sync_j = 1
+      raise ManifestParseError('%s: sync-j must be greater than 0, not "%s"' %
-    else:
+                               (self.manifestFile, d.sync_j))
      d.sync_j = int(sync_j)
-    sync_c = node.getAttribute('sync-c')
+    d.sync_c = XmlBool(node, 'sync-c', False)
-    if not sync_c:
+    d.sync_s = XmlBool(node, 'sync-s', False)
-      d.sync_c = False
+    d.sync_tags = XmlBool(node, 'sync-tags', True)
    else:
      d.sync_c = sync_c.lower() in ("yes", "true", "1")
    sync_s = node.getAttribute('sync-s')
    if not sync_s:
      d.sync_s = False
    else:
      d.sync_s = sync_s.lower() in ("yes", "true", "1")
    return d
  def _ParseNotice(self, node):
@ -703,7 +881,7 @@ class XmlManifest(object):
  def _UnjoinName(self, parent_name, name):
    return os.path.relpath(name, parent_name)
-  def _ParseProject(self, node, parent = None):
+  def _ParseProject(self, node, parent=None, **extra_proj_attrs):
    """
    reads a <project> element from the manifest file
    """
@ -716,53 +894,35 @@ class XmlManifest(object):
      remote = self._default.remote
    if remote is None:
      raise ManifestParseError("no remote for project %s within %s" %
-            (name, self.manifestFile))
+                               (name, self.manifestFile))
    revisionExpr = node.getAttribute('revision') or remote.revision
    if not revisionExpr:
      revisionExpr = self._default.revisionExpr
    if not revisionExpr:
      raise ManifestParseError("no revision for project %s within %s" %
-            (name, self.manifestFile))
+                               (name, self.manifestFile))
    path = node.getAttribute('path')
    if not path:
      path = name
    if path.startswith('/'):
      raise ManifestParseError("project %s path cannot be absolute in %s" %
-            (name, self.manifestFile))
+                               (name, self.manifestFile))
-    rebase = node.getAttribute('rebase')
+    rebase = XmlBool(node, 'rebase', True)
-    if not rebase:
+    sync_c = XmlBool(node, 'sync-c', False)
-      rebase = True
+    sync_s = XmlBool(node, 'sync-s', self._default.sync_s)
-    else:
+    sync_tags = XmlBool(node, 'sync-tags', self._default.sync_tags)
      rebase = rebase.lower() in ("yes", "true", "1")
-    sync_c = node.getAttribute('sync-c')
+    clone_depth = XmlInt(node, 'clone-depth')
-    if not sync_c:
+    if clone_depth is not None and clone_depth <= 0:
-      sync_c = False
+      raise ManifestParseError('%s: clone-depth must be greater than 0, not "%s"' %
-    else:
+                               (self.manifestFile, clone_depth))
      sync_c = sync_c.lower() in ("yes", "true", "1")
    sync_s = node.getAttribute('sync-s')
    if not sync_s:
      sync_s = self._default.sync_s
    else:
      sync_s = sync_s.lower() in ("yes", "true", "1")
    clone_depth = node.getAttribute('clone-depth')
    if clone_depth:
      try:
        clone_depth = int(clone_depth)
        if  clone_depth <= 0:
          raise ValueError()
      except ValueError:
        raise ManifestParseError('invalid clone-depth %s in %s' %
                                 (clone_depth, self.manifestFile))
    dest_branch = node.getAttribute('dest-branch') or self._default.destBranchExpr
-    upstream = node.getAttribute('upstream')
+    upstream = node.getAttribute('upstream') or self._default.upstreamExpr
    groups = ''
    if node.hasAttribute('groups'):
@ -770,8 +930,10 @@ class XmlManifest(object):
    groups = self._ParseGroups(groups)
    if parent is None:
-      relpath, worktree, gitdir, objdir = self.GetProjectPaths(name, path)
+      relpath, worktree, gitdir, objdir, use_git_worktrees = \
          self.GetProjectPaths(name, path)
    else:
      use_git_worktrees = False
      relpath, worktree, gitdir, objdir = \
          self.GetSubprojectPaths(parent, name, path)
@ -779,26 +941,29 @@ class XmlManifest(object):
    groups.extend(set(default_groups).difference(groups))
    if self.IsMirror and node.hasAttribute('force-path'):
-      if node.getAttribute('force-path').lower() in ("yes", "true", "1"):
+      if XmlBool(node, 'force-path', False):
        gitdir = os.path.join(self.topdir, '%s.git' % path)
-    project = Project(manifest = self,
+    project = Project(manifest=self,
-                      name = name,
+                      name=name,
-                      remote = remote.ToRemoteSpec(name),
+                      remote=remote.ToRemoteSpec(name),
-                      gitdir = gitdir,
+                      gitdir=gitdir,
-                      objdir = objdir,
+                      objdir=objdir,
-                      worktree = worktree,
+                      worktree=worktree,
-                      relpath = relpath,
+                      relpath=relpath,
-                      revisionExpr = revisionExpr,
+                      revisionExpr=revisionExpr,
-                      revisionId = None,
+                      revisionId=None,
-                      rebase = rebase,
+                      rebase=rebase,
-                      groups = groups,
+                      groups=groups,
-                      sync_c = sync_c,
+                      sync_c=sync_c,
-                      sync_s = sync_s,
+                      sync_s=sync_s,
-                      clone_depth = clone_depth,
+                      sync_tags=sync_tags,
-                      upstream = upstream,
+                      clone_depth=clone_depth,
-                      parent = parent,
+                      upstream=upstream,
-                      dest_branch = dest_branch)
+                      parent=parent,
                      dest_branch=dest_branch,
                      use_git_worktrees=use_git_worktrees,
                      **extra_proj_attrs)
    for n in node.childNodes:
      if n.nodeName == 'copyfile':
@ -808,11 +973,12 @@ class XmlManifest(object):
      if n.nodeName == 'annotation':
        self._ParseAnnotation(project, n)
      if n.nodeName == 'project':
-        project.subprojects.append(self._ParseProject(n, parent = project))
+        project.subprojects.append(self._ParseProject(n, parent=project))
    return project
  def GetProjectPaths(self, name, path):
    use_git_worktrees = False
    relpath = path
    if self.IsMirror:
      worktree = None
@ -821,8 +987,15 @@ class XmlManifest(object):
    else:
      worktree = os.path.join(self.topdir, path).replace('\\', '/')
      gitdir = os.path.join(self.repodir, 'projects', '%s.git' % path)
-      objdir = os.path.join(self.repodir, 'project-objects', '%s.git' % name)
+      # We allow people to mix git worktrees & non-git worktrees for now.
-    return relpath, worktree, gitdir, objdir
+      # This allows for in situ migration of repo clients.
      if os.path.exists(gitdir) or not self.UseGitWorktrees:
        objdir = os.path.join(self.repodir, 'project-objects', '%s.git' % name)
      else:
        use_git_worktrees = True
        gitdir = os.path.join(self.repodir, 'worktrees', '%s.git' % name)
        objdir = gitdir
    return relpath, worktree, gitdir, objdir, use_git_worktrees
  def GetProjectsWithName(self, name):
    return self._projects.get(name, [])
@ -846,21 +1019,112 @@ class XmlManifest(object):
      worktree = os.path.join(parent.worktree, path).replace('\\', '/')
    return relpath, worktree, gitdir, objdir
  @staticmethod
  def _CheckLocalPath(path, symlink=False):
    """Verify |path| is reasonable for use in <copyfile> & <linkfile>."""
    if '~' in path:
      return '~ not allowed (due to 8.3 filenames on Windows filesystems)'
    # Some filesystems (like Apple's HFS+) try to normalize Unicode codepoints
    # which means there are alternative names for ".git".  Reject paths with
    # these in it as there shouldn't be any reasonable need for them here.
    # The set of codepoints here was cribbed from jgit's implementation:
    # https://eclipse.googlesource.com/jgit/jgit/+/9110037e3e9461ff4dac22fee84ef3694ed57648/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java#884
    BAD_CODEPOINTS = {
        u'\u200C',  # ZERO WIDTH NON-JOINER
        u'\u200D',  # ZERO WIDTH JOINER
        u'\u200E',  # LEFT-TO-RIGHT MARK
        u'\u200F',  # RIGHT-TO-LEFT MARK
        u'\u202A',  # LEFT-TO-RIGHT EMBEDDING
        u'\u202B',  # RIGHT-TO-LEFT EMBEDDING
        u'\u202C',  # POP DIRECTIONAL FORMATTING
        u'\u202D',  # LEFT-TO-RIGHT OVERRIDE
        u'\u202E',  # RIGHT-TO-LEFT OVERRIDE
        u'\u206A',  # INHIBIT SYMMETRIC SWAPPING
        u'\u206B',  # ACTIVATE SYMMETRIC SWAPPING
        u'\u206C',  # INHIBIT ARABIC FORM SHAPING
        u'\u206D',  # ACTIVATE ARABIC FORM SHAPING
        u'\u206E',  # NATIONAL DIGIT SHAPES
        u'\u206F',  # NOMINAL DIGIT SHAPES
        u'\uFEFF',  # ZERO WIDTH NO-BREAK SPACE
    }
    if BAD_CODEPOINTS & set(path):
      # This message is more expansive than reality, but should be fine.
      return 'Unicode combining characters not allowed'
    # Assume paths might be used on case-insensitive filesystems.
    path = path.lower()
    # Split up the path by its components.  We can't use os.path.sep exclusively
    # as some platforms (like Windows) will convert / to \ and that bypasses all
    # our constructed logic here.  Especially since manifest authors only use
    # / in their paths.
    resep = re.compile(r'[/%s]' % re.escape(os.path.sep))
    parts = resep.split(path)
    # Some people use src="." to create stable links to projects.  Lets allow
    # that but reject all other uses of "." to keep things simple.
    if parts != ['.']:
      for part in set(parts):
        if part in {'.', '..', '.git'} or part.startswith('.repo'):
          return 'bad component: %s' % (part,)
    if not symlink and resep.match(path[-1]):
      return 'dirs not allowed'
    # NB: The two abspath checks here are to handle platforms with multiple
    # filesystem path styles (e.g. Windows).
    norm = os.path.normpath(path)
    if (norm == '..' or
        (len(norm) >= 3 and norm.startswith('..') and resep.match(norm[0])) or
        os.path.isabs(norm) or
        norm.startswith('/')):
      return 'path cannot be outside'
  @classmethod
  def _ValidateFilePaths(cls, element, src, dest):
    """Verify |src| & |dest| are reasonable for <copyfile> & <linkfile>.
    We verify the path independent of any filesystem state as we won't have a
    checkout available to compare to.  i.e. This is for parsing validation
    purposes only.
    We'll do full/live sanity checking before we do the actual filesystem
    modifications in _CopyFile/_LinkFile/etc...
    """
    # |dest| is the file we write to or symlink we create.
    # It is relative to the top of the repo client checkout.
    msg = cls._CheckLocalPath(dest)
    if msg:
      raise ManifestInvalidPathError(
          '<%s> invalid "dest": %s: %s' % (element, dest, msg))
    # |src| is the file we read from or path we point to for symlinks.
    # It is relative to the top of the git project checkout.
    msg = cls._CheckLocalPath(src, symlink=element == 'linkfile')
    if msg:
      raise ManifestInvalidPathError(
          '<%s> invalid "src": %s: %s' % (element, src, msg))
  def _ParseCopyFile(self, project, node):
    src = self._reqatt(node, 'src')
    dest = self._reqatt(node, 'dest')
    if not self.IsMirror:
      # src is project relative;
-      # dest is relative to the top of the tree
+      # dest is relative to the top of the tree.
-      project.AddCopyFile(src, dest, os.path.join(self.topdir, dest))
+      # We only validate paths if we actually plan to process them.
      self._ValidateFilePaths('copyfile', src, dest)
      project.AddCopyFile(src, dest, self.topdir)
  def _ParseLinkFile(self, project, node):
    src = self._reqatt(node, 'src')
    dest = self._reqatt(node, 'dest')
    if not self.IsMirror:
      # src is project relative;
-      # dest is relative to the top of the tree
+      # dest is relative to the top of the tree.
-      project.AddLinkFile(src, dest, os.path.join(self.topdir, dest))
+      # We only validate paths if we actually plan to process them.
      self._ValidateFilePaths('linkfile', src, dest)
      project.AddLinkFile(src, dest, self.topdir)
  def _ParseAnnotation(self, project, node):
    name = self._reqatt(node, 'name')
@ -871,7 +1135,7 @@ class XmlManifest(object):
      keep = "true"
    if keep != "true" and keep != "false":
      raise ManifestParseError('optional "keep" attribute must be '
-            '"true" or "false"')
+                               '"true" or "false"')
    project.AddAnnotation(name, value, keep)
  def _get_remote(self, node):
@ -882,7 +1146,7 @@ class XmlManifest(object):
    v = self._remotes.get(name)
    if not v:
      raise ManifestParseError("remote %s not defined in %s" %
-            (name, self.manifestFile))
+                               (name, self.manifestFile))
    return v
  def _reqatt(self, node, attname):
@ -892,7 +1156,7 @@ class XmlManifest(object):
    v = node.getAttribute(attname)
    if not v:
      raise ManifestParseError("no %s in <%s> within %s" %
-            (attname, node.nodeName, self.manifestFile))
+                               (attname, node.nodeName, self.manifestFile))
    return v
  def projectsDiff(self, manifest):
@ -910,7 +1174,7 @@ class XmlManifest(object):
    diff = {'added': [], 'removed': [], 'changed': [], 'unreachable': []}
    for proj in fromKeys:
-      if not proj in toKeys:
+      if proj not in toKeys:
        diff['removed'].append(fromProjects[proj])
      else:
        fromProj = fromProjects[proj]
@ -929,3 +1193,25 @@ class XmlManifest(object):
      diff['added'].append(toProjects[proj])
    return diff
 class GitcManifest(XmlManifest):
  def __init__(self, repodir, gitc_client_name):
    """Initialize the GitcManifest object."""
    super(GitcManifest, self).__init__(repodir)
    self.isGitcClient = True
    self.gitc_client_name = gitc_client_name
    self.gitc_client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
                                        gitc_client_name)
    self.manifestFile = os.path.join(self.gitc_client_dir, '.manifest')
  def _ParseProject(self, node, parent=None):
    """Override _ParseProject and add support for GITC specific attributes."""
    return super(GitcManifest, self)._ParseProject(
        node, parent=parent, old_revision=node.getAttribute('old-revision'))
  def _output_manifest_project_extras(self, p, e):
    """Output GITC Specific Project attributes"""
    if p.old_revision:
      e.setAttribute('old-revision', str(p.old_revision))
--- a/pager.py
+++ b/pager.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -16,19 +17,58 @@
 from __future__ import print_function
 import os
 import select
 import subprocess
 import sys
 import platform_utils
 active = False
 pager_process = None
 old_stdout = None
 old_stderr = None
 def RunPager(globalConfig):
  global active
  if not os.isatty(0) or not os.isatty(1):
    return
  pager = _SelectPager(globalConfig)
  if pager == '' or pager == 'cat':
    return
  if platform_utils.isWindows():
    _PipePager(pager)
  else:
    _ForkPager(pager)
 def TerminatePager():
  global pager_process, old_stdout, old_stderr
  if pager_process:
    sys.stdout.flush()
    sys.stderr.flush()
    pager_process.stdin.close()
    pager_process.wait()
    pager_process = None
    # Restore initial stdout/err in case there is more output in this process
    # after shutting down the pager process
    sys.stdout = old_stdout
    sys.stderr = old_stderr
 def _PipePager(pager):
  global pager_process, old_stdout, old_stderr
  assert pager_process is None, "Only one active pager process at a time"
  # Create pager process, piping stdout/err into its stdin
  pager_process = subprocess.Popen([pager], stdin=subprocess.PIPE, stdout=sys.stdout,
                                   stderr=sys.stderr)
  old_stdout = sys.stdout
  old_stderr = sys.stderr
  sys.stdout = pager_process.stdin
  sys.stderr = pager_process.stdin
 def _ForkPager(pager):
  global active
  # This process turns into the pager; a child it forks will
  # do the real processing and output back to the pager. This
  # is necessary to keep the pager in control of the tty.
@ -53,6 +93,7 @@ def RunPager(globalConfig):
    print("fatal: cannot start pager '%s'" % pager, file=sys.stderr)
    sys.exit(255)
 def _SelectPager(globalConfig):
  try:
    return os.environ['GIT_PAGER']
@ -70,6 +111,7 @@ def _SelectPager(globalConfig):
  return 'less'
 def _BecomePager(pager):
  # Delaying execution of the pager until we have output
  # ready works around a long-standing bug in popularly
--- a/platform_utils.py
+++ b/platform_utils.py
@ -0,0 +1,432 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2016 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 errno
 import os
 import platform
 import select
 import shutil
 import stat
 from pyversion import is_python3
 if is_python3():
  from queue import Queue
 else:
  from Queue import Queue
 from threading import Thread
 def isWindows():
  """ Returns True when running with the native port of Python for Windows,
  False when running on any other platform (including the Cygwin port of
  Python).
  """
  # Note: The cygwin port of Python returns "CYGWIN_NT_xxx"
  return platform.system() == "Windows"
 class FileDescriptorStreams(object):
  """ Platform agnostic abstraction enabling non-blocking I/O over a
  collection of file descriptors. This abstraction is required because
  fctnl(os.O_NONBLOCK) is not supported on Windows.
  """
  @classmethod
  def create(cls):
    """ Factory method: instantiates the concrete class according to the
    current platform.
    """
    if isWindows():
      return _FileDescriptorStreamsThreads()
    else:
      return _FileDescriptorStreamsNonBlocking()
  def __init__(self):
    self.streams = []
  def add(self, fd, dest, std_name):
    """ Wraps an existing file descriptor as a stream.
    """
    self.streams.append(self._create_stream(fd, dest, std_name))
  def remove(self, stream):
    """ Removes a stream, when done with it.
    """
    self.streams.remove(stream)
  @property
  def is_done(self):
    """ Returns True when all streams have been processed.
    """
    return len(self.streams) == 0
  def select(self):
    """ Returns the set of streams that have data available to read.
    The returned streams each expose a read() and a close() method.
    When done with a stream, call the remove(stream) method.
    """
    raise NotImplementedError
  def _create_stream(self, fd, dest, std_name):
    """ Creates a new stream wrapping an existing file descriptor.
    """
    raise NotImplementedError
 class _FileDescriptorStreamsNonBlocking(FileDescriptorStreams):
  """ Implementation of FileDescriptorStreams for platforms that support
  non blocking I/O.
  """
  def __init__(self):
    super(_FileDescriptorStreamsNonBlocking, self).__init__()
    self._poll = select.poll()
    self._fd_to_stream = {}
  class Stream(object):
    """ Encapsulates a file descriptor """
    def __init__(self, fd, dest, std_name):
      self.fd = fd
      self.dest = dest
      self.std_name = std_name
      self.set_non_blocking()
    def set_non_blocking(self):
      import fcntl
      flags = fcntl.fcntl(self.fd, fcntl.F_GETFL)
      fcntl.fcntl(self.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
    def fileno(self):
      return self.fd.fileno()
    def read(self):
      return self.fd.read(4096)
    def close(self):
      self.fd.close()
  def _create_stream(self, fd, dest, std_name):
    stream = self.Stream(fd, dest, std_name)
    self._fd_to_stream[stream.fileno()] = stream
    self._poll.register(stream, select.POLLIN)
    return stream
  def remove(self, stream):
    self._poll.unregister(stream)
    del self._fd_to_stream[stream.fileno()]
    super(_FileDescriptorStreamsNonBlocking, self).remove(stream)
  def select(self):
    return [self._fd_to_stream[fd] for fd, _ in self._poll.poll()]
 class _FileDescriptorStreamsThreads(FileDescriptorStreams):
  """ Implementation of FileDescriptorStreams for platforms that don't support
  non blocking I/O. This implementation requires creating threads issuing
  blocking read operations on file descriptors.
  """
  def __init__(self):
    super(_FileDescriptorStreamsThreads, self).__init__()
    # The queue is shared accross all threads so we can simulate the
    # behavior of the select() function
    self.queue = Queue(10)  # Limit incoming data from streams
  def _create_stream(self, fd, dest, std_name):
    return self.Stream(fd, dest, std_name, self.queue)
  def select(self):
    # Return only one stream at a time, as it is the most straighforward
    # thing to do and it is compatible with the select() function.
    item = self.queue.get()
    stream = item.stream
    stream.data = item.data
    return [stream]
  class QueueItem(object):
    """ Item put in the shared queue """
    def __init__(self, stream, data):
      self.stream = stream
      self.data = data
  class Stream(object):
    """ Encapsulates a file descriptor """
    def __init__(self, fd, dest, std_name, queue):
      self.fd = fd
      self.dest = dest
      self.std_name = std_name
      self.queue = queue
      self.data = None
      self.thread = Thread(target=self.read_to_queue)
      self.thread.daemon = True
      self.thread.start()
    def close(self):
      self.fd.close()
    def read(self):
      data = self.data
      self.data = None
      return data
    def read_to_queue(self):
      """ The thread function: reads everything from the file descriptor into
      the shared queue and terminates when reaching EOF.
      """
      for line in iter(self.fd.readline, b''):
        self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, line))
      self.fd.close()
      self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, b''))
 def symlink(source, link_name):
  """Creates a symbolic link pointing to source named link_name.
  Note: On Windows, source must exist on disk, as the implementation needs
  to know whether to create a "File" or a "Directory" symbolic link.
  """
  if isWindows():
    import platform_utils_win32
    source = _validate_winpath(source)
    link_name = _validate_winpath(link_name)
    target = os.path.join(os.path.dirname(link_name), source)
    if isdir(target):
      platform_utils_win32.create_dirsymlink(_makelongpath(source), link_name)
    else:
      platform_utils_win32.create_filesymlink(_makelongpath(source), link_name)
  else:
    return os.symlink(source, link_name)
 def _validate_winpath(path):
  path = os.path.normpath(path)
  if _winpath_is_valid(path):
    return path
  raise ValueError("Path \"%s\" must be a relative path or an absolute "
                   "path starting with a drive letter".format(path))
 def _winpath_is_valid(path):
  """Windows only: returns True if path is relative (e.g. ".\\foo") or is
  absolute including a drive letter (e.g. "c:\\foo"). Returns False if path
  is ambiguous (e.g. "x:foo" or "\\foo").
  """
  assert isWindows()
  path = os.path.normpath(path)
  drive, tail = os.path.splitdrive(path)
  if tail:
    if not drive:
      return tail[0] != os.sep  # "\\foo" is invalid
    else:
      return tail[0] == os.sep  # "x:foo" is invalid
  else:
    return not drive  # "x:" is invalid
 def _makelongpath(path):
  """Return the input path normalized to support the Windows long path syntax
  ("\\\\?\\" prefix) if needed, i.e. if the input path is longer than the
  MAX_PATH limit.
  """
  if isWindows():
    # Note: MAX_PATH is 260, but, for directories, the maximum value is actually 246.
    if len(path) < 246:
      return path
    if path.startswith(u"\\\\?\\"):
      return path
    if not os.path.isabs(path):
      return path
    # Append prefix and ensure unicode so that the special longpath syntax
    # is supported by underlying Win32 API calls
    return u"\\\\?\\" + os.path.normpath(path)
  else:
    return path
 def rmtree(path, ignore_errors=False):
  """shutil.rmtree(path) wrapper with support for long paths on Windows.
  Availability: Unix, Windows."""
  onerror = None
  if isWindows():
    path = _makelongpath(path)
    onerror = handle_rmtree_error
  shutil.rmtree(path, ignore_errors=ignore_errors, onerror=onerror)
 def handle_rmtree_error(function, path, excinfo):
  # Allow deleting read-only files
  os.chmod(path, stat.S_IWRITE)
  function(path)
 def rename(src, dst):
  """os.rename(src, dst) wrapper with support for long paths on Windows.
  Availability: Unix, Windows."""
  if isWindows():
    # On Windows, rename fails if destination exists, see
    # https://docs.python.org/2/library/os.html#os.rename
    try:
      os.rename(_makelongpath(src), _makelongpath(dst))
    except OSError as e:
      if e.errno == errno.EEXIST:
        os.remove(_makelongpath(dst))
        os.rename(_makelongpath(src), _makelongpath(dst))
      else:
        raise
  else:
    os.rename(src, dst)
 def remove(path):
  """Remove (delete) the file path. This is a replacement for os.remove that
  allows deleting read-only files on Windows, with support for long paths and
  for deleting directory symbolic links.
  Availability: Unix, Windows."""
  if isWindows():
    longpath = _makelongpath(path)
    try:
      os.remove(longpath)
    except OSError as e:
      if e.errno == errno.EACCES:
        os.chmod(longpath, stat.S_IWRITE)
        # Directory symbolic links must be deleted with 'rmdir'.
        if islink(longpath) and isdir(longpath):
          os.rmdir(longpath)
        else:
          os.remove(longpath)
      else:
        raise
  else:
    os.remove(path)
 def walk(top, topdown=True, onerror=None, followlinks=False):
  """os.walk(path) wrapper with support for long paths on Windows.
  Availability: Windows, Unix.
  """
  if isWindows():
    return _walk_windows_impl(top, topdown, onerror, followlinks)
  else:
    return os.walk(top, topdown, onerror, followlinks)
 def _walk_windows_impl(top, topdown, onerror, followlinks):
  try:
    names = listdir(top)
  except Exception as err:
    if onerror is not None:
      onerror(err)
    return
  dirs, nondirs = [], []
  for name in names:
    if isdir(os.path.join(top, name)):
      dirs.append(name)
    else:
      nondirs.append(name)
  if topdown:
    yield top, dirs, nondirs
  for name in dirs:
    new_path = os.path.join(top, name)
    if followlinks or not islink(new_path):
      for x in _walk_windows_impl(new_path, topdown, onerror, followlinks):
        yield x
  if not topdown:
    yield top, dirs, nondirs
 def listdir(path):
  """os.listdir(path) wrapper with support for long paths on Windows.
  Availability: Windows, Unix.
  """
  return os.listdir(_makelongpath(path))
 def rmdir(path):
  """os.rmdir(path) wrapper with support for long paths on Windows.
  Availability: Windows, Unix.
  """
  os.rmdir(_makelongpath(path))
 def isdir(path):
  """os.path.isdir(path) wrapper with support for long paths on Windows.
  Availability: Windows, Unix.
  """
  return os.path.isdir(_makelongpath(path))
 def islink(path):
  """os.path.islink(path) wrapper with support for long paths on Windows.
  Availability: Windows, Unix.
  """
  if isWindows():
    import platform_utils_win32
    return platform_utils_win32.islink(_makelongpath(path))
  else:
    return os.path.islink(path)
 def readlink(path):
  """Return a string representing the path to which the symbolic link
  points. The result may be either an absolute or relative pathname;
  if it is relative, it may be converted to an absolute pathname using
  os.path.join(os.path.dirname(path), result).
  Availability: Windows, Unix.
  """
  if isWindows():
    import platform_utils_win32
    return platform_utils_win32.readlink(_makelongpath(path))
  else:
    return os.readlink(path)
 def realpath(path):
  """Return the canonical path of the specified filename, eliminating
  any symbolic links encountered in the path.
  Availability: Windows, Unix.
  """
  if isWindows():
    current_path = os.path.abspath(path)
    path_tail = []
    for c in range(0, 100):  # Avoid cycles
      if islink(current_path):
        target = readlink(current_path)
        current_path = os.path.join(os.path.dirname(current_path), target)
      else:
        basename = os.path.basename(current_path)
        if basename == '':
          path_tail.append(current_path)
          break
        path_tail.append(basename)
        current_path = os.path.dirname(current_path)
    path_tail.reverse()
    result = os.path.normpath(os.path.join(*path_tail))
    return result
  else:
    return os.path.realpath(path)
--- a/platform_utils_win32.py
+++ b/platform_utils_win32.py
@ -0,0 +1,230 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2016 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 errno
 from pyversion import is_python3
 from ctypes import WinDLL, get_last_error, FormatError, WinError, addressof
 from ctypes import c_buffer
 from ctypes.wintypes import BOOL, BOOLEAN, LPCWSTR, DWORD, HANDLE
 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)
 UCHAR = c_ubyte
 # Win32 error codes
 ERROR_SUCCESS = 0
 ERROR_NOT_SUPPORTED = 50
 ERROR_PRIVILEGE_NOT_HELD = 1314
 # Win32 API entry points
 CreateSymbolicLinkW = kernel32.CreateSymbolicLinkW
 CreateSymbolicLinkW.restype = BOOLEAN
 CreateSymbolicLinkW.argtypes = (LPCWSTR,  # lpSymlinkFileName In
                                LPCWSTR,  # lpTargetFileName In
                                DWORD)    # dwFlags In
 # Symbolic link creation flags
 SYMBOLIC_LINK_FLAG_FILE = 0x00
 SYMBOLIC_LINK_FLAG_DIRECTORY = 0x01
 # symlink support for CreateSymbolicLink() starting with Windows 10 (1703, v10.0.14972)
 SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE = 0x02
 GetFileAttributesW = kernel32.GetFileAttributesW
 GetFileAttributesW.restype = DWORD
 GetFileAttributesW.argtypes = (LPCWSTR,)  # lpFileName In
 INVALID_FILE_ATTRIBUTES = 0xFFFFFFFF
 FILE_ATTRIBUTE_REPARSE_POINT = 0x00400
 CreateFileW = kernel32.CreateFileW
 CreateFileW.restype = HANDLE
 CreateFileW.argtypes = (LPCWSTR,  # lpFileName In
                        DWORD,    # dwDesiredAccess In
                        DWORD,    # dwShareMode In
                        LPVOID,   # lpSecurityAttributes In_opt
                        DWORD,    # dwCreationDisposition In
                        DWORD,    # dwFlagsAndAttributes In
                        HANDLE)   # hTemplateFile In_opt
 CloseHandle = kernel32.CloseHandle
 CloseHandle.restype = BOOL
 CloseHandle.argtypes = (HANDLE,)  # hObject In
 INVALID_HANDLE_VALUE = HANDLE(-1).value
 OPEN_EXISTING = 3
 FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
 FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000
 DeviceIoControl = kernel32.DeviceIoControl
 DeviceIoControl.restype = BOOL
 DeviceIoControl.argtypes = (HANDLE,   # hDevice In
                            DWORD,    # dwIoControlCode In
                            LPVOID,   # lpInBuffer In_opt
                            DWORD,    # nInBufferSize In
                            LPVOID,   # lpOutBuffer Out_opt
                            DWORD,    # nOutBufferSize In
                            LPDWORD,  # lpBytesReturned Out_opt
                            LPVOID)   # lpOverlapped Inout_opt
 # Device I/O control flags and options
 FSCTL_GET_REPARSE_POINT = 0x000900A8
 IO_REPARSE_TAG_MOUNT_POINT = 0xA0000003
 IO_REPARSE_TAG_SYMLINK = 0xA000000C
 MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 0x4000
 class GENERIC_REPARSE_BUFFER(Structure):
  _fields_ = (('DataBuffer', UCHAR * 1),)
 class SYMBOLIC_LINK_REPARSE_BUFFER(Structure):
  _fields_ = (('SubstituteNameOffset', USHORT),
              ('SubstituteNameLength', USHORT),
              ('PrintNameOffset', USHORT),
              ('PrintNameLength', USHORT),
              ('Flags', ULONG),
              ('PathBuffer', WCHAR * 1))
  @property
  def PrintName(self):
    arrayt = WCHAR * (self.PrintNameLength // 2)
    offset = type(self).PathBuffer.offset + self.PrintNameOffset
    return arrayt.from_address(addressof(self) + offset).value
 class MOUNT_POINT_REPARSE_BUFFER(Structure):
  _fields_ = (('SubstituteNameOffset', USHORT),
              ('SubstituteNameLength', USHORT),
              ('PrintNameOffset', USHORT),
              ('PrintNameLength', USHORT),
              ('PathBuffer', WCHAR * 1))
  @property
  def PrintName(self):
    arrayt = WCHAR * (self.PrintNameLength // 2)
    offset = type(self).PathBuffer.offset + self.PrintNameOffset
    return arrayt.from_address(addressof(self) + offset).value
 class REPARSE_DATA_BUFFER(Structure):
  class REPARSE_BUFFER(Union):
    _fields_ = (('SymbolicLinkReparseBuffer', SYMBOLIC_LINK_REPARSE_BUFFER),
                ('MountPointReparseBuffer', MOUNT_POINT_REPARSE_BUFFER),
                ('GenericReparseBuffer', GENERIC_REPARSE_BUFFER))
  _fields_ = (('ReparseTag', ULONG),
              ('ReparseDataLength', USHORT),
              ('Reserved', USHORT),
              ('ReparseBuffer', REPARSE_BUFFER))
  _anonymous_ = ('ReparseBuffer',)
 def create_filesymlink(source, link_name):
  """Creates a Windows file symbolic link source pointing to link_name."""
  _create_symlink(source, link_name, SYMBOLIC_LINK_FLAG_FILE)
 def create_dirsymlink(source, link_name):
  """Creates a Windows directory symbolic link source pointing to link_name.
  """
  _create_symlink(source, link_name, SYMBOLIC_LINK_FLAG_DIRECTORY)
 def _create_symlink(source, link_name, dwFlags):
  if not CreateSymbolicLinkW(link_name, source,
                             dwFlags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE):
    # See https://github.com/golang/go/pull/24307/files#diff-b87bc12e4da2497308f9ef746086e4f0
    # "the unprivileged create flag is unsupported below Windows 10 (1703, v10.0.14972).
    # retry without it."
    if not CreateSymbolicLinkW(link_name, source, dwFlags):
      code = get_last_error()
      error_desc = FormatError(code).strip()
      if code == ERROR_PRIVILEGE_NOT_HELD:
        raise OSError(errno.EPERM, error_desc, link_name)
      _raise_winerror(
          code,
          'Error creating symbolic link \"%s\"'.format(link_name))
 def islink(path):
  result = GetFileAttributesW(path)
  if result == INVALID_FILE_ATTRIBUTES:
    return False
  return bool(result & FILE_ATTRIBUTE_REPARSE_POINT)
 def readlink(path):
  reparse_point_handle = CreateFileW(path,
                                     0,
                                     0,
                                     None,
                                     OPEN_EXISTING,
                                     FILE_FLAG_OPEN_REPARSE_POINT |
                                     FILE_FLAG_BACKUP_SEMANTICS,
                                     None)
  if reparse_point_handle == INVALID_HANDLE_VALUE:
    _raise_winerror(
        get_last_error(),
        'Error opening symbolic link \"%s\"'.format(path))
  target_buffer = c_buffer(MAXIMUM_REPARSE_DATA_BUFFER_SIZE)
  n_bytes_returned = DWORD()
  io_result = DeviceIoControl(reparse_point_handle,
                              FSCTL_GET_REPARSE_POINT,
                              None,
                              0,
                              target_buffer,
                              len(target_buffer),
                              byref(n_bytes_returned),
                              None)
  CloseHandle(reparse_point_handle)
  if not io_result:
    _raise_winerror(
        get_last_error(),
        'Error reading symbolic link \"%s\"'.format(path))
  rdb = REPARSE_DATA_BUFFER.from_buffer(target_buffer)
  if rdb.ReparseTag == IO_REPARSE_TAG_SYMLINK:
    return _preserve_encoding(path, rdb.SymbolicLinkReparseBuffer.PrintName)
  elif rdb.ReparseTag == IO_REPARSE_TAG_MOUNT_POINT:
    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)
  raise WinError(code, error_desc)
--- a/progress.py
+++ b/progress.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -16,12 +17,19 @@
 import os
 import sys
 from time import time
-from trace import IsTrace
+from repo_trace import IsTrace
 _NOT_TTY = not os.isatty(2)
 # This will erase all content in the current line (wherever the cursor is).
 # It does not move the cursor, so this is usually followed by \r to move to
 # column 0.
 CSI_ERASE_LINE = '\x1b[2K'
 class Progress(object):
-  def __init__(self, title, total=0, units=''):
+  def __init__(self, title, total=0, units='', print_newline=False,
               always_print_percentage=False):
    self._title = title
    self._total = total
    self._done = 0
@ -29,8 +37,10 @@ class Progress(object):
    self._start = time()
    self._show = False
    self._units = units
    self._print_newline = print_newline
    self._always_print_percentage = always_print_percentage
-  def update(self, inc=1):
+  def update(self, inc=1, msg=''):
    self._done += inc
    if _NOT_TTY or IsTrace():
@ -43,20 +53,24 @@ class Progress(object):
        return
    if self._total <= 0:
-      sys.stderr.write('\r%s: %d, ' % (
+      sys.stderr.write('%s\r%s: %d,' % (
-        self._title,
+          CSI_ERASE_LINE,
-        self._done))
+          self._title,
          self._done))
      sys.stderr.flush()
    else:
      p = (100 * self._done) / self._total
-      if self._lastp != p:
+      if self._lastp != p or self._always_print_percentage:
        self._lastp = p
-        sys.stderr.write('\r%s: %3d%% (%d%s/%d%s)  ' % (
+        sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s)%s%s%s' % (
-          self._title,
+            CSI_ERASE_LINE,
-          p,
+            self._title,
-          self._done, self._units,
+            p,
-          self._total, self._units))
+            self._done, self._units,
            self._total, self._units,
            ' ' if msg else '', msg,
            "\n" if self._print_newline else ""))
        sys.stderr.flush()
  def end(self):
@ -64,15 +78,17 @@ class Progress(object):
      return
    if self._total <= 0:
-      sys.stderr.write('\r%s: %d, done.  \n' % (
+      sys.stderr.write('%s\r%s: %d, done.\n' % (
-        self._title,
+          CSI_ERASE_LINE,
-        self._done))
+          self._title,
          self._done))
      sys.stderr.flush()
    else:
      p = (100 * self._done) / self._total
-      sys.stderr.write('\r%s: %3d%% (%d%s/%d%s), done.  \n' % (
+      sys.stderr.write('%s\r%s: %3d%% (%d%s/%d%s), done.\n' % (
-        self._title,
+          CSI_ERASE_LINE,
-        p,
+          self._title,
-        self._done, self._units,
+          p,
-        self._total, self._units))
+          self._done, self._units,
          self._total, self._units))
      sys.stderr.flush()
--- a/project.py
+++ b/project.py
--- a/pyversion.py
+++ b/pyversion.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2013 The Android Open Source Project
 #
@ -15,5 +16,6 @@
 import sys
 def is_python3():
  return sys.version_info[0] == 3
--- a/release/README.md
+++ b/release/README.md
@ -0,0 +1,2 @@
 These are helper tools for managing official releases.
 See the [release process](../docs/release-process.md) document for more details.
--- a/release/sign-launcher.py
+++ b/release/sign-launcher.py
@ -0,0 +1,114 @@
 #!/usr/bin/env python3
 # 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.
 """Helper tool for signing repo launcher scripts correctly.
 This is intended to be run only by the official Repo release managers.
 """
 import argparse
 import os
 import subprocess
 import sys
 import util
 def sign(opts):
  """Sign the launcher!"""
  output = ''
  for key in opts.keys:
    # We use ! at the end of the key so that gpg uses this specific key.
    # Otherwise it uses the key as a lookup into the overall key and uses the
    # default signing key.  i.e. It will see that KEYID_RSA is a subkey of
    # another key, and use the primary key to sign instead of the subkey.
    cmd = ['gpg', '--homedir', opts.gpgdir, '-u', f'{key}!', '--batch', '--yes',
           '--armor', '--detach-sign', '--output', '-', opts.launcher]
    ret = util.run(opts, cmd, encoding='utf-8', stdout=subprocess.PIPE)
    output += ret.stdout
  # Save the combined signatures into one file.
  with open(f'{opts.launcher}.asc', 'w', encoding='utf-8') as fp:
    fp.write(output)
 def check(opts):
  """Check the signature."""
  util.run(opts, ['gpg', '--verify', f'{opts.launcher}.asc'])
 def postmsg(opts):
  """Helpful info to show at the end for release manager."""
  print(f"""
 Repo launcher bucket:
  gs://git-repo-downloads/
 To upload this launcher directly:
  gsutil cp -a public-read {opts.launcher} {opts.launcher}.asc gs://git-repo-downloads/
 NB: You probably want to upload it with a specific version first, e.g.:
  gsutil cp -a public-read {opts.launcher} gs://git-repo-downloads/repo-3.0
  gsutil cp -a public-read {opts.launcher}.asc gs://git-repo-downloads/repo-3.0.asc
 """)
 def get_parser():
  """Get a CLI parser."""
  parser = argparse.ArgumentParser(description=__doc__)
  parser.add_argument('-n', '--dry-run',
                      dest='dryrun', action='store_true',
                      help='show everything that would be done')
  parser.add_argument('--gpgdir',
                      default=os.path.join(util.HOMEDIR, '.gnupg', 'repo'),
                      help='path to dedicated gpg dir with release keys '
                           '(default: ~/.gnupg/repo/)')
  parser.add_argument('--keyid', dest='keys', default=[], action='append',
                      help='alternative signing keys to use')
  parser.add_argument('launcher',
                      default=os.path.join(util.TOPDIR, 'repo'), nargs='?',
                      help='the launcher script to sign')
  return parser
 def main(argv):
  """The main func!"""
  parser = get_parser()
  opts = parser.parse_args(argv)
  if not os.path.exists(opts.gpgdir):
    parser.error(f'--gpgdir does not exist: {opts.gpgdir}')
  if not os.path.exists(opts.launcher):
    parser.error(f'launcher does not exist: {opts.launcher}')
  opts.launcher = os.path.relpath(opts.launcher)
  print(f'Signing "{opts.launcher}" launcher script and saving to '
        f'"{opts.launcher}.asc"')
  if opts.keys:
    print(f'Using custom keys to sign: {" ".join(opts.keys)}')
  else:
    print('Using official Repo release keys to sign')
    opts.keys = [util.KEYID_DSA, util.KEYID_RSA, util.KEYID_ECC]
    util.import_release_key(opts)
  sign(opts)
  check(opts)
  postmsg(opts)
  return 0
 if __name__ == '__main__':
  sys.exit(main(sys.argv[1:]))
--- a/release/sign-tag.py
+++ b/release/sign-tag.py
@ -0,0 +1,144 @@
 #!/usr/bin/env python3
 # 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.
 """Helper tool for signing repo release tags correctly.
 This is intended to be run only by the official Repo release managers, but it
 could be run by people maintaining their own fork of the project.
 NB: Avoid new releases on off-hours.  If something goes wrong, staff/oncall need
 to be active in order to respond quickly & effectively.  Recommend sticking to:
 * Mon - Thu, 9:00 - 14:00 PT (i.e. MTV time)
 * Avoid US holidays (and large international ones if possible)
 * Follow the normal Google production freeze schedule
 """
 import argparse
 import os
 import re
 import subprocess
 import sys
 import util
 # We currently sign with the old DSA key as it's been around the longest.
 # We should transition to RSA by Jun 2020, and ECC by Jun 2021.
 KEYID = util.KEYID_DSA
 # Regular expression to validate tag names.
 RE_VALID_TAG = r'^v([0-9]+[.])+[0-9]+$'
 def sign(opts):
  """Tag the commit & sign it!"""
  # We use ! at the end of the key so that gpg uses this specific key.
  # Otherwise it uses the key as a lookup into the overall key and uses the
  # default signing key.  i.e. It will see that KEYID_RSA is a subkey of
  # another key, and use the primary key to sign instead of the subkey.
  cmd = ['git', 'tag', '-s', opts.tag, '-u', f'{opts.key}!',
         '-m', f'repo {opts.tag}', opts.commit]
  key = 'GNUPGHOME'
  print('+', f'export {key}="{opts.gpgdir}"')
  oldvalue = os.getenv(key)
  os.putenv(key, opts.gpgdir)
  util.run(opts, cmd)
  if oldvalue is None:
    os.unsetenv(key)
  else:
    os.putenv(key, oldvalue)
 def check(opts):
  """Check the signature."""
  util.run(opts, ['git', 'tag', '--verify', opts.tag])
 def postmsg(opts):
  """Helpful info to show at the end for release manager."""
  cmd = ['git', 'rev-parse', 'remotes/origin/stable']
  ret = util.run(opts, cmd, encoding='utf-8', stdout=subprocess.PIPE)
  current_release = ret.stdout.strip()
  cmd = ['git', 'log', '--format=%h (%aN) %s', '--no-merges',
         f'remotes/origin/stable..{opts.tag}']
  ret = util.run(opts, cmd, encoding='utf-8', stdout=subprocess.PIPE)
  shortlog = ret.stdout.strip()
  print(f"""
 Here's the short log since the last release.
 {shortlog}
 To push release to the public:
  git push origin {opts.commit}:stable {opts.tag} -n
 NB: People will start upgrading to this version immediately.
 To roll back a release:
  git push origin --force {current_release}:stable -n
 """)
 def get_parser():
  """Get a CLI parser."""
  parser = argparse.ArgumentParser(
      description=__doc__,
      formatter_class=argparse.RawDescriptionHelpFormatter)
  parser.add_argument('-n', '--dry-run',
                      dest='dryrun', action='store_true',
                      help='show everything that would be done')
  parser.add_argument('--gpgdir',
                      default=os.path.join(util.HOMEDIR, '.gnupg', 'repo'),
                      help='path to dedicated gpg dir with release keys '
                           '(default: ~/.gnupg/repo/)')
  parser.add_argument('-f', '--force', action='store_true',
                      help='force signing of any tag')
  parser.add_argument('--keyid', dest='key',
                      help='alternative signing key to use')
  parser.add_argument('tag',
                      help='the tag to create (e.g. "v2.0")')
  parser.add_argument('commit', default='HEAD', nargs='?',
                      help='the commit to tag')
  return parser
 def main(argv):
  """The main func!"""
  parser = get_parser()
  opts = parser.parse_args(argv)
  if not os.path.exists(opts.gpgdir):
    parser.error(f'--gpgdir does not exist: {opts.gpgdir}')
  if not opts.force and not re.match(RE_VALID_TAG, opts.tag):
    parser.error(f'tag "{opts.tag}" does not match regex "{RE_VALID_TAG}"; '
                 'use --force to sign anyways')
  if opts.key:
    print(f'Using custom key to sign: {opts.key}')
  else:
    print('Using official Repo release key to sign')
    opts.key = KEYID
    util.import_release_key(opts)
  sign(opts)
  check(opts)
  postmsg(opts)
  return 0
 if __name__ == '__main__':
  sys.exit(main(sys.argv[1:]))
--- a/release/util.py
+++ b/release/util.py
@ -0,0 +1,73 @@
 # 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.
 """Random utility code for release tools."""
 import os
 import re
 import subprocess
 import sys
 assert sys.version_info >= (3, 6), 'This module requires Python 3.6+'
 TOPDIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 HOMEDIR = os.path.expanduser('~')
 # These are the release keys we sign with.
 KEYID_DSA = '8BB9AD793E8E6153AF0F9A4416530D5E920F5C65'
 KEYID_RSA = 'A34A13BE8E76BFF46A0C022DA2E75A824AAB9624'
 KEYID_ECC = 'E1F9040D7A3F6DAFAC897CD3D3B95DA243E48A39'
 def cmdstr(cmd):
  """Get a nicely quoted shell command."""
  ret = []
  for arg in cmd:
    if not re.match(r'^[a-zA-Z0-9/_.=-]+$', arg):
      arg = f'"{arg}"'
    ret.append(arg)
  return ' '.join(ret)
 def run(opts, cmd, check=True, **kwargs):
  """Helper around subprocess.run to include logging."""
  print('+', cmdstr(cmd))
  if opts.dryrun:
    cmd = ['true', '--'] + cmd
  try:
    return subprocess.run(cmd, check=check, **kwargs)
  except subprocess.CalledProcessError as e:
    print(f'aborting: {e}', file=sys.stderr)
    sys.exit(1)
 def import_release_key(opts):
  """Import the public key of the official release repo signing key."""
  # Extract the key from our repo launcher.
  launcher = getattr(opts, 'launcher', os.path.join(TOPDIR, 'repo'))
  print(f'Importing keys from "{launcher}" launcher script')
  with open(launcher, encoding='utf-8') as fp:
    data = fp.read()
  keys = re.findall(
      r'\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n[^-]*'
      r'\n-----END PGP PUBLIC KEY BLOCK-----\n', data, flags=re.M)
  run(opts, ['gpg', '--import'], input='\n'.join(keys).encode('utf-8'))
  print('Marking keys as fully trusted')
  run(opts, ['gpg', '--import-ownertrust'],
      input=f'{KEYID_DSA}:6:\n'.encode('utf-8'))
--- a/1159
+++ b/1159
--- a/repo_trace.py
+++ b/repo_trace.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -13,23 +14,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Logic for tracing repo interactions.
 Activated via `repo --trace ...` or `REPO_TRACE=1 repo ...`.
 """
 from __future__ import print_function
 import sys
 import os
 # Env var to implicitly turn on tracing.
 REPO_TRACE = 'REPO_TRACE'
-try:
+_TRACE = os.environ.get(REPO_TRACE) == '1'
-  _TRACE = os.environ[REPO_TRACE] == '1'
+
 except KeyError:
  _TRACE = False
 def IsTrace():
  return _TRACE
 def SetTrace():
  global _TRACE
  _TRACE = True
 def Trace(fmt, *args):
  if IsTrace():
    print(fmt % args, file=sys.stderr)
--- a/55
+++ b/55
@ -0,0 +1,55 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 # Copyright 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Wrapper to run pytest with the right settings."""
 from __future__ import print_function
 import errno
 import os
 import subprocess
 import sys
 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):
  """The main entry."""
  # Add the repo tree to PYTHONPATH as the tests expect to be able to import
  # modules directly.
  pythonpath = os.path.dirname(os.path.realpath(__file__))
  oldpythonpath = os.environ.get('PYTHONPATH', None)
  if oldpythonpath is not None:
    pythonpath += os.pathsep + oldpythonpath
  os.environ['PYTHONPATH'] = pythonpath
  return run_pytest('pytest', argv)
 if __name__ == '__main__':
  sys.exit(main(sys.argv[1:]))
--- a/setup.py
+++ b/setup.py
@ -0,0 +1,63 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 # Copyright 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the 'License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Python packaging for repo."""
 from __future__ import print_function
 import os
 import setuptools
 TOPDIR = os.path.dirname(os.path.abspath(__file__))
 # Rip out the first intro paragraph.
 with open(os.path.join(TOPDIR, 'README.md')) as fp:
    lines = fp.read().splitlines()[2:]
    end = lines.index('')
    long_description = ' '.join(lines[0:end])
 # https://packaging.python.org/tutorials/packaging-projects/
 setuptools.setup(
    name='repo',
    version='1.13.8',
    maintainer='Various',
    maintainer_email='repo-discuss@googlegroups.com',
    description='Repo helps manage many Git repositories',
    long_description=long_description,
    long_description_content_type='text/plain',
    url='https://gerrit.googlesource.com/git-repo/',
    project_urls={
        'Bug Tracker': 'https://bugs.chromium.org/p/gerrit/issues/list?q=component:repo',
    },
    # https://pypi.org/classifiers/
    classifiers=[
        'Development Status :: 6 - Mature',
        'Environment :: Console',
        'Intended Audience :: Developers',
        'License :: OSI Approved :: Apache Software License',
        'Natural Language :: English',
        'Operating System :: MacOS :: MacOS X',
        'Operating System :: Microsoft :: Windows :: Windows 10',
        'Operating System :: POSIX :: Linux',
        'Topic :: Software Development :: Version Control :: Git',
    ],
    # 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,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -15,6 +16,7 @@
 import os
 # A mapping of the subcommand name to the class that implements it.
 all_commands = {}
 my_dir = os.path.dirname(__file__)
@ -36,14 +38,14 @@ for py in os.listdir(my_dir):
                     ['%s' % name])
    mod = getattr(mod, name)
    try:
-      cmd = getattr(mod, clsn)()
+      cmd = getattr(mod, clsn)
    except AttributeError:
      raise SyntaxError('%s/%s does not define class %s' % (
-                         __name__, py, clsn))
+          __name__, py, clsn))
    name = name.replace('_', '-')
    cmd.NAME = name
    all_commands[name] = cmd
-if 'help' in all_commands:
+# Add 'branch' as an alias for 'branches'.
-  all_commands['help'].commands = all_commands
+all_commands['branch'] = all_commands['branches']
--- a/subcmds/abandon.py
+++ b/subcmds/abandon.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -14,16 +15,20 @@
 # limitations under the License.
 from __future__ import print_function
 from collections import defaultdict
 import sys
 from command import Command
 from git_command import git
 from progress import Progress
 class Abandon(Command):
  common = True
  helpSummary = "Permanently abandon a development branch"
  helpUsage = """
-%prog <branchname> [<project>...]
+%prog [--all | <branchname>] [<project>...]
 This subcommand permanently abandons a development branch by
 deleting it (and all its history) from your local repository.
@ -31,41 +36,74 @@ deleting it (and all its history) from your local repository.
 It is equivalent to "git branch -D <branchname>".
 """
-  def Execute(self, opt, args):
+  def _Options(self, p):
-    if not args:
+    p.add_option('-q', '--quiet',
                 action='store_true', default=False,
                 help='be quiet')
    p.add_option('--all',
                 dest='all', action='store_true',
                 help='delete all branches in all projects')
  def ValidateOptions(self, opt, args):
    if not opt.all and not args:
      self.Usage()
-    nb = args[0]
+    if not opt.all:
-    if not git.check_ref_format('heads/%s' % nb):
+      nb = args[0]
-      print("error: '%s' is not a valid name" % nb, file=sys.stderr)
+      if not git.check_ref_format('heads/%s' % nb):
-      sys.exit(1)
+        self.OptionParser.error("'%s' is not a valid branch name" % nb)
    else:
      args.insert(0, "'All local branches'")
  def Execute(self, opt, args):
    nb = args[0]
-    err = []
+    err = defaultdict(list)
-    success = []
+    success = defaultdict(list)
    all_projects = self.GetProjects(args[1:])
    pm = Progress('Abandon %s' % nb, len(all_projects))
    for project in all_projects:
      pm.update()
-      status = project.AbandonBranch(nb)
+      if opt.all:
-      if status is not None:
+        branches = list(project.GetBranches().keys())
-        if status:
+      else:
-          success.append(project)
+        branches = [nb]
-        else:
+
-          err.append(project)
+      for name in branches:
        status = project.AbandonBranch(name)
        if status is not None:
          if status:
            success[name].append(project)
          else:
            err[name].append(project)
    pm.end()
    width = 25
    for name in branches:
      if width < len(name):
        width = len(name)
    if err:
-      for p in err:
+      for br in err.keys():
-        print("error: %s/: cannot abandon %s" % (p.relpath, nb),
+        err_msg = "error: cannot abandon %s" % br
-              file=sys.stderr)
+        print(err_msg, file=sys.stderr)
        for proj in err[br]:
          print(' ' * len(err_msg) + " | %s" % proj.relpath, file=sys.stderr)
      sys.exit(1)
    elif not success:
-      print('error: no project has branch %s' % nb, file=sys.stderr)
+      print('error: no project has local branch(es) : %s' % nb,
            file=sys.stderr)
      sys.exit(1)
    else:
-      print('Abandoned in %d project(s):\n  %s'
+      # Everything below here is displaying status.
-            % (len(success), '\n  '.join(p.relpath for p in success)),
+      if opt.quiet:
-            file=sys.stderr)
+        return
      print('Abandoned branches:')
      for br in success.keys():
        if len(all_projects) > 1 and len(all_projects) == len(success[br]):
          result = "all project"
        else:
          result = "%s" % (
              ('\n' + ' ' * width + '| ').join(p.relpath for p in success[br]))
        print("%s%s| %s\n" % (br, ' ' * (width - len(br)), result))
--- a/subcmds/branches.py
+++ b/subcmds/branches.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -18,13 +19,15 @@ import sys
 from color import Coloring
 from command import Command
 class BranchColoring(Coloring):
  def __init__(self, config):
    Coloring.__init__(self, config, 'branch')
    self.current = self.printer('current', fg='green')
-    self.local   = self.printer('local')
+    self.local = self.printer('local')
    self.notinproject = self.printer('notinproject', fg='red')
 class BranchInfo(object):
  def __init__(self, name):
    self.name = name
@ -67,8 +70,7 @@ class Branches(Command):
 Summarizes the currently available topic branches.
-Branch Display
+# Branch Display
 --------------
 The branch display output by this command is organized into four
 columns of information; for example:
@ -158,7 +160,7 @@ is shown, then the branch appears in all projects.
          for b in i.projects:
            have.add(b.project)
          for p in projects:
-            if not p in have:
+            if p not in have:
              paths.append(p.relpath)
        s = ' %s %s' % (in_type, ', '.join(paths))
@ -170,11 +172,11 @@ is shown, then the branch appears in all projects.
          fmt = out.current if i.IsCurrent else out.write
          for p in paths:
            out.nl()
-            fmt(width*' ' + '          %s' % p)
+            fmt(width * ' ' + '          %s' % p)
          fmt = out.write
          for p in non_cur_paths:
            out.nl()
-            fmt(width*' ' + '          %s' % p)
+            fmt(width * ' ' + '          %s' % p)
      else:
        out.write(' in all projects')
      out.nl()
--- a/subcmds/checkout.py
+++ b/subcmds/checkout.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -18,6 +19,7 @@ import sys
 from command import Command
 from progress import Progress
 class Checkout(Command):
  common = True
  helpSummary = "Checkout a branch for development"
@ -33,10 +35,11 @@ The command is equivalent to:
  repo forall [<project>...] -c git checkout <branchname>
 """
-  def Execute(self, opt, args):
+  def ValidateOptions(self, opt, args):
    if not args:
      self.Usage()
  def Execute(self, opt, args):
    nb = args[0]
    err = []
    success = []
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2010 The Android Open Source Project
 #
@ -21,6 +22,7 @@ from git_command import GitCommand
 CHANGE_ID_RE = re.compile(r'^\s*Change-Id: I([0-9a-f]{40})\s*$')
 class CherryPick(Command):
  common = True
  helpSummary = "Cherry-pick a change."
@ -36,16 +38,17 @@ change id will be added.
  def _Options(self, p):
    pass
-  def Execute(self, opt, args):
+  def ValidateOptions(self, opt, args):
    if len(args) != 1:
      self.Usage()
  def Execute(self, opt, args):
    reference = args[0]
    p = GitCommand(None,
                   ['rev-parse', '--verify', reference],
-                   capture_stdout = True,
+                   capture_stdout=True,
-                   capture_stderr = True)
+                   capture_stderr=True)
    if p.Wait() != 0:
      print(p.stderr, file=sys.stderr)
      sys.exit(1)
@ -59,8 +62,8 @@ change id will be added.
    p = GitCommand(None,
                   ['cherry-pick', sha1],
-                   capture_stdout = True,
+                   capture_stdout=True,
-                   capture_stderr = True)
+                   capture_stderr=True)
    status = p.Wait()
    print(p.stdout, file=sys.stdout)
@ -72,9 +75,9 @@ change id will be added.
      new_msg = self._Reformat(old_msg, sha1)
      p = GitCommand(None, ['commit', '--amend', '-F', '-'],
-                     provide_stdin = True,
+                     provide_stdin=True,
-                     capture_stdout = True,
+                     capture_stdout=True,
-                     capture_stderr = True)
+                     capture_stderr=True)
      p.stdin.write(new_msg)
      p.stdin.close()
      if p.Wait() != 0:
@ -95,7 +98,7 @@ change id will be added.
  def _StripHeader(self, commit_msg):
    lines = commit_msg.splitlines()
-    return "\n".join(lines[lines.index("")+1:])
+    return "\n".join(lines[lines.index("") + 1:])
  def _Reformat(self, old_msg, sha1):
    new_msg = []
--- a/subcmds/diff.py
+++ b/subcmds/diff.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -15,6 +16,7 @@
 from command import PagedCommand
 class Diff(PagedCommand):
  common = True
  helpSummary = "Show changes between commit and working tree"
@ -27,14 +29,13 @@ to the Unix 'patch' command.
 """
  def _Options(self, p):
    def cmd(option, opt_str, value, parser):
      setattr(parser.values, option.dest, list(parser.rargs))
      while parser.rargs:
        del parser.rargs[0]
    p.add_option('-u', '--absolute',
                 dest='absolute', action='store_true',
                 help='Paths are relative to the repository root')
  def Execute(self, opt, args):
    ret = 0
    for project in self.GetProjects(args):
-      project.PrintWorkTreeDiff(opt.absolute)
+      if not project.PrintWorkTreeDiff(opt.absolute):
        ret = 1
    return ret
--- a/subcmds/diffmanifests.py
+++ b/subcmds/diffmanifests.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2014 The Android Open Source Project
 #
@ -17,10 +18,12 @@ from color import Coloring
 from command import PagedCommand
 from manifest_xml import XmlManifest
 class _Coloring(Coloring):
  def __init__(self, config):
    Coloring.__init__(self, config, "status")
 class Diffmanifests(PagedCommand):
  """ A command to see logs in projects represented by manifests
@ -71,8 +74,12 @@ synced and their revisions won't be found.
    p.add_option('--no-color',
                 dest='color', action='store_false', default=True,
                 help='does not display the diff in color.')
    p.add_option('--pretty-format',
                 dest='pretty_format', action='store',
                 metavar='<FORMAT>',
                 help='print the log using a custom git pretty format string')
-  def _printRawDiff(self, diff):
+  def _printRawDiff(self, diff, pretty_format=None):
    for project in diff['added']:
      self.printText("A %s %s" % (project.relpath, project.revisionExpr))
      self.out.nl()
@ -85,14 +92,14 @@ synced and their revisions won't be found.
      self.printText("C %s %s %s" % (project.relpath, project.revisionExpr,
                                     otherProject.revisionExpr))
      self.out.nl()
-      self._printLogs(project, otherProject, raw=True, color=False)
+      self._printLogs(project, otherProject, raw=True, color=False, pretty_format=pretty_format)
    for project, otherProject in diff['unreachable']:
      self.printText("U %s %s %s" % (project.relpath, project.revisionExpr,
                                     otherProject.revisionExpr))
      self.out.nl()
-  def _printDiff(self, diff, color=True):
+  def _printDiff(self, diff, color=True, pretty_format=None):
    if diff['added']:
      self.out.nl()
      self.printText('added projects : \n')
@ -124,7 +131,8 @@ synced and their revisions won't be found.
        self.printText(' to ')
        self.printRevision(otherProject.revisionExpr)
        self.out.nl()
-        self._printLogs(project, otherProject, raw=False, color=color)
+        self._printLogs(project, otherProject, raw=False, color=color,
                        pretty_format=pretty_format)
        self.out.nl()
    if diff['unreachable']:
@ -139,9 +147,13 @@ synced and their revisions won't be found.
        self.printText(' not found')
        self.out.nl()
-  def _printLogs(self, project, otherProject, raw=False, color=True):
+  def _printLogs(self, project, otherProject, raw=False, color=True,
-    logs = project.getAddedAndRemovedLogs(otherProject, oneline=True,
+                 pretty_format=None):
-                                          color=color)
+
    logs = project.getAddedAndRemovedLogs(otherProject,
                                          oneline=(pretty_format is None),
                                          color=color,
                                          pretty_format=pretty_format)
    if logs['removed']:
      removedLogs = logs['removed'].split('\n')
      for log in removedLogs:
@ -166,30 +178,31 @@ synced and their revisions won't be found.
            self.printText(log)
            self.out.nl()
-  def Execute(self, opt, args):
+  def ValidateOptions(self, opt, args):
    if not args or len(args) > 2:
-      self.Usage()
+      self.OptionParser.error('missing manifests to diff')
  def Execute(self, opt, args):
    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')
+      self.printProject = self.out.nofmt_printer('project', attr='bold')
-      self.printAdded = self.out.nofmt_printer('green', fg = 'green', attr = 'bold')
+      self.printAdded = self.out.nofmt_printer('green', fg='green', attr='bold')
-      self.printRemoved = self.out.nofmt_printer('red', fg = 'red', attr = 'bold')
+      self.printRemoved = self.out.nofmt_printer('red', fg='red', attr='bold')
-      self.printRevision = self.out.nofmt_printer('revision', fg = 'yellow')
+      self.printRevision = self.out.nofmt_printer('revision', fg='yellow')
    else:
      self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText
    manifest1 = XmlManifest(self.manifest.repodir)
-    manifest1.Override(args[0])
+    manifest1.Override(args[0], load_local_manifests=False)
    if len(args) == 1:
      manifest2 = self.manifest
    else:
      manifest2 = XmlManifest(self.manifest.repodir)
-      manifest2.Override(args[1])
+      manifest2.Override(args[1], load_local_manifests=False)
    diff = manifest1.projectsDiff(manifest2)
    if opt.raw:
-      self._printRawDiff(diff)
+      self._printRawDiff(diff, pretty_format=opt.pretty_format)
    else:
-      self._printDiff(diff, color=opt.color)
+      self._printDiff(diff, color=opt.color, pretty_format=opt.pretty_format)
--- a/subcmds/download.py
+++ b/subcmds/download.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -22,21 +23,27 @@ from error import GitError
 CHANGE_RE = re.compile(r'^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$')
 class Download(Command):
  common = True
  helpSummary = "Download and checkout a change"
  helpUsage = """
-%prog {project change[/patchset]}...
+%prog {[project] change[/patchset]}...
 """
  helpDescription = """
 The '%prog' command downloads a change from the review system and
 makes it available in your project's local working directory.
 If no project is specified try to use current directory as a project.
 """
  def _Options(self, p):
    p.add_option('-b', '--branch',
                 help='create a new branch first')
    p.add_option('-c', '--cherry-pick',
                 dest='cherrypick', action='store_true',
                 help="cherry-pick instead of checkout")
    p.add_option('-x', '--record-origin', action='store_true',
                 help='pass -x when cherry-picking')
    p.add_option('-r', '--revert',
                 dest='revert', action='store_true',
                 help="revert instead of checkout")
@ -55,17 +62,34 @@ makes it available in your project's local working directory.
      m = CHANGE_RE.match(a)
      if m:
        if not project:
-          self.Usage()
+          project = self.GetProjects(".")[0]
        chg_id = int(m.group(1))
        if m.group(2):
          ps_id = int(m.group(2))
        else:
          ps_id = 1
          refs = 'refs/changes/%2.2d/%d/' % (chg_id % 100, chg_id)
          output = project._LsRemote(refs + '*')
          if output:
            regex = refs + r'(\d+)'
            rcomp = re.compile(regex, re.I)
            for line in output.splitlines():
              match = rcomp.search(line)
              if match:
                ps_id = max(int(match.group(1)), ps_id)
        to_get.append((project, chg_id, ps_id))
      else:
        project = self.GetProjects([a])[0]
    return to_get
  def ValidateOptions(self, opt, args):
    if opt.record_origin:
      if not opt.cherrypick:
        self.OptionParser.error('-x only makes sense with --cherry-pick')
      if opt.ffonly:
        self.OptionParser.error('-x and --ff are mutually exclusive options')
  def Execute(self, opt, args):
    for project, change_id, ps_id in self._ParseChangeIds(args):
      dl = project.DownloadPatchSet(change_id, ps_id)
@ -82,22 +106,41 @@ makes it available in your project's local working directory.
        continue
      if len(dl.commits) > 1:
-        print('[%s] %d/%d depends on %d unmerged changes:' \
+        print('[%s] %d/%d depends on %d unmerged changes:'
              % (project.name, change_id, ps_id, len(dl.commits)),
              file=sys.stderr)
        for c in dl.commits:
          print('  %s' % (c), file=sys.stderr)
      if opt.cherrypick:
        try:
          project._CherryPick(dl.commit)
        except GitError:
          print('[%s] Could not complete the cherry-pick of %s' \
                % (project.name, dl.commit), file=sys.stderr)
          sys.exit(1)
      if opt.cherrypick:
        mode = 'cherry-pick'
      elif opt.revert:
-        project._Revert(dl.commit)
+        mode = 'revert'
      elif opt.ffonly:
-        project._FastForward(dl.commit, ffonly=True)
+        mode = 'fast-forward merge'
      else:
-        project._Checkout(dl.commit)
+        mode = 'checkout'
      # We'll combine the branch+checkout operation, but all the rest need a
      # dedicated branch start.
      if opt.branch and mode != 'checkout':
        project.StartBranch(opt.branch)
      try:
        if opt.cherrypick:
          project._CherryPick(dl.commit, ffonly=opt.ffonly,
                              record_origin=opt.record_origin)
        elif opt.revert:
          project._Revert(dl.commit)
        elif opt.ffonly:
          project._FastForward(dl.commit, ffonly=True)
        else:
          if opt.branch:
            project.StartBranch(opt.branch, revision=dl.commit)
          else:
            project._Checkout(dl.commit)
      except GitError:
        print('[%s] Could not complete the %s of %s'
              % (project.name, mode, dl.commit), file=sys.stderr)
        sys.exit(1)
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -15,23 +16,22 @@
 from __future__ import print_function
 import errno
 import fcntl
 import multiprocessing
 import re
 import os
 import select
 import signal
 import sys
 import subprocess
 from color import Coloring
 from command import Command, MirrorSafeCommand
 import platform_utils
 _CAN_COLOR = [
-  'branch',
+    'branch',
-  'diff',
+    'diff',
-  'grep',
+    'grep',
-  'log',
+    'log',
 ]
@ -54,8 +54,7 @@ Executes the same shell command in each project.
 The -r option allows running the command only on projects matching
 regex or wildcard expression.
-Output Formatting
+# Output Formatting
 -----------------
 The -p option causes '%prog' to bind pipes to the command's stdin,
 stdout and stderr streams, and pipe all output into a continuous
@ -72,8 +71,7 @@ command produces output only on stderr.  Normally the -p option
 causes command output to be suppressed until the command produces
 at least one byte of output on stdout.
-Environment
+# Environment
 -----------
 pwd is the project's working directory.  If the current client is
 a mirror client, then pwd is the Git repository.
@ -105,6 +103,13 @@ annotating tree details.
 shell positional arguments ($1, $2, .., $#) are set to any arguments
 following <command>.
 Example: to list projects:
  %prog -c 'echo $REPO_PROJECT'
 Notice that $REPO_PROJECT is quoted to ensure it is expanded in
 the context of running <command> instead of in the calling shell.
 Unless -p is used, stdin, stdout, stderr are inherited from the
 terminal and are not redirected.
@ -120,6 +125,13 @@ without iterating through the remaining projects.
    p.add_option('-r', '--regex',
                 dest='regex', action='store_true',
                 help="Execute the command only on projects matching regex or wildcard expression")
    p.add_option('-i', '--inverse-regex',
                 dest='inverse_regex', action='store_true',
                 help="Execute the command only on projects not matching regex or "
                      "wildcard expression")
    p.add_option('-g', '--groups',
                 dest='groups',
                 help="Execute the command only on projects matching the specified groups")
    p.add_option('-c', '--command',
                 help='Command (and arguments) to execute',
                 dest='command',
@ -128,6 +140,9 @@ without iterating through the remaining projects.
    p.add_option('-e', '--abort-on-errors',
                 dest='abort_on_errors', action='store_true',
                 help='Abort if a command exits unsuccessfully')
    p.add_option('--ignore-missing', action='store_true',
                 help='Silently skip & do not exit non-zero due missing '
                      'checkouts')
    g = p.add_option_group('Output')
    g.add_option('-p',
@ -156,20 +171,23 @@ without iterating through the remaining projects.
    else:
      lrev = None
    return {
-      'name': project.name,
+        'name': project.name,
-      'relpath': project.relpath,
+        'relpath': project.relpath,
-      'remote_name': project.remote.name,
+        'remote_name': project.remote.name,
-      'lrev': lrev,
+        'lrev': lrev,
-      'rrev': project.revisionExpr,
+        'rrev': project.revisionExpr,
-      'annotations': dict((a.name, a.value) for a in project.annotations),
+        'annotations': dict((a.name, a.value) for a in project.annotations),
-      'gitdir': project.gitdir,
+        'gitdir': project.gitdir,
-      'worktree': project.worktree,
+        'worktree': project.worktree,
        'upstream': project.upstream,
        'dest_branch': project.dest_branch,
    }
-  def Execute(self, opt, args):
+  def ValidateOptions(self, opt, args):
    if not opt.command:
      self.Usage()
  def Execute(self, opt, args):
    cmd = [opt.command[0]]
    shell = True
@ -180,9 +198,9 @@ without iterating through the remaining projects.
      cmd.append(cmd[0])
    cmd.extend(opt.command[1:])
-    if  opt.project_header \
+    if opt.project_header \
-    and not shell \
+            and not shell \
-    and cmd[0] == 'git':
+            and cmd[0] == 'git':
      # If this is a direct git command that can enable colorized
      # output and the user prefers coloring, add --color into the
      # command line because we are going to wrap the command into
@ -193,29 +211,29 @@ without iterating through the remaining projects.
          break
      else:
        cn = None
      # pylint: disable=W0631
      if cn and cn in _CAN_COLOR:
        class ColorCmd(Coloring):
          def __init__(self, config, cmd):
            Coloring.__init__(self, config, cmd)
        if ColorCmd(self.manifest.manifestProject.config, cn).is_on:
          cmd.insert(cmd.index(cn) + 1, '--color')
      # pylint: enable=W0631
    mirror = self.manifest.IsMirror
    rc = 0
    smart_sync_manifest_name = "smart_sync_override.xml"
    smart_sync_manifest_path = os.path.join(
-      self.manifest.manifestProject.worktree, smart_sync_manifest_name)
+        self.manifest.manifestProject.worktree, smart_sync_manifest_name)
    if os.path.isfile(smart_sync_manifest_path):
      self.manifest.Override(smart_sync_manifest_path)
-    if not opt.regex:
+    if opt.regex:
      projects = self.GetProjects(args)
    else:
      projects = self.FindProjects(args)
    elif opt.inverse_regex:
      projects = self.FindProjects(args, inverse=True)
    else:
      projects = self.GetProjects(args, groups=opt.groups)
    os.environ['REPO_COUNT'] = str(len(projects))
@ -223,8 +241,8 @@ without iterating through the remaining projects.
    try:
      config = self.manifest.manifestProject.config
      results_it = pool.imap(
-         DoWorkWrapper,
+          DoWorkWrapper,
-         self.ProjectArgs(projects, mirror, opt, cmd, shell, config))
+          self.ProjectArgs(projects, mirror, opt, cmd, shell, config))
      pool.close()
      for r in results_it:
        rc = rc or r
@ -237,7 +255,8 @@ without iterating through the remaining projects.
      rc = rc or errno.EINTR
    except Exception as e:
      # Catch any other exceptions raised
-      print('Got an error, terminating the pool: %r' % e,
+      print('Got an error, terminating the pool: %s: %s' %
            (type(e).__name__, e),
            file=sys.stderr)
      pool.terminate()
      rc = rc or getattr(e, 'errno', 1)
@ -251,7 +270,8 @@ without iterating through the remaining projects.
      try:
        project = self._SerializeProject(p)
      except Exception as e:
-        print('Project list error: %r' % e,
+        print('Project list error on project %s: %s: %s' %
              (p.name, type(e).__name__, e),
              file=sys.stderr)
        return
      except KeyboardInterrupt:
@ -260,6 +280,7 @@ without iterating through the remaining projects.
        return
      yield [mirror, opt, cmd, shell, cnt, config, project]
 class WorkerKeyboardInterrupt(Exception):
  """ Keyboard interrupt exception for worker processes. """
  pass
@ -268,6 +289,7 @@ class WorkerKeyboardInterrupt(Exception):
 def InitWorker():
  signal.signal(signal.SIGINT, signal.SIG_IGN)
 def DoWorkWrapper(args):
  """ A wrapper around the DoWork() method.
@ -286,11 +308,10 @@ def DoWorkWrapper(args):
 def DoWork(project, mirror, opt, cmd, shell, cnt, config):
  env = os.environ.copy()
  def setenv(name, val):
    if val is None:
      val = ''
    if hasattr(val, 'encode'):
      val = val.encode()
    env[name] = val
  setenv('REPO_PROJECT', project['name'])
@ -298,6 +319,8 @@ def DoWork(project, mirror, opt, cmd, shell, cnt, config):
  setenv('REPO_REMOTE', project['remote_name'])
  setenv('REPO_LREV', project['lrev'])
  setenv('REPO_RREV', project['rrev'])
  setenv('REPO_UPSTREAM', project['upstream'])
  setenv('REPO_DEST_BRANCH', project['dest_branch'])
  setenv('REPO_I', str(cnt + 1))
  for name in project['annotations']:
    setenv("REPO__%s" % (name), project['annotations'][name])
@ -309,10 +332,14 @@ def DoWork(project, mirror, opt, cmd, shell, cnt, config):
    cwd = project['worktree']
  if not os.path.exists(cwd):
-    if (opt.project_header and opt.verbose) \
+    # Allow the user to silently ignore missing checkouts so they can run on
-    or not opt.project_header:
+    # partial checkouts (good for infra recovery tools).
    if opt.ignore_missing:
      return 0
    if ((opt.project_header and opt.verbose)
            or not opt.project_header):
      print('skipping %s/' % project['relpath'], file=sys.stderr)
-    return
+    return 1
  if opt.project_header:
    stdin = subprocess.PIPE
@ -334,35 +361,25 @@ def DoWork(project, mirror, opt, cmd, shell, cnt, config):
  if opt.project_header:
    out = ForallColoring(config)
    out.redirect(sys.stdout)
    class sfd(object):
      def __init__(self, fd, dest):
        self.fd = fd
        self.dest = dest
      def fileno(self):
        return self.fd.fileno()
    empty = True
    errbuf = ''
    p.stdin.close()
-    s_in = [sfd(p.stdout, sys.stdout),
+    s_in = platform_utils.FileDescriptorStreams.create()
-            sfd(p.stderr, sys.stderr)]
+    s_in.add(p.stdout, sys.stdout, 'stdout')
    s_in.add(p.stderr, sys.stderr, 'stderr')
-    for s in s_in:
+    while not s_in.is_done:
-      flags = fcntl.fcntl(s.fd, fcntl.F_GETFL)
+      in_ready = s_in.select()
      fcntl.fcntl(s.fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
    while s_in:
      in_ready, _out_ready, _err_ready = select.select(s_in, [], [])
      for s in in_ready:
-        buf = s.fd.read(4096)
+        buf = s.read().decode()
        if not buf:
          s.fd.close()
          s_in.remove(s)
          s.close()
          continue
        if not opt.verbose:
-          if s.fd != p.stdout:
+          if s.std_name == 'stderr':
            errbuf += buf
            continue
--- a/subcmds/gitc_delete.py
+++ b/subcmds/gitc_delete.py
@ -0,0 +1,53 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2015 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.
 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
  visible_everywhere = False
  helpSummary = "Delete a GITC Client."
  helpUsage = """
 %prog
 """
  helpDescription = """
 This subcommand deletes the current GITC client, deleting the GITC manifest
 and all locally downloaded sources.
 """
  def _Options(self, p):
    p.add_option('-f', '--force',
                 dest='force', action='store_true',
                 help='Force the deletion (no prompt).')
  def Execute(self, opt, args):
    if not opt.force:
      prompt = ('This will delete GITC client: %s\nAre you sure? (yes/no) ' %
                self.gitc_manifest.gitc_client_name)
      response = input(prompt).lower()
      if not response == 'yes':
        print('Response was not "yes"\n Exiting...')
        sys.exit(1)
    platform_utils.rmtree(self.gitc_manifest.gitc_client_dir)
--- a/subcmds/gitc_init.py
+++ b/subcmds/gitc_init.py
@ -0,0 +1,84 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2015 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.
 from __future__ import print_function
 import os
 import sys
 import gitc_utils
 from command import GitcAvailableCommand
 from manifest_xml import GitcManifest
 from subcmds import init
 import wrapper
 class GitcInit(init.Init, GitcAvailableCommand):
  common = True
  helpSummary = "Initialize a GITC Client."
  helpUsage = """
 %prog [options] [client name]
 """
  helpDescription = """
 The '%prog' command is ran to initialize a new GITC client for use
 with the GITC file system.
 This command will setup the client directory, initialize repo, just
 like repo init does, and then downloads the manifest collection
 and installs it in the .repo/directory of the GITC client.
 Once this is done, a GITC manifest is generated by pulling the HEAD
 SHA for each project and generates the properly formatted XML file
 and installs it as .manifest in the GITC client directory.
 The -c argument is required to specify the GITC client name.
 The optional -f argument can be used to specify the manifest file to
 use for this GITC client.
 """
  def _Options(self, p):
    super(GitcInit, self)._Options(p, gitc_init=True)
    g = p.add_option_group('GITC options')
    g.add_option('-f', '--manifest-file',
                 dest='manifest_file',
                 help='Optional manifest file to use for this GITC client.')
    g.add_option('-c', '--gitc-client',
                 dest='gitc_client',
                 help='The name of the gitc_client instance to create or modify.')
  def Execute(self, opt, args):
    gitc_client = gitc_utils.parse_clientdir(os.getcwd())
    if not gitc_client or (opt.gitc_client and gitc_client != opt.gitc_client):
      print('fatal: Please update your repo command. See go/gitc for instructions.',
            file=sys.stderr)
      sys.exit(1)
    self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
                                   gitc_client)
    super(GitcInit, self).Execute(opt, args)
    manifest_file = self.manifest.manifestFile
    if opt.manifest_file:
      if not os.path.exists(opt.manifest_file):
        print('fatal: Specified manifest file %s does not exist.' %
              opt.manifest_file)
        sys.exit(1)
      manifest_file = opt.manifest_file
    manifest = GitcManifest(self.repodir, gitc_client)
    manifest.Override(manifest_file)
    gitc_utils.generate_gitc_manifest(None, manifest)
    print('Please run `cd %s` to view your GITC client.' %
          os.path.join(wrapper.Wrapper().GITC_FS_ROOT_DIR, gitc_client))
--- a/subcmds/grep.py
+++ b/subcmds/grep.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -14,15 +15,21 @@
 # limitations under the License.
 from __future__ import print_function
 import sys
 from color import Coloring
 from command import PagedCommand
-from git_command import git_require, GitCommand
+from error import GitError
 from git_command import GitCommand
 class GrepColoring(Coloring):
  def __init__(self, config):
    Coloring.__init__(self, config, 'grep')
    self.project = self.printer('project', attr='bold')
    self.fail = self.printer('fail', fg='red')
 class Grep(PagedCommand):
  common = True
@ -33,8 +40,7 @@ class Grep(PagedCommand):
  helpDescription = """
 Search for the specified patterns in all project files.
-Boolean Options
+# Boolean Options
 ---------------
 The following options can appear as often as necessary to express
 the pattern to locate:
@ -47,8 +53,7 @@ in order to scan multiple trees.  If the same file matches in more
 than one tree, only the first result is reported, prefixed by the
 revision name it was found under.
-Examples
+# Examples
 -------
 Look for a line that has '#define' and either 'MAX_PATH or 'PATH_MAX':
@ -153,12 +158,11 @@ contain a line that matches both expressions:
                 action='callback', callback=carry,
                 help='Show only file names not containing matching lines')
  def Execute(self, opt, args):
    out = GrepColoring(self.manifest.manifestProject.config)
    cmd_argv = ['grep']
-    if out.is_on and git_require((1, 6, 3)):
+    if out.is_on:
      cmd_argv.append('--color')
    cmd_argv.extend(getattr(opt, 'cmd_argv', []))
@ -185,15 +189,25 @@ contain a line that matches both expressions:
      cmd_argv.extend(opt.revision)
    cmd_argv.append('--')
    git_failed = False
    bad_rev = False
    have_match = False
    for project in projects:
-      p = GitCommand(project,
+      try:
-                     cmd_argv,
+        p = GitCommand(project,
-                     bare = False,
+                       cmd_argv,
-                     capture_stdout = True,
+                       bare=False,
-                     capture_stderr = True)
+                       capture_stdout=True,
                       capture_stderr=True)
      except GitError as e:
        git_failed = True
        out.project('--- project %s ---' % project.relpath)
        out.nl()
        out.fail('%s', str(e))
        out.nl()
        continue
      if p.Wait() != 0:
        # no results
        #
@ -203,7 +217,7 @@ contain a line that matches both expressions:
          else:
            out.project('--- project %s ---' % project.relpath)
            out.nl()
-            out.write("%s", p.stderr)
+            out.fail('%s', p.stderr.strip())
            out.nl()
        continue
      have_match = True
@ -232,7 +246,9 @@ contain a line that matches both expressions:
        for line in r:
          print(line)
-    if have_match:
+    if git_failed:
      sys.exit(1)
    elif have_match:
      sys.exit(0)
    elif have_rev and bad_rev:
      for r in opt.revision:
--- a/subcmds/help.py
+++ b/subcmds/help.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -18,8 +19,11 @@ import re
 import sys
 from formatter import AbstractFormatter, DumbWriter
 from subcmds import all_commands
 from color import Coloring
-from command import PagedCommand, MirrorSafeCommand
+from command import PagedCommand, MirrorSafeCommand, GitcAvailableCommand, GitcClientCommand
 import gitc_utils
 class Help(PagedCommand, MirrorSafeCommand):
  common = False
@ -31,50 +35,54 @@ class Help(PagedCommand, MirrorSafeCommand):
 Displays detailed usage information about a command.
 """
-  def _PrintAllCommands(self):
+  def _PrintCommands(self, commandNames):
-    print('usage: repo COMMAND [ARGS]')
+    """Helper to display |commandNames| summaries."""
    print('The complete list of recognized repo commands are:')
    commandNames = list(sorted(self.commands))
    maxlen = 0
    for name in commandNames:
      maxlen = max(maxlen, len(name))
    fmt = '  %%-%ds  %%s' % maxlen
    for name in commandNames:
-      command = self.commands[name]
+      command = all_commands[name]()
      try:
        summary = command.helpSummary.strip()
      except AttributeError:
        summary = ''
      print(fmt % (name, summary))
  def _PrintAllCommands(self):
    print('usage: repo COMMAND [ARGS]')
    print('The complete list of recognized repo commands are:')
    commandNames = list(sorted(all_commands))
    self._PrintCommands(commandNames)
    print("See 'repo help <command>' for more information on a "
          'specific command.')
  def _PrintCommonCommands(self):
    print('usage: repo COMMAND [ARGS]')
    print('The most commonly used repo commands are:')
    def gitc_supported(cmd):
      if not isinstance(cmd, GitcAvailableCommand) and not isinstance(cmd, GitcClientCommand):
        return True
      if self.manifest.isGitcClient:
        return True
      if isinstance(cmd, GitcClientCommand):
        return False
      if gitc_utils.get_gitc_manifest_dir():
        return True
      return False
    commandNames = list(sorted([name
-                    for name, command in self.commands.items()
+                                for name, command in all_commands.items()
-                    if command.common]))
+                                if command.common and gitc_supported(command)]))
    self._PrintCommands(commandNames)
    maxlen = 0
    for name in commandNames:
      maxlen = max(maxlen, len(name))
    fmt = '  %%-%ds  %%s' % maxlen
    for name in commandNames:
      command = self.commands[name]
      try:
        summary = command.helpSummary.strip()
      except AttributeError:
        summary = ''
      print(fmt % (name, summary))
    print(
-"See 'repo help <command>' for more information on a specific command.\n"
+        "See 'repo help <command>' for more information on a specific command.\n"
-"See 'repo help --all' for a complete list of recognized commands.")
+        "See 'repo help --all' for a complete list of recognized commands.")
-  def _PrintCommandHelp(self, cmd):
+  def _PrintCommandHelp(self, cmd, header_prefix=''):
    class _Out(Coloring):
      def __init__(self, gc):
        Coloring.__init__(self, gc, 'help')
@ -92,17 +100,15 @@ Displays detailed usage information about a command.
        self.nl()
-        self.heading('%s', heading)
+        self.heading('%s%s', header_prefix, heading)
        self.nl()
        self.heading('%s', ''.ljust(len(heading), '-'))
        self.nl()
        me = 'repo %s' % cmd.NAME
        body = body.strip()
        body = body.replace('%prog', me)
-        asciidoc_hdr = re.compile(r'^\n?([^\n]{1,})\n([=~-]{2,})$')
+        asciidoc_hdr = re.compile(r'^\n?#+ (.+)$')
        for para in body.split("\n\n"):
          if para.startswith(' '):
            self.write('%s', para)
@ -112,19 +118,8 @@ Displays detailed usage information about a command.
          m = asciidoc_hdr.match(para)
          if m:
-            title = m.group(1)
+            self.heading('%s%s', header_prefix, m.group(1))
            section_type = m.group(2)
            if section_type[0] in ('=', '-'):
              p = self.heading
            else:
              def _p(fmt, *args):
                self.write('  ')
                self.heading(fmt, *args)
              p = _p
            p('%s', title)
            self.nl()
            p('%s', ''.ljust(len(title), section_type[0]))
            self.nl()
            continue
@ -137,14 +132,25 @@ Displays detailed usage information about a command.
    cmd.OptionParser.print_help()
    out._PrintSection('Description', 'helpDescription')
  def _PrintAllCommandHelp(self):
    for name in sorted(all_commands):
      cmd = all_commands[name]()
      cmd.manifest = self.manifest
      self._PrintCommandHelp(cmd, header_prefix='[%s] ' % (name,))
  def _Options(self, p):
    p.add_option('-a', '--all',
                 dest='show_all', action='store_true',
                 help='show the complete list of commands')
    p.add_option('--help-all',
                 dest='show_all_help', action='store_true',
                 help='show the --help of all commands')
  def Execute(self, opt, args):
    if len(args) == 0:
-      if opt.show_all:
+      if opt.show_all_help:
        self._PrintAllCommandHelp()
      elif opt.show_all:
        self._PrintAllCommands()
      else:
        self._PrintCommonCommands()
@ -153,7 +159,7 @@ Displays detailed usage information about a command.
      name = args[0]
      try:
-        cmd = self.commands[name]
+        cmd = all_commands[name]()
      except KeyError:
        print("repo: '%s' is not a repo command." % name, file=sys.stderr)
        sys.exit(1)
--- a/subcmds/info.py
+++ b/subcmds/info.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2012 The Android Open Source Project
 #
@ -15,13 +16,14 @@
 from command import PagedCommand
 from color import Coloring
-from error import NoSuchProjectError
+from git_refs import R_M, R_HEADS
-from git_refs import R_M
+
 class _Coloring(Coloring):
  def __init__(self, config):
    Coloring.__init__(self, config, "status")
 class Info(PagedCommand):
  common = True
  helpSummary = "Get info on the manifest branch, current branch or unmerged branches"
@ -41,15 +43,14 @@ class Info(PagedCommand):
                 dest="local", action="store_true",
                 help="Disable all remote operations")
  def Execute(self, opt, args):
    self.out = _Coloring(self.manifest.globalConfig)
-    self.heading = self.out.printer('heading', attr = 'bold')
+    self.heading = self.out.printer('heading', attr='bold')
-    self.headtext = self.out.printer('headtext', fg = 'yellow')
+    self.headtext = self.out.nofmt_printer('headtext', fg='yellow')
-    self.redtext = self.out.printer('redtext', fg = 'red')
+    self.redtext = self.out.printer('redtext', fg='red')
-    self.sha = self.out.printer("sha", fg = 'yellow')
+    self.sha = self.out.printer("sha", fg='yellow')
    self.text = self.out.nofmt_printer('text')
-    self.dimtext = self.out.printer('dimtext', attr = 'dim')
+    self.dimtext = self.out.printer('dimtext', attr='dim')
    self.opt = opt
@ -59,7 +60,8 @@ class Info(PagedCommand):
                      or 'all,-notdefault')
    self.heading("Manifest branch: ")
-    self.headtext(self.manifest.default.revisionExpr)
+    if self.manifest.default.revisionExpr:
        self.headtext(self.manifest.default.revisionExpr)
    self.out.nl()
    self.heading("Manifest merge branch: ")
    self.headtext(mergeBranch)
@ -80,10 +82,8 @@ class Info(PagedCommand):
    self.out.nl()
  def printDiffInfo(self, args):
-    try:
+    # We let exceptions bubble up to main as they'll be well structured.
-      projs = self.GetProjects(args)
+    projs = self.GetProjects(args)
    except NoSuchProjectError:
      return
    for p in projs:
      self.heading("Project: ")
@ -95,13 +95,23 @@ class Info(PagedCommand):
      self.out.nl()
      self.heading("Current revision: ")
      self.headtext(p.GetRevisionId())
      self.out.nl()
      currentBranch = p.CurrentBranch
      if currentBranch:
        self.heading('Current branch: ')
        self.headtext(currentBranch)
        self.out.nl()
      self.heading("Manifest revision: ")
      self.headtext(p.revisionExpr)
      self.out.nl()
-      localBranches = p.GetBranches().keys()
+      localBranches = list(p.GetBranches().keys())
      self.heading("Local Branches: ")
      self.redtext(str(len(localBranches)))
-      if len(localBranches) > 0:
+      if localBranches:
        self.text(" [")
        self.text(", ".join(localBranches))
        self.text("]")
@ -113,11 +123,14 @@ class Info(PagedCommand):
      self.printSeparator()
  def findRemoteLocalDiff(self, project):
-    #Fetch all the latest commits
+    # Fetch all the latest commits.
    if not self.opt.local:
      project.Sync_NetworkHalf(quiet=True, current_branch_only=True)
-    logTarget = R_M + self.manifest.manifestProject.config.GetBranch("default").merge
+    branch = self.manifest.manifestProject.config.GetBranch('default').merge
    if branch.startswith(R_HEADS):
      branch = branch[len(R_HEADS):]
    logTarget = R_M + branch
    bareTmp = project.bare_git._bare
    project.bare_git._bare = False
@ -186,16 +199,16 @@ class Info(PagedCommand):
      commits = branch.commits
      date = branch.date
      self.text('%s %-33s (%2d commit%s, %s)' % (
-        branch.name == project.CurrentBranch and '*' or ' ',
+          branch.name == project.CurrentBranch and '*' or ' ',
-        branch.name,
+          branch.name,
-        len(commits),
+          len(commits),
-        len(commits) != 1 and 's' or '',
+          len(commits) != 1 and 's' or '',
-        date))
+          date))
      self.out.nl()
      for commit in commits:
        split = commit.split()
-        self.text('{0:38}{1} '.format('','-'))
+        self.text('{0:38}{1} '.format('', '-'))
        self.sha(split[0] + " ")
        self.text(" ".join(split[1:]))
        self.out.nl()
--- a/subcmds/init.py
+++ b/subcmds/init.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -14,10 +15,11 @@
 # limitations under the License.
 from __future__ import print_function
 import optparse
 import os
 import platform
 import re
 import shutil
 import sys
 from pyversion import is_python3
@ -34,7 +36,10 @@ from command import InteractiveCommand, MirrorSafeCommand
 from error import ManifestParseError
 from project import SyncBuffer
 from git_config import GitConfig
-from git_command import git_require, MIN_GIT_VERSION
+from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD
 import platform_utils
 from wrapper import Wrapper
 class Init(InteractiveCommand, MirrorSafeCommand):
  common = True
@ -61,9 +66,18 @@ directory use as much data as possible from the local reference
 directory when fetching from the server. This will make the sync
 go a lot faster by reducing data traffic on the network.
 The --dissociate option can be used to borrow the objects from
 the directory specified with the --reference option only to reduce
 network transfer, and stop borrowing from them after a first clone
 is made by making necessary local copies of borrowed objects.
-Switching Manifest Branches
+The --no-clone-bundle option disables any attempt to use
---------------------------
+$URL/clone.bundle to bootstrap a new Git repository from a
 resumeable bundle file on a content delivery network. This
 may be necessary if there are problems with the local Python
 HTTP client or proxy configuration, but the Git binary works.
 # Switching Manifest Branches
 To switch to another manifest branch, `repo init -b otherbranch`
 may be used in an existing client.  However, as this only updates the
@ -71,12 +85,15 @@ manifest, a subsequent `repo sync` (or `repo sync -d`) is necessary
 to update the working directory files.
 """
-  def _Options(self, p):
+  def _Options(self, p, gitc_init=False):
    # Logging
    g = p.add_option_group('Logging options')
    g.add_option('-v', '--verbose',
                 dest='output_mode', action='store_true',
                 help='show all output')
    g.add_option('-q', '--quiet',
-                 dest="quiet", action="store_true", default=False,
+                 dest='output_mode', action='store_false',
-                 help="be quiet")
+                 help='only show errors')
    # Manifest
    g = p.add_option_group('Manifest options')
@ -86,6 +103,14 @@ to update the working directory files.
    g.add_option('-b', '--manifest-branch',
                 dest='manifest_branch',
                 help='manifest branch or revision', metavar='REVISION')
    cbr_opts = ['--current-branch']
    # The gitc-init subcommand allocates -c itself, but a lot of init users
    # want -c, so try to satisfy both as best we can.
    if not gitc_init:
      cbr_opts += ['-c']
    g.add_option(*cbr_opts,
                 dest='current_branch_only', action='store_true',
                 help='fetch only current manifest branch from server')
    g.add_option('-m', '--manifest-name',
                 dest='manifest_name', default='default.xml',
                 help='initial manifest file', metavar='NAME.xml')
@ -96,13 +121,30 @@ to update the working directory files.
    g.add_option('--reference',
                 dest='reference',
                 help='location of mirror directory', metavar='DIR')
    g.add_option('--dissociate',
                 dest='dissociate', action='store_true',
                 help='dissociate from reference mirrors after clone')
    g.add_option('--depth', type='int', default=None,
                 dest='depth',
                 help='create a shallow clone with given depth; see git clone')
    g.add_option('--partial-clone', action='store_true',
                 dest='partial_clone',
                 help='perform partial clone (https://git-scm.com/'
                 'docs/gitrepository-layout#_code_partialclone_code)')
    g.add_option('--clone-filter', action='store', default='blob:none',
                 dest='clone_filter',
                 help='filter for use with --partial-clone [default: %default]')
    # TODO(vapier): Expose option with real help text once this has been in the
    # wild for a while w/out significant bug reports.  Goal is by ~Sep 2020.
    g.add_option('--worktree', action='store_true',
                 help=optparse.SUPPRESS_HELP)
    g.add_option('--archive',
                 dest='archive', action='store_true',
                 help='checkout an archive instead of a git repository for '
                      'each project. See git archive.')
    g.add_option('--submodules',
                 dest='submodules', action='store_true',
                 help='sync any submodules associated with the manifest repo')
    g.add_option('-g', '--groups',
                 dest='groups', default='default',
                 help='restrict manifest projects to ones with specified '
@ -113,17 +155,26 @@ to update the working directory files.
                 help='restrict manifest projects to ones with a specified '
                      'platform group [auto|all|none|linux|darwin|...]',
                 metavar='PLATFORM')
    g.add_option('--clone-bundle', action='store_true',
                 help='force use of /clone.bundle on HTTP/HTTPS (default if not --partial-clone)')
    g.add_option('--no-clone-bundle',
                 dest='clone_bundle', action='store_false',
                 help='disable use of /clone.bundle on HTTP/HTTPS (default if --partial-clone)')
    g.add_option('--no-tags',
                 dest='tags', default=True, action='store_false',
                 help="don't fetch tags in the manifest")
    # Tool
    g = p.add_option_group('repo Version options')
    g.add_option('--repo-url',
                 dest='repo_url',
                 help='repo repository location', metavar='URL')
-    g.add_option('--repo-branch',
+    g.add_option('--repo-rev', metavar='REV',
-                 dest='repo_branch',
+                 help='repo branch or revision')
-                 help='repo branch or revision', metavar='REVISION')
+    g.add_option('--repo-branch', dest='repo_rev',
                 help=optparse.SUPPRESS_HELP)
    g.add_option('--no-repo-verify',
-                 dest='no_repo_verify', action='store_true',
+                 dest='repo_verify', default=True, action='store_false',
                 help='do not verify repo source code')
    # Other
@ -146,7 +197,8 @@ to update the working directory files.
        sys.exit(1)
      if not opt.quiet:
-        print('Get %s' % GitConfig.ForUser().UrlInsteadOf(opt.manifest_url),
+        print('Downloading manifest from %s' %
              (GitConfig.ForUser().UrlInsteadOf(opt.manifest_url),),
              file=sys.stderr)
      # The manifest project object doesn't keep track of the path on the
@ -158,7 +210,8 @@ to update the working directory files.
        if not mirrored_manifest_git.endswith(".git"):
          mirrored_manifest_git += ".git"
        if not os.path.exists(mirrored_manifest_git):
-          mirrored_manifest_git = os.path.join(opt.reference + '/.repo/manifests.git')
+          mirrored_manifest_git = os.path.join(opt.reference,
                                               '.repo/manifests.git')
      m._InitGitDir(mirror_git=mirrored_manifest_git)
@ -172,6 +225,8 @@ to update the working directory files.
      else:
        m.PreSync()
    self._ConfigureDepth(opt)
    if opt.manifest_url:
      r = m.GetRemote(m.remote.name)
      r.url = opt.manifest_url
@ -179,16 +234,16 @@ to update the working directory files.
      r.Save()
    groups = re.split(r'[,\s]+', opt.groups)
-    all_platforms = ['linux', 'darwin']
+    all_platforms = ['linux', 'darwin', 'windows']
    platformize = lambda x: 'platform-' + x
    if opt.platform == 'auto':
      if (not opt.mirror and
-          not m.config.GetString('repo.mirror') == 'true'):
+              not m.config.GetString('repo.mirror') == 'true'):
        groups.append(platformize(platform.system().lower()))
    elif opt.platform == 'all':
      groups.extend(map(platformize, all_platforms))
    elif opt.platform in all_platforms:
-      groups.extend(platformize(opt.platform))
+      groups.append(platformize(opt.platform))
    elif opt.platform != 'none':
      print('fatal: invalid platform flag', file=sys.stderr)
      sys.exit(1)
@ -202,6 +257,23 @@ to update the working directory files.
    if opt.reference:
      m.config.SetString('repo.reference', opt.reference)
    if opt.dissociate:
      m.config.SetString('repo.dissociate', 'true')
    if opt.worktree:
      if opt.mirror:
        print('fatal: --mirror and --worktree are incompatible',
              file=sys.stderr)
        sys.exit(1)
      if opt.submodules:
        print('fatal: --submodules and --worktree are incompatible',
              file=sys.stderr)
        sys.exit(1)
      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.SetString('repo.archive', 'true')
@ -222,21 +294,44 @@ to update the working directory files.
              'in another location.', file=sys.stderr)
        sys.exit(1)
-    if not m.Sync_NetworkHalf(is_new=is_new):
+    if opt.partial_clone:
      if opt.mirror:
        print('fatal: --mirror and --partial-clone are mutually exclusive',
              file=sys.stderr)
        sys.exit(1)
      m.config.SetString('repo.partialclone', 'true')
      if opt.clone_filter:
        m.config.SetString('repo.clonefilter', opt.clone_filter)
    else:
      opt.clone_filter = None
    if opt.clone_bundle is None:
      opt.clone_bundle = False if opt.partial_clone else True
    else:
      m.config.SetString('repo.clonebundle', 'true' if opt.clone_bundle else 'false')
    if opt.submodules:
      m.config.SetString('repo.submodules', 'true')
    if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet, verbose=opt.verbose,
                              clone_bundle=opt.clone_bundle,
                              current_branch_only=opt.current_branch_only,
                              tags=opt.tags, submodules=opt.submodules,
                              clone_filter=opt.clone_filter):
      r = m.GetRemote(m.remote.name)
      print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr)
      # Better delete the manifest git dir if we created it; otherwise next
      # time (when user fixes problems) we won't go through the "is_new" logic.
      if is_new:
-        shutil.rmtree(m.gitdir)
+        platform_utils.rmtree(m.gitdir)
      sys.exit(1)
    if opt.manifest_branch:
-      m.MetaBranchSwitch()
+      m.MetaBranchSwitch(submodules=opt.submodules)
    syncbuf = SyncBuffer(m.config)
-    m.Sync_LocalHalf(syncbuf)
+    m.Sync_LocalHalf(syncbuf, submodules=opt.submodules)
    syncbuf.Finish()
    if is_new or m.CurrentBranch is None:
@ -257,13 +352,15 @@ to update the working directory files.
      sys.exit(1)
  def _Prompt(self, prompt, value):
-    sys.stdout.write('%-10s [%s]: ' % (prompt, value))
+    print('%-10s [%s]: ' % (prompt, value), end='')
    # TODO: When we require Python 3, use flush=True w/print above.
    sys.stdout.flush()
    a = sys.stdin.readline().strip()
    if a == '':
      return value
    return a
-  def _ShouldConfigureUser(self):
+  def _ShouldConfigureUser(self, opt):
    gc = self.manifest.globalConfig
    mp = self.manifest.manifestProject
@ -275,23 +372,28 @@ to update the working directory files.
      mp.config.SetString('user.name', gc.GetString('user.name'))
      mp.config.SetString('user.email', gc.GetString('user.email'))
-    print()
+    if not opt.quiet:
-    print('Your identity is: %s <%s>' % (mp.config.GetString('user.name'),
+      print()
-                                         mp.config.GetString('user.email')))
+      print('Your identity is: %s <%s>' % (mp.config.GetString('user.name'),
-    print('If you want to change this, please re-run \'repo init\' with --config-name')
+                                           mp.config.GetString('user.email')))
      print("If you want to change this, please re-run 'repo init' with --config-name")
    return False
-  def _ConfigureUser(self):
+  def _ConfigureUser(self, opt):
    mp = self.manifest.manifestProject
    while True:
-      print()
+      if not opt.quiet:
-      name  = self._Prompt('Your Name', mp.UserName)
+        print()
      name = self._Prompt('Your Name', mp.UserName)
      email = self._Prompt('Your Email', mp.UserEmail)
-      print()
+      if not opt.quiet:
        print()
      print('Your identity is: %s <%s>' % (name, email))
-      sys.stdout.write('is this correct [y/N]? ')
+      print('is this correct [y/N]? ', end='')
      # TODO: When we require Python 3, use flush=True w/print above.
      sys.stdout.flush()
      a = sys.stdin.readline().strip().lower()
      if a in ('yes', 'y', 't', 'true'):
        break
@ -333,7 +435,9 @@ to update the working directory files.
      out.printer(fg='black', attr=c)(' %-6s ', c)
    out.nl()
-    sys.stdout.write('Enable color display in this user account (y/N)? ')
+    print('Enable color display in this user account (y/N)? ', end='')
    # TODO: When we require Python 3, use flush=True w/print above.
    sys.stdout.flush()
    a = sys.stdin.readline().strip().lower()
    if a in ('y', 'yes', 't', 'true', 'on'):
      gc.SetString('color.ui', 'auto')
@ -357,15 +461,16 @@ to update the working directory files.
      # We store the depth in the main manifest project.
      self.manifest.manifestProject.config.SetString('repo.depth', depth)
-  def _DisplayResult(self):
+  def _DisplayResult(self, opt):
    if self.manifest.IsMirror:
      init_type = 'mirror '
    else:
      init_type = ''
-    print()
+    if not opt.quiet:
-    print('repo %shas been initialized in %s'
+      print()
-          % (init_type, self.manifest.topdir))
+      print('repo %shas been initialized in %s' %
            (init_type, self.manifest.topdir))
    current_dir = os.getcwd()
    if current_dir != self.manifest.topdir:
@ -374,27 +479,54 @@ to update the working directory files.
      print('   rm -r %s/.repo' % self.manifest.topdir)
      print('and try again.')
-  def Execute(self, opt, args):
+  def ValidateOptions(self, opt, args):
    git_require(MIN_GIT_VERSION, fail=True)
    if opt.reference:
      opt.reference = os.path.expanduser(opt.reference)
    # Check this here, else manifest will be tagged "not new" and init won't be
    # possible anymore without removing the .repo/manifests directory.
    if opt.archive and opt.mirror:
-      print('fatal: --mirror and --archive cannot be used together.',
+      self.OptionParser.error('--mirror and --archive cannot be used together.')
  def Execute(self, opt, args):
    git_require(MIN_GIT_VERSION_HARD, fail=True)
    if not git_require(MIN_GIT_VERSION_SOFT):
      print('repo: warning: git-%s+ will soon be required; please upgrade your '
            'version of git to maintain support.'
            % ('.'.join(str(x) for x in MIN_GIT_VERSION_SOFT),),
            file=sys.stderr)
-      sys.exit(1)
+
    opt.quiet = opt.output_mode is False
    opt.verbose = opt.output_mode is True
    rp = self.manifest.repoProject
    # Handle new --repo-url requests.
    if opt.repo_url:
      remote = rp.GetRemote('origin')
      remote.url = opt.repo_url
      remote.Save()
    # Handle new --repo-rev requests.
    if opt.repo_rev:
      wrapper = Wrapper()
      remote_ref, rev = wrapper.check_repo_rev(
          rp.gitdir, opt.repo_rev, repo_verify=opt.repo_verify, quiet=opt.quiet)
      branch = rp.GetBranch('default')
      branch.merge = remote_ref
      rp.work_git.update_ref('refs/heads/default', rev)
      branch.Save()
    if opt.worktree:
      # Older versions of git supported worktree, but had dangerous gc bugs.
      git_require((2, 15, 0), fail=True, msg='git gc worktree corruption')
    self._SyncManifest(opt)
    self._LinkManifest(opt.manifest_name)
    if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror:
-      if opt.config_name or self._ShouldConfigureUser():
+      if opt.config_name or self._ShouldConfigureUser(opt):
-        self._ConfigureUser()
+        self._ConfigureUser(opt)
      self._ConfigureColor()
-    self._ConfigureDepth(opt)
+    self._DisplayResult(opt)
    self._DisplayResult()
--- a/subcmds/list.py
+++ b/subcmds/list.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2011 The Android Open Source Project
 #
@ -14,10 +15,10 @@
 # limitations under the License.
 from __future__ import print_function
 import sys
 from command import Command, MirrorSafeCommand
 class List(Command, MirrorSafeCommand):
  common = True
  helpSummary = "List projects and their associated directories"
@ -35,6 +36,9 @@ This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
    p.add_option('-r', '--regex',
                 dest='regex', action='store_true',
                 help="Filter the project list based on regex or wildcard matching of strings")
    p.add_option('-g', '--groups',
                 dest='groups',
                 help="Filter the project list based on the groups the project is in")
    p.add_option('-f', '--fullpath',
                 dest='fullpath', action='store_true',
                 help="Display the full work tree path instead of the relative path")
@ -45,6 +49,10 @@ This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
                 dest='path_only', action='store_true',
                 help="Display only the path of the repository")
  def ValidateOptions(self, opt, args):
    if opt.fullpath and opt.name_only:
      self.OptionParser.error('cannot combine -f and -n')
  def Execute(self, opt, args):
    """List all projects and the associated directories.
@ -56,13 +64,8 @@ This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
      opt: The options.
      args: Positional args.  Can be a list of projects to list, or empty.
    """
    if opt.fullpath and opt.name_only:
      print('error: cannot combine -f and -n', file=sys.stderr)
      sys.exit(1)
    if not opt.regex:
-      projects = self.GetProjects(args)
+      projects = self.GetProjects(args, groups=opt.groups)
    else:
      projects = self.FindProjects(args)
@ -74,7 +77,7 @@ This is similar to running: repo forall -c 'echo "$REPO_PATH : $REPO_PROJECT"'.
    lines = []
    for project in projects:
      if opt.name_only and not opt.path_only:
-        lines.append("%s" % ( project.name))
+        lines.append("%s" % (project.name))
      elif opt.path_only and not opt.name_only:
        lines.append("%s" % (_getpath(project)))
      else:
--- a/subcmds/manifest.py
+++ b/subcmds/manifest.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -19,11 +20,12 @@ import sys
 from command import PagedCommand
 class Manifest(PagedCommand):
  common = False
  helpSummary = "Manifest inspection utility"
  helpUsage = """
-%prog [-o {-|NAME.xml} [-r]]
+%prog [-o {-|NAME.xml}] [-m MANIFEST.xml] [-r]
 """
  _helpDescription = """
@ -32,6 +34,12 @@ The manifest and (if present) local_manifest.xml are combined
 together to produce a single manifest file.  This file can be stored
 in a Git repository for use during future 'repo init' invocations.
 The -r option can be used to generate a manifest file with project
 revisions set to the current commit hash.  These are known as
 "revision locked manifests", as they don't follow a particular branch.
 In this case, the 'upstream' attribute is set to the ref we were on
 when the manifest was generated.  The 'dest-branch' attribute is set
 to indicate the remote ref to push changes to via 'repo upload'.
 """
  @property
@ -39,21 +47,27 @@ in a Git repository for use during future 'repo init' invocations.
    helptext = self._helpDescription + '\n'
    r = os.path.dirname(__file__)
    r = os.path.dirname(r)
-    fd = open(os.path.join(r, 'docs', 'manifest-format.txt'))
+    with open(os.path.join(r, 'docs', 'manifest-format.md')) as fd:
-    for line in fd:
+      for line in fd:
-      helptext += line
+        helptext += line
    fd.close()
    return helptext
  def _Options(self, p):
    p.add_option('-r', '--revision-as-HEAD',
                 dest='peg_rev', action='store_true',
                 help='Save revisions as current HEAD')
    p.add_option('-m', '--manifest-name',
                 help='temporary manifest to use for this sync', metavar='NAME.xml')
    p.add_option('--suppress-upstream-revision', dest='peg_rev_upstream',
                 default=True, action='store_false',
                 help='If in -r mode, do not write the upstream field.  '
                 'Only of use if the branch names for a sha1 manifest are '
                 'sensitive.')
    p.add_option('--suppress-dest-branch', dest='peg_rev_dest_branch',
                 default=True, action='store_false',
                 help='If in -r mode, do not write the dest-branch field.  '
                 'Only of use if the branch names for a sha1 manifest are '
                 'sensitive.')
    p.add_option('-o', '--output-file',
                 dest='output_file',
                 default='-',
@ -61,25 +75,25 @@ in a Git repository for use during future 'repo init' invocations.
                 metavar='-|NAME.xml')
  def _Output(self, opt):
    # If alternate manifest is specified, override the manifest file that we're using.
    if opt.manifest_name:
      self.manifest.Override(opt.manifest_name, False)
    if opt.output_file == '-':
      fd = sys.stdout
    else:
      fd = open(opt.output_file, 'w')
    self.manifest.Save(fd,
-                       peg_rev = opt.peg_rev,
+                       peg_rev=opt.peg_rev,
-                       peg_rev_upstream = opt.peg_rev_upstream)
+                       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)
-  def Execute(self, opt, args):
+  def ValidateOptions(self, opt, args):
    if args:
      self.Usage()
-    if opt.output_file is not None:
+  def Execute(self, opt, args):
-      self._Output(opt)
+    self._Output(opt)
      return
    print('error: no operation to perform', file=sys.stderr)
    print('error: see repo help manifest', file=sys.stderr)
    sys.exit(1)
--- a/subcmds/overview.py
+++ b/subcmds/overview.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2012 The Android Open Source Project
 #
--- a/subcmds/prune.py
+++ b/subcmds/prune.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -17,6 +18,7 @@ from __future__ import print_function
 from color import Coloring
 from command import PagedCommand
 class Prune(PagedCommand):
  common = True
  helpSummary = "Prune (delete) already merged topics"
@ -50,11 +52,16 @@ class Prune(PagedCommand):
        out.project('project %s/' % project.relpath)
        out.nl()
-      commits = branch.commits
+      print('%s %-33s ' % (
      date = branch.date
      print('%s %-33s (%2d commit%s, %s)' % (
            branch.name == project.CurrentBranch and '*' or ' ',
-            branch.name,
+            branch.name), end='')
      if not branch.base_exists:
        print('(ignoring: tracking branch is gone: %s)' % (branch.base,))
      else:
        commits = branch.commits
        date = branch.date
        print('(%2d commit%s, %s)' % (
            len(commits),
            len(commits) != 1 and 's' or ' ',
            date))
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2010 The Android Open Source Project
 #
@ -16,9 +17,18 @@
 from __future__ import print_function
 import sys
 from color import Coloring
 from command import Command
 from git_command import GitCommand
 class RebaseColoring(Coloring):
  def __init__(self, config):
    Coloring.__init__(self, config, 'rebase')
    self.project = self.printer('project', attr='bold')
    self.fail = self.printer('fail', fg='red')
 class Rebase(Command):
  common = True
  helpSummary = "Rebase local branches on upstream branch"
@ -33,14 +43,17 @@ branch but need to incorporate new upstream changes "underneath" them.
  def _Options(self, p):
    p.add_option('-i', '--interactive',
-                dest="interactive", action="store_true",
+                 dest="interactive", action="store_true",
-                help="interactive rebase (single project only)")
+                 help="interactive rebase (single project only)")
    p.add_option('--fail-fast',
                 dest='fail_fast', action='store_true',
                 help='Stop rebasing after first error is hit')
    p.add_option('-f', '--force-rebase',
                 dest='force_rebase', action='store_true',
                 help='Pass --force-rebase to git rebase')
    p.add_option('--no-ff',
-                 dest='no_ff', action='store_true',
+                 dest='ff', default=True, action='store_false',
                 help='Pass --no-ff to git rebase')
    p.add_option('-q', '--quiet',
                 dest='quiet', action='store_true',
@ -54,6 +67,11 @@ branch but need to incorporate new upstream changes "underneath" them.
    p.add_option('--auto-stash',
                 dest='auto_stash', action='store_true',
                 help='Stash local modifications before starting')
    p.add_option('-m', '--onto-manifest',
                 dest='onto_manifest', action='store_true',
                 help='Rebase onto the manifest version instead of upstream '
                      'HEAD.  This helps to make sure the local tree stays '
                      'consistent if you previously synced to a manifest.')
  def Execute(self, opt, args):
    all_projects = self.GetProjects(args)
@ -64,16 +82,39 @@ branch but need to incorporate new upstream changes "underneath" them.
            file=sys.stderr)
      if len(args) == 1:
        print('note: project %s is mapped to more than one path' % (args[0],),
-            file=sys.stderr)
+              file=sys.stderr)
-      return -1
+      return 1
    # Setup the common git rebase args that we use for all projects.
    common_args = ['rebase']
    if opt.whitespace:
      common_args.append('--whitespace=%s' % opt.whitespace)
    if opt.quiet:
      common_args.append('--quiet')
    if opt.force_rebase:
      common_args.append('--force-rebase')
    if not opt.ff:
      common_args.append('--no-ff')
    if opt.autosquash:
      common_args.append('--autosquash')
    if opt.interactive:
      common_args.append('-i')
    config = self.manifest.manifestProject.config
    out = RebaseColoring(config)
    out.redirect(sys.stdout)
    ret = 0
    for project in all_projects:
      if ret and opt.fail_fast:
        break
      cb = project.CurrentBranch
      if not cb:
        if one_project:
          print("error: project %s has a detached HEAD" % project.relpath,
                file=sys.stderr)
-          return -1
+          return 1
        # ignore branches with detatched HEADs
        continue
@ -82,34 +123,21 @@ branch but need to incorporate new upstream changes "underneath" them.
        if one_project:
          print("error: project %s does not track any remote branches"
                % project.relpath, file=sys.stderr)
-          return -1
+          return 1
        # ignore branches without remotes
        continue
-      args = ["rebase"]
+      args = common_args[:]
-
+      if opt.onto_manifest:
-      if opt.whitespace:
+        args.append('--onto')
-        args.append('--whitespace=%s' % opt.whitespace)
+        args.append(project.revisionExpr)
      if opt.quiet:
        args.append('--quiet')
      if opt.force_rebase:
        args.append('--force-rebase')
      if opt.no_ff:
        args.append('--no-ff')
      if opt.autosquash:
        args.append('--autosquash')
      if opt.interactive:
        args.append("-i")
      args.append(upbranch.LocalMerge)
-      print('# %s: rebasing %s -> %s'
+      out.project('project %s: rebasing %s -> %s',
-            % (project.relpath, cb, upbranch.LocalMerge), file=sys.stderr)
+                  project.relpath, cb, upbranch.LocalMerge)
      out.nl()
      out.flush()
      needs_stash = False
      if opt.auto_stash:
@ -121,13 +149,21 @@ branch but need to incorporate new upstream changes "underneath" them.
          stash_args = ["stash"]
          if GitCommand(project, stash_args).Wait() != 0:
-            return -1
+            ret += 1
            continue
      if GitCommand(project, args).Wait() != 0:
-        return -1
+        ret += 1
        continue
      if needs_stash:
        stash_args.append('pop')
        stash_args.append('--quiet')
        if GitCommand(project, stash_args).Wait() != 0:
-          return -1
+          ret += 1
    if ret:
      out.fail('%i projects had errors', ret)
      out.nl()
    return ret
--- a/subcmds/selfupdate.py
+++ b/subcmds/selfupdate.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -21,6 +22,7 @@ from command import Command, MirrorSafeCommand
 from subcmds.sync import _PostRepoUpgrade
 from subcmds.sync import _PostRepoFetch
 class Selfupdate(Command, MirrorSafeCommand):
  common = False
  helpSummary = "Update repo to the latest version"
@ -38,7 +40,7 @@ need to be performed by an end-user.
  def _Options(self, p):
    g = p.add_option_group('repo Version options')
    g.add_option('--no-repo-verify',
-                 dest='no_repo_verify', action='store_true',
+                 dest='repo_verify', default=True, action='store_false',
                 help='do not verify repo source code')
    g.add_option('--repo-upgraded',
                 dest='repo_upgraded', action='store_true',
@ -58,5 +60,5 @@ need to be performed by an end-user.
      rp.bare_git.gc('--auto')
      _PostRepoFetch(rp,
-                     no_repo_verify = opt.no_repo_verify,
+                     repo_verify=opt.repo_verify,
-                     verbose = True)
+                     verbose=True)
--- a/subcmds/smartsync.py
+++ b/subcmds/smartsync.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2010 The Android Open Source Project
 #
@ -15,6 +16,7 @@
 from subcmds.sync import Sync
 class Smartsync(Sync):
  common = True
  helpSummary = "Update working tree to the latest known good revision"
--- a/subcmds/stage.py
+++ b/subcmds/stage.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -20,6 +21,7 @@ from color import Coloring
 from command import InteractiveCommand
 from git_command import GitCommand
 class _ProjectList(Coloring):
  def __init__(self, gc):
    Coloring.__init__(self, gc, 'interactive')
@ -27,6 +29,7 @@ class _ProjectList(Coloring):
    self.header = self.printer('header', attr='bold')
    self.help = self.printer('help', fg='red', attr='bold')
 class Stage(InteractiveCommand):
  common = True
  helpSummary = "Stage file(s) for commit"
@ -60,8 +63,8 @@ The '%prog' command stages files to prepare the next commit.
      out.nl()
      for i in range(len(all_projects)):
-        p = all_projects[i]
+        project = all_projects[i]
-        out.write('%3d:    %s', i + 1, p.relpath + '/')
+        out.write('%3d:    %s', i + 1, project.relpath + '/')
        out.nl()
      out.nl()
@ -104,6 +107,7 @@ The '%prog' command stages files to prepare the next commit.
        continue
    print('Bye.')
 def _AddI(project):
  p = GitCommand(project, ['add', '--interactive'], bare=False)
  p.Wait()
--- a/subcmds/start.py
+++ b/subcmds/start.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -14,11 +15,16 @@
 # limitations under the License.
 from __future__ import print_function
 import os
 import sys
 from command import Command
-from git_config import IsId
+from git_config import IsImmutable
 from git_command import git
 import gitc_utils
 from progress import Progress
 from project import SyncBuffer
 class Start(Command):
  common = True
@ -35,38 +41,80 @@ revision specified in the manifest.
    p.add_option('--all',
                 dest='all', action='store_true',
                 help='begin branch in all projects')
    p.add_option('-r', '--rev', '--revision', dest='revision',
                 help='point branch at this revision instead of upstream')
    p.add_option('--head', dest='revision', action='store_const', const='HEAD',
                 help='abbreviation for --rev HEAD')
-  def Execute(self, opt, args):
+  def ValidateOptions(self, opt, args):
    if not args:
      self.Usage()
    nb = args[0]
    if not git.check_ref_format('heads/%s' % nb):
-      print("error: '%s' is not a valid name" % nb, file=sys.stderr)
+      self.OptionParser.error("'%s' is not a valid name" % nb)
      sys.exit(1)
  def Execute(self, opt, args):
    nb = args[0]
    err = []
    projects = []
    if not opt.all:
      projects = args[1:]
      if len(projects) < 1:
-        print("error: at least one project must be specified", file=sys.stderr)
+        projects = ['.']  # start it in the local project by default
        sys.exit(1)
-    all_projects = self.GetProjects(projects)
+    all_projects = self.GetProjects(projects,
                                    missing_ok=bool(self.gitc_manifest))
    # This must happen after we find all_projects, since GetProjects may need
    # the local directory, which will disappear once we save the GITC manifest.
    if self.gitc_manifest:
      gitc_projects = self.GetProjects(projects, manifest=self.gitc_manifest,
                                       missing_ok=True)
      for project in gitc_projects:
        if project.old_revision:
          project.already_synced = True
        else:
          project.already_synced = False
          project.old_revision = project.revisionExpr
        project.revisionExpr = None
      # Save the GITC manifest.
      gitc_utils.save_manifest(self.gitc_manifest)
      # Make sure we have a valid CWD
      if not os.path.exists(os.getcwd()):
        os.chdir(self.manifest.topdir)
    pm = Progress('Starting %s' % nb, len(all_projects))
    for project in all_projects:
      pm.update()
-      # If the current revision is a specific SHA1 then we can't push back
+
-      # to it; so substitute with dest_branch if defined, or with manifest
+      if self.gitc_manifest:
-      # default revision instead.
+        gitc_project = self.gitc_manifest.paths[project.relpath]
-      if IsId(project.revisionExpr):
+        # Sync projects that have not been opened.
        if not gitc_project.already_synced:
          proj_localdir = os.path.join(self.gitc_manifest.gitc_client_dir,
                                       project.relpath)
          project.worktree = proj_localdir
          if not os.path.exists(proj_localdir):
            os.makedirs(proj_localdir)
          project.Sync_NetworkHalf()
          sync_buf = SyncBuffer(self.manifest.manifestProject.config)
          project.Sync_LocalHalf(sync_buf)
          project.revisionId = gitc_project.old_revision
      # If the current revision is immutable, such as a SHA1, a tag or
      # a change, then we can't push back to it. Substitute with
      # dest_branch, if defined; or with manifest default revision instead.
      branch_merge = ''
      if IsImmutable(project.revisionExpr):
        if project.dest_branch:
-          project.revisionExpr = project.dest_branch
+          branch_merge = project.dest_branch
        else:
-          project.revisionExpr = self.manifest.default.revisionExpr
+          branch_merge = self.manifest.default.revisionExpr
-      if not project.StartBranch(nb):
+
      if not project.StartBranch(
              nb, branch_merge=branch_merge, revision=opt.revision):
        err.append(project)
    pm.end()
--- a/subcmds/status.py
+++ b/subcmds/status.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -13,6 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import print_function
 import glob
 import itertools
 import os
 from command import PagedCommand
 try:
@ -20,12 +27,9 @@ try:
 except ImportError:
  import dummy_threading as _threading
 import glob
 import itertools
 import os
 from color import Coloring
 import platform_utils
 class Status(PagedCommand):
  common = True
@ -49,8 +53,7 @@ includes deeper items.  For example, if dir/subdir/proj1 and
 dir/subdir/proj2 are repo projects, dir/subdir/proj3 will be shown
 if it is not known to repo.
-Status Display
+# Status Display
 --------------
 The status display is organized into three columns of information,
 for example if the file 'subcmds/status.py' is modified in the
@ -89,8 +92,10 @@ the following meanings:
    p.add_option('-o', '--orphans',
                 dest='orphans', action='store_true',
                 help="include objects in working directory outside of repo projects")
    p.add_option('-q', '--quiet', action='store_true',
                 help="only print the name of modified projects")
-  def _StatusHelper(self, project, clean_counter, sem):
+  def _StatusHelper(self, project, clean_counter, sem, quiet):
    """Obtains the status for a specific project.
    Obtains the status for a project, redirecting the output to
@ -104,7 +109,7 @@ the following meanings:
      output: Where to output the status.
    """
    try:
-      state = project.PrintWorkTreeStatus()
+      state = project.PrintWorkTreeStatus(quiet=quiet)
      if state == 'CLEAN':
        next(clean_counter)
    finally:
@ -114,15 +119,15 @@ the following meanings:
    """find 'dirs' that are present in 'proj_dirs_parents' but not in 'proj_dirs'"""
    status_header = ' --\t'
    for item in dirs:
-      if not os.path.isdir(item):
+      if not platform_utils.isdir(item):
        outstring.append(''.join([status_header, item]))
        continue
      if item in proj_dirs:
        continue
      if item in proj_dirs_parents:
        self._FindOrphans(glob.glob('%s/.*' % item) +
-            glob.glob('%s/*' % item),
+                          glob.glob('%s/*' % item),
-            proj_dirs, proj_dirs_parents, outstring)
+                          proj_dirs, proj_dirs_parents, outstring)
        continue
      outstring.append(''.join([status_header, item, '/']))
@ -132,7 +137,7 @@ the following meanings:
    if opt.jobs == 1:
      for project in all_projects:
-        state = project.PrintWorkTreeStatus()
+        state = project.PrintWorkTreeStatus(quiet=opt.quiet)
        if state == 'CLEAN':
          next(counter)
    else:
@ -142,13 +147,13 @@ the following meanings:
        sem.acquire()
        t = _threading.Thread(target=self._StatusHelper,
-                              args=(project, counter, sem))
+                              args=(project, counter, sem, opt.quiet))
        threads.append(t)
        t.daemon = True
        t.start()
      for t in threads:
        t.join()
-    if len(all_projects) == next(counter):
+    if not opt.quiet and len(all_projects) == next(counter):
      print('nothing to commit (working directory clean)')
    if opt.orphans:
@ -165,8 +170,8 @@ the following meanings:
      class StatusColoring(Coloring):
        def __init__(self, config):
          Coloring.__init__(self, config, 'status')
-          self.project = self.printer('header', attr = 'bold')
+          self.project = self.printer('header', attr='bold')
-          self.untracked = self.printer('untracked', fg = 'red')
+          self.untracked = self.printer('untracked', fg='red')
      orig_path = os.getcwd()
      try:
@ -174,8 +179,8 @@ the following meanings:
        outstring = []
        self._FindOrphans(glob.glob('.*') +
-            glob.glob('*'),
+                          glob.glob('*'),
-            proj_dirs, proj_dirs_parents, outstring)
+                          proj_dirs, proj_dirs_parents, outstring)
        if outstring:
          output = StatusColoring(self.manifest.globalConfig)
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@ -22,18 +23,18 @@ from command import InteractiveCommand
 from editor import Editor
 from error import HookError, UploadError
 from git_command import GitCommand
 from git_refs import R_HEADS
 from project import RepoHook
 from pyversion import is_python3
 # pylint:disable=W0622
 if not is_python3():
-  input = raw_input
+  input = raw_input  # noqa: F821
 else:
  unicode = str
 # pylint:enable=W0622
 UNUSUAL_COMMIT_THRESHOLD = 5
 def _ConfirmManyUploads(multiple_branches=False):
  if multiple_branches:
    print('ATTENTION: One or more branches has an unusually high number '
@ -45,17 +46,20 @@ def _ConfirmManyUploads(multiple_branches=False):
  answer = input("If you are sure you intend to do this, type 'yes': ").strip()
  return answer == "yes"
 def _die(fmt, *args):
  msg = fmt % args
  print('error: %s' % msg, file=sys.stderr)
  sys.exit(1)
 def _SplitEmails(values):
  result = []
  for value in values:
    result.extend([s.strip() for s in value.split(',')])
  return result
 class Upload(InteractiveCommand):
  common = True
  helpSummary = "Upload changes for code review"
@ -80,8 +84,7 @@ added to the respective list of users, and emails are sent to any
 new users.  Users passed as --reviewers must already be registered
 with the code review system, or the upload will fail.
-Configuration
+# Configuration
 -------------
 review.URL.autoupload:
@ -128,10 +131,26 @@ is set to "true" then repo will assume you always want the equivalent
 of the -t option to the repo command. If unset or set to "false" then
 repo will make use of only the command line option.
-References
+review.URL.uploadhashtags:
 ----------
-Gerrit Code Review:  http://code.google.com/p/gerrit/
+To add hashtags whenever uploading a commit, you can set a per-project
 or global Git option to do so. The value of review.URL.uploadhashtags
 will be used as comma delimited hashtags like the --hashtag option.
 review.URL.uploadlabels:
 To add labels whenever uploading a commit, you can set a per-project
 or global Git option to do so. The value of review.URL.uploadlabels
 will be used as comma delimited labels like the --label option.
 review.URL.uploadnotify:
 Control e-mail notifications when uploading.
 https://gerrit-review.googlesource.com/Documentation/user-upload.html#notify
 # References
 Gerrit Code Review:  https://www.gerritcodereview.com/
 """
@ -139,25 +158,53 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
    p.add_option('-t',
                 dest='auto_topic', action='store_true',
                 help='Send local branch name to Gerrit Code Review')
    p.add_option('--hashtag', '--ht',
                 dest='hashtags', action='append', default=[],
                 help='Add hashtags (comma delimited) to the review.')
    p.add_option('--hashtag-branch', '--htb',
                 action='store_true',
                 help='Add local branch name as a hashtag.')
    p.add_option('-l', '--label',
                 dest='labels', action='append', default=[],
                 help='Add a label when uploading.')
    p.add_option('--re', '--reviewers',
-                 type='string',  action='append', dest='reviewers',
+                 type='string', action='append', dest='reviewers',
                 help='Request reviews from these people.')
    p.add_option('--cc',
-                 type='string',  action='append', dest='cc',
+                 type='string', action='append', dest='cc',
                 help='Also send email to these email addresses.')
    p.add_option('--br',
-                 type='string',  action='store', dest='branch',
+                 type='string', action='store', dest='branch',
                 help='Branch to upload.')
    p.add_option('--cbr', '--current-branch',
                 dest='current_branch', action='store_true',
                 help='Upload current git branch.')
-    p.add_option('-d', '--draft',
+    p.add_option('--ne', '--no-emails',
-                 action='store_true', dest='draft', default=False,
+                 action='store_false', dest='notify', default=True,
-                 help='If specified, upload as a draft.')
+                 help='If specified, do not send emails on upload.')
    p.add_option('-p', '--private',
                 action='store_true', dest='private', default=False,
                 help='If specified, upload as a private change.')
    p.add_option('-w', '--wip',
                 action='store_true', dest='wip', default=False,
                 help='If specified, upload as a work-in-progress change.')
    p.add_option('-o', '--push-option',
                 type='string', action='append', dest='push_options',
                 default=[],
                 help='Additional push options to transmit')
    p.add_option('-D', '--destination', '--dest',
                 type='string', action='store', dest='dest_branch',
                 metavar='BRANCH',
                 help='Submit for review on this target branch.')
    p.add_option('-n', '--dry-run',
                 dest='dryrun', default=False, action='store_true',
                 help='Do everything except actually upload the CL.')
    p.add_option('-y', '--yes',
                 default=False, action='store_true',
                 help='Answer yes to all safe prompts.')
    p.add_option('--no-cert-checks',
                 dest='validate_certs', action='store_false', default=True,
                 help='Disable verifying ssl certs (unsafe).')
    # 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.
@ -175,12 +222,16 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
    #   Never run upload hooks, but upload anyway (AKA bypass hooks).
    # - no-verify=True, verify=True:
    #   Invalid
-    p.add_option('--no-verify',
+    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.')
-    p.add_option('--verify',
+    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
@ -198,18 +249,25 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
      commit_list = branch.commits
      destination = opt.dest_branch or project.dest_branch or project.revisionExpr
-      print('Upload project %s/ to remote branch %s:' % (project.relpath, destination))
+      print('Upload project %s/ to remote branch %s%s:' %
            (project.relpath, destination, ' (private)' if opt.private else ''))
      print('  branch %s (%2d commit%s, %s):' % (
-                    name,
+          name,
-                    len(commit_list),
+          len(commit_list),
-                    len(commit_list) != 1 and 's' or '',
+          len(commit_list) != 1 and 's' or '',
-                    date))
+          date))
      for commit in commit_list:
        print('         %s' % commit)
-      sys.stdout.write('to %s (y/N)? ' % remote.review)
+      print('to %s (y/N)? ' % remote.review, end='')
-      answer = sys.stdin.readline().strip().lower()
+      # TODO: When we require Python 3, use flush=True w/print above.
-      answer = answer in ('y', 'yes', '1', 'true', 't')
+      sys.stdout.flush()
      if opt.yes:
        print('<--yes>')
        answer = True
      else:
        answer = sys.stdin.readline().strip().lower()
        answer = answer in ('y', 'yes', '1', 'true', 't')
    if answer:
      if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
@ -255,11 +313,6 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
      branches[project.name] = b
    script.append('')
    script = [ x.encode('utf-8')
             if issubclass(type(x), unicode)
             else x
             for x in script ]
    script = Editor.EditString("\n".join(script)).split("\n")
    project_re = re.compile(r'^#?\s*project\s*([^\s]+)/:$')
@ -311,12 +364,12 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
    key = 'review.%s.autoreviewer' % project.GetBranch(name).remote.review
    raw_list = project.config.GetString(key)
-    if not raw_list is None:
+    if raw_list is not None:
      people[0].extend([entry.strip() for entry in raw_list.split(',')])
    key = 'review.%s.autocopy' % project.GetBranch(name).remote.review
    raw_list = project.config.GetString(key)
-    if not raw_list is None and len(people[0]) > 0:
+    if raw_list is not None and len(people[0]) > 0:
      people[1].extend([entry.strip() for entry in raw_list.split(',')])
  def _FindGerritChange(self, branch):
@ -346,11 +399,18 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
          # if they want to auto upload, let's not ask because it could be automated
          if answer is None:
-            sys.stdout.write('Uncommitted changes in ' + branch.project.name)
+            print()
-            sys.stdout.write(' (did you forget to amend?):\n')
+            print('Uncommitted changes in %s (did you forget to amend?):'
-            sys.stdout.write('\n'.join(changes) + '\n')
+                  % branch.project.name)
-            sys.stdout.write('Continue uploading? (y/N) ')
+            print('\n'.join(changes))
-            a = sys.stdin.readline().strip().lower()
+            print('Continue uploading? (y/N) ', end='')
            # TODO: When we require Python 3, use flush=True w/print above.
            sys.stdout.flush()
            if opt.yes:
              print('<--yes>')
              a = 'yes'
            else:
              a = sys.stdin.readline().strip().lower()
            if a not in ('y', 'yes', 't', 'true', 'on'):
              print("skipping upload", file=sys.stderr)
              branch.uploaded = False
@ -362,12 +422,51 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
          key = 'review.%s.uploadtopic' % branch.project.remote.review
          opt.auto_topic = branch.project.config.GetBoolean(key)
        def _ExpandCommaList(value):
          """Split |value| up into comma delimited entries."""
          if not value:
            return
          for ret in value.split(','):
            ret = ret.strip()
            if ret:
              yield ret
        # Check if hashtags should be included.
        key = 'review.%s.uploadhashtags' % branch.project.remote.review
        hashtags = set(_ExpandCommaList(branch.project.config.GetString(key)))
        for tag in opt.hashtags:
          hashtags.update(_ExpandCommaList(tag))
        if opt.hashtag_branch:
          hashtags.add(branch.name)
        # Check if labels should be included.
        key = 'review.%s.uploadlabels' % branch.project.remote.review
        labels = set(_ExpandCommaList(branch.project.config.GetString(key)))
        for label in opt.labels:
          labels.update(_ExpandCommaList(label))
        # Basic sanity check on label syntax.
        for label in labels:
          if not re.match(r'^.+[+-][0-9]+$', label):
            print('repo: error: invalid label syntax "%s": labels use forms '
                  'like CodeReview+1 or Verified-1' % (label,), file=sys.stderr)
            sys.exit(1)
        # Handle e-mail notifications.
        if opt.notify is False:
          notify = 'NONE'
        else:
          key = 'review.%s.uploadnotify' % branch.project.remote.review
          notify = branch.project.config.GetString(key)
        destination = opt.dest_branch or branch.project.dest_branch
        # Make sure our local branch is not setup to track a different remote branch
        merge_branch = self._GetMergeBranch(branch.project)
        if destination:
-          full_dest = 'refs/heads/%s' % destination
+          full_dest = destination
          if not full_dest.startswith(R_HEADS):
            full_dest = R_HEADS + full_dest
          if not opt.dest_branch and merge_branch and merge_branch != full_dest:
            print('merge branch %s does not match destination branch %s'
                  % (merge_branch, full_dest))
@ -377,7 +476,18 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
            branch.uploaded = False
            continue
-        branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination)
+        branch.UploadForReview(people,
                               dryrun=opt.dryrun,
                               auto_topic=opt.auto_topic,
                               hashtags=hashtags,
                               labels=labels,
                               private=opt.private,
                               notify=notify,
                               wip=opt.wip,
                               dest_branch=destination,
                               validate_certs=opt.validate_certs,
                               push_options=opt.push_options)
        branch.uploaded = True
      except UploadError as e:
        branch.error = e
@ -395,18 +505,18 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
          else:
            fmt = '\n       (%s)'
          print(('[FAILED] %-15s %-15s' + fmt) % (
-                 branch.project.relpath + '/', \
+              branch.project.relpath + '/',
-                 branch.name, \
+              branch.name,
-                 str(branch.error)),
+              str(branch.error)),
-                 file=sys.stderr)
+              file=sys.stderr)
      print()
    for branch in todo:
      if branch.uploaded:
        print('[OK    ] %-15s %s' % (
-               branch.project.relpath + '/',
+            branch.project.relpath + '/',
-               branch.name),
+            branch.name),
-               file=sys.stderr)
+            file=sys.stderr)
    if have_errors:
      sys.exit(1)
@ -414,14 +524,14 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
  def _GetMergeBranch(self, project):
    p = GitCommand(project,
                   ['rev-parse', '--abbrev-ref', 'HEAD'],
-                   capture_stdout = True,
+                   capture_stdout=True,
-                   capture_stderr = True)
+                   capture_stderr=True)
    p.Wait()
    local_branch = p.stdout.strip()
    p = GitCommand(project,
                   ['config', '--get', 'branch.%s.merge' % local_branch],
-                   capture_stdout = True,
+                   capture_stdout=True,
-                   capture_stderr = True)
+                   capture_stderr=True)
    p.Wait()
    merge_branch = p.stdout.strip()
    return merge_branch
@ -454,17 +564,39 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
      if avail:
        pending.append((project, avail))
-    if pending and (not opt.bypass_hooks):
+    if not pending:
      if branch is None:
        print('repo: error: no branches ready for upload', file=sys.stderr)
      else:
        print('repo: error: no branches named "%s" ready for upload' %
              (branch,), file=sys.stderr)
      return 1
    if not opt.bypass_hooks:
      hook = RepoHook('pre-upload', self.manifest.repo_hooks_project,
-                      self.manifest.topdir, abort_if_user_denies=True)
+                      self.manifest.topdir,
-      pending_proj_names = [project.name for (project, avail) in pending]
+                      self.manifest.manifestProject.GetRemote('origin').url,
-      pending_worktrees = [project.worktree for (project, avail) in pending]
+                      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)
-        return
+
      if not passed:
        if opt.ignore_hooks:
          print('\nWARNING: pre-upload hooks failed, but uploading anyways.',
                file=sys.stderr)
        else:
          return
    if opt.reviewers:
      reviewers = _SplitEmails(opt.reviewers)
@ -472,9 +604,7 @@ Gerrit Code Review:  http://code.google.com/p/gerrit/
      cc = _SplitEmails(opt.cc)
    people = (reviewers, cc)
-    if not pending:
+    if len(pending) == 1 and len(pending[0][1]) == 1:
      print("no branches ready for upload", file=sys.stderr)
    elif len(pending) == 1 and len(pending[0][1]) == 1:
      self._SingleBranch(opt, pending[0][1][0], people)
    else:
      self._MultipleBranches(opt, pending, people)
--- a/subcmds/version.py
+++ b/subcmds/version.py
@ -1,3 +1,4 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 The Android Open Source Project
 #
@ -14,11 +15,15 @@
 # limitations under the License.
 from __future__ import print_function
 import platform
 import sys
 from command import Command, MirrorSafeCommand
-from git_command import git
+from git_command import git, RepoSourceVersion, user_agent
 from git_refs import HEAD
 class Version(Command, MirrorSafeCommand):
  wrapper_version = None
  wrapper_path = None
@ -33,12 +38,29 @@ class Version(Command, MirrorSafeCommand):
    rp = self.manifest.repoProject
    rem = rp.GetRemote(rp.remote.name)
-    print('repo version %s' % rp.work_git.describe(HEAD))
+    # 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('       (%s)' % rp.bare_git.log('-1', '--format=%cD', HEAD))
-    if Version.wrapper_path is not None:
+    if self.wrapper_path is not None:
-      print('repo launcher version %s' % Version.wrapper_version)
+      print('repo launcher version %s' % self.wrapper_version)
-      print('       (from %s)' % Version.wrapper_path)
+      print('       (from %s)' % self.wrapper_path)
-    print(git.version().strip())
+      if src_ver != rp_ver:
        print('       (currently at %s)' % src_ver)
    print('repo User-Agent %s' % user_agent.repo)
    print('git %s' % git.version_tuple().full)
    print('git User-Agent %s' % user_agent.git)
    print('Python %s' % sys.version)
    uname = platform.uname()
    if sys.version_info.major < 3:
      # Python 3 returns a named tuple, but Python 2 is simpler.
      print(uname)
    else:
      print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
      print('CPU %s (%s)' %
            (uname.machine, uname.processor if uname.processor else 'unknown'))
--- a/tests/fixtures/.gitignore
+++ b/tests/fixtures/.gitignore
@ -0,0 +1,2 @@
 /.repo_not.present.gitconfig.json
 /.repo_test.gitconfig.json
--- a/tests/fixtures/gitc_config
+++ b/tests/fixtures/gitc_config
@ -0,0 +1 @@
 gitc_dir=/test/usr/local/google/gitc
--- a/tests/fixtures/test.gitconfig
+++ b/tests/fixtures/test.gitconfig
@ -1,3 +1,13 @@
 [section]
 	empty
 	nonempty = true
 	boolinvalid = oops
 	booltrue = true
 	boolfalse = false
 	intinvalid = oops
 	inthex = 0x10
 	inthexk = 0x10k
 	int = 10
 	intk = 10k
 	intm = 10m
 	intg = 10g
--- a/tests/test_editor.py
+++ b/tests/test_editor.py
@ -0,0 +1,60 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Unittests for the editor.py module."""
 from __future__ import print_function
 import unittest
 from editor import Editor
 class EditorTestCase(unittest.TestCase):
  """Take care of resetting Editor state across tests."""
  def setUp(self):
    self.setEditor(None)
  def tearDown(self):
    self.setEditor(None)
  @staticmethod
  def setEditor(editor):
    Editor._editor = editor
 class GetEditor(EditorTestCase):
  """Check GetEditor behavior."""
  def test_basic(self):
    """Basic checking of _GetEditor."""
    self.setEditor(':')
    self.assertEqual(':', Editor._GetEditor())
 class EditString(EditorTestCase):
  """Check EditString behavior."""
  def test_no_editor(self):
    """Check behavior when no editor is available."""
    self.setEditor(':')
    self.assertEqual('foo', Editor.EditString('foo'))
  def test_cat_editor(self):
    """Check behavior when editor is `cat`."""
    self.setEditor('cat')
    self.assertEqual('foo', Editor.EditString('foo'))
--- a/tests/test_git_command.py
+++ b/tests/test_git_command.py
@ -0,0 +1,153 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Unittests for the git_command.py module."""
 from __future__ import print_function
 import re
 import unittest
 try:
  from unittest import mock
 except ImportError:
  import mock
 import git_command
 import wrapper
 class SSHUnitTest(unittest.TestCase):
  """Tests the ssh functions."""
  def test_ssh_version(self):
    """Check ssh_version() handling."""
    ver = git_command._parse_ssh_version('Unknown\n')
    self.assertEqual(ver, ())
    ver = git_command._parse_ssh_version('OpenSSH_1.0\n')
    self.assertEqual(ver, (1, 0))
    ver = git_command._parse_ssh_version('OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.13, OpenSSL 1.0.1f 6 Jan 2014\n')
    self.assertEqual(ver, (6, 6, 1))
    ver = git_command._parse_ssh_version('OpenSSH_7.6p1 Ubuntu-4ubuntu0.3, OpenSSL 1.0.2n  7 Dec 2017\n')
    self.assertEqual(ver, (7, 6))
  def test_ssh_sock(self):
    """Check ssh_sock() function."""
    with mock.patch('tempfile.mkdtemp', return_value='/tmp/foo'):
      # old ssh version uses port
      with mock.patch('git_command.ssh_version', return_value=(6, 6)):
        self.assertTrue(git_command.ssh_sock().endswith('%p'))
      git_command._ssh_sock_path = None
      # new ssh version uses hash
      with mock.patch('git_command.ssh_version', return_value=(6, 7)):
        self.assertTrue(git_command.ssh_sock().endswith('%C'))
      git_command._ssh_sock_path = None
 class GitCallUnitTest(unittest.TestCase):
  """Tests the _GitCall class (via git_command.git)."""
  def test_version_tuple(self):
    """Check git.version_tuple() handling."""
    ver = git_command.git.version_tuple()
    self.assertIsNotNone(ver)
    # We don't dive too deep into the values here to avoid having to update
    # whenever git versions change.  We do check relative to this min version
    # as this is what `repo` itself requires via MIN_GIT_VERSION.
    MIN_GIT_VERSION = (2, 10, 2)
    self.assertTrue(isinstance(ver.major, int))
    self.assertTrue(isinstance(ver.minor, int))
    self.assertTrue(isinstance(ver.micro, int))
    self.assertGreater(ver.major, MIN_GIT_VERSION[0] - 1)
    self.assertGreaterEqual(ver.micro, 0)
    self.assertGreaterEqual(ver.major, 0)
    self.assertGreaterEqual(ver, MIN_GIT_VERSION)
    self.assertLess(ver, (9999, 9999, 9999))
    self.assertNotEqual('', ver.full)
 class UserAgentUnitTest(unittest.TestCase):
  """Tests the UserAgent function."""
  def test_smoke_os(self):
    """Make sure UA OS setting returns something useful."""
    os_name = git_command.user_agent.os
    # We can't dive too deep because of OS/tool differences, but we can check
    # the general form.
    m = re.match(r'^[^ ]+$', os_name)
    self.assertIsNotNone(m)
  def test_smoke_repo(self):
    """Make sure repo UA returns something useful."""
    ua = git_command.user_agent.repo
    # We can't dive too deep because of OS/tool differences, but we can check
    # the general form.
    m = re.match(r'^git-repo/[^ ]+ ([^ ]+) git/[^ ]+ Python/[0-9.]+', ua)
    self.assertIsNotNone(m)
  def test_smoke_git(self):
    """Make sure git UA returns something useful."""
    ua = git_command.user_agent.git
    # We can't dive too deep because of OS/tool differences, but we can check
    # the general form.
    m = re.match(r'^git/[^ ]+ ([^ ]+) git-repo/[^ ]+', ua)
    self.assertIsNotNone(m)
 class GitRequireTests(unittest.TestCase):
  """Test the git_require helper."""
  def setUp(self):
    ver = wrapper.GitVersion(1, 2, 3, 4)
    mock.patch.object(git_command.git, 'version_tuple', return_value=ver).start()
  def tearDown(self):
    mock.patch.stopall()
  def test_older_nonfatal(self):
    """Test non-fatal require calls with old versions."""
    self.assertFalse(git_command.git_require((2,)))
    self.assertFalse(git_command.git_require((1, 3)))
    self.assertFalse(git_command.git_require((1, 2, 4)))
    self.assertFalse(git_command.git_require((1, 2, 3, 5)))
  def test_newer_nonfatal(self):
    """Test non-fatal require calls with newer versions."""
    self.assertTrue(git_command.git_require((0,)))
    self.assertTrue(git_command.git_require((1, 0)))
    self.assertTrue(git_command.git_require((1, 2, 0)))
    self.assertTrue(git_command.git_require((1, 2, 3, 0)))
  def test_equal_nonfatal(self):
    """Test require calls with equal values."""
    self.assertTrue(git_command.git_require((1, 2, 3, 4), fail=False))
    self.assertTrue(git_command.git_require((1, 2, 3, 4), fail=True))
  def test_older_fatal(self):
    """Test fatal require calls with old versions."""
    with self.assertRaises(SystemExit) as e:
      git_command.git_require((2,), fail=True)
      self.assertNotEqual(0, e.code)
  def test_older_fatal_msg(self):
    """Test fatal require calls with old versions and message."""
    with self.assertRaises(SystemExit) as e:
      git_command.git_require((2,), fail=True, msg='so sad')
      self.assertNotEqual(0, e.code)
--- a/tests/test_git_config.py
+++ b/tests/test_git_config.py
@ -1,16 +1,39 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2009 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_config.py module."""
 from __future__ import print_function
 import os
 import unittest
 import git_config
 def fixture(*paths):
  """Return a path relative to test/fixtures.
  """
  return os.path.join(os.path.dirname(__file__), 'fixtures', *paths)
 class GitConfigUnitTest(unittest.TestCase):
  """Tests the GitConfig class.
  """
  def setUp(self):
    """Create a GitConfig object using the test.gitconfig fixture.
    """
@ -48,5 +71,43 @@ class GitConfigUnitTest(unittest.TestCase):
    val = config.GetString('empty')
    self.assertEqual(val, None)
  def test_GetBoolean_undefined(self):
    """Test GetBoolean on key that doesn't exist."""
    self.assertIsNone(self.config.GetBoolean('section.missing'))
  def test_GetBoolean_invalid(self):
    """Test GetBoolean on invalid boolean value."""
    self.assertIsNone(self.config.GetBoolean('section.boolinvalid'))
  def test_GetBoolean_true(self):
    """Test GetBoolean on valid true boolean."""
    self.assertTrue(self.config.GetBoolean('section.booltrue'))
  def test_GetBoolean_false(self):
    """Test GetBoolean on valid false boolean."""
    self.assertFalse(self.config.GetBoolean('section.boolfalse'))
  def test_GetInt_undefined(self):
    """Test GetInt on key that doesn't exist."""
    self.assertIsNone(self.config.GetInt('section.missing'))
  def test_GetInt_invalid(self):
    """Test GetInt on invalid integer value."""
    self.assertIsNone(self.config.GetBoolean('section.intinvalid'))
  def test_GetInt_valid(self):
    """Test GetInt on valid integers."""
    TESTS = (
        ('inthex', 16),
        ('inthexk', 16384),
        ('int', 10),
        ('intk', 10240),
        ('intm', 10485760),
        ('intg', 10737418240),
    )
    for key, value in TESTS:
      self.assertEqual(value, self.config.GetInt('section.%s' % (key,)))
 if __name__ == '__main__':
  unittest.main()
--- a/tests/test_manifest_xml.py
+++ b/tests/test_manifest_xml.py
@ -0,0 +1,148 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Unittests for the manifest_xml.py module."""
 from __future__ import print_function
 import os
 import unittest
 import xml.dom.minidom
 import error
 import manifest_xml
 class ManifestValidateFilePaths(unittest.TestCase):
  """Check _ValidateFilePaths helper.
  This doesn't access a real filesystem.
  """
  def check_both(self, *args):
    manifest_xml.XmlManifest._ValidateFilePaths('copyfile', *args)
    manifest_xml.XmlManifest._ValidateFilePaths('linkfile', *args)
  def test_normal_path(self):
    """Make sure good paths are accepted."""
    self.check_both('foo', 'bar')
    self.check_both('foo/bar', 'bar')
    self.check_both('foo', 'bar/bar')
    self.check_both('foo/bar', 'bar/bar')
  def test_symlink_targets(self):
    """Some extra checks for symlinks."""
    def check(*args):
      manifest_xml.XmlManifest._ValidateFilePaths('linkfile', *args)
    # We allow symlinks to end in a slash since we allow them to point to dirs
    # in general.  Technically the slash isn't necessary.
    check('foo/', 'bar')
    # We allow a single '.' to get a reference to the project itself.
    check('.', 'bar')
  def test_bad_paths(self):
    """Make sure bad paths (src & dest) are rejected."""
    PATHS = (
        '..',
        '../',
        './',
        'foo/',
        './foo',
        '../foo',
        'foo/./bar',
        'foo/../../bar',
        '/foo',
        './../foo',
        '.git/foo',
        # Check case folding.
        '.GIT/foo',
        'blah/.git/foo',
        '.repo/foo',
        '.repoconfig',
        # Block ~ due to 8.3 filenames on Windows filesystems.
        '~',
        'foo~',
        'blah/foo~',
        # Block Unicode characters that get normalized out by filesystems.
        u'foo\u200Cbar',
    )
    # Make sure platforms that use path separators (e.g. Windows) are also
    # rejected properly.
    if os.path.sep != '/':
      PATHS += tuple(x.replace('/', os.path.sep) for x in PATHS)
    for path in PATHS:
      self.assertRaises(
          error.ManifestInvalidPathError, self.check_both, path, 'a')
      self.assertRaises(
          error.ManifestInvalidPathError, self.check_both, 'a', path)
 class ValueTests(unittest.TestCase):
  """Check utility parsing code."""
  def _get_node(self, text):
    return xml.dom.minidom.parseString(text).firstChild
  def test_bool_default(self):
    """Check XmlBool default handling."""
    node = self._get_node('<node/>')
    self.assertIsNone(manifest_xml.XmlBool(node, 'a'))
    self.assertIsNone(manifest_xml.XmlBool(node, 'a', None))
    self.assertEqual(123, manifest_xml.XmlBool(node, 'a', 123))
    node = self._get_node('<node a=""/>')
    self.assertIsNone(manifest_xml.XmlBool(node, 'a'))
  def test_bool_invalid(self):
    """Check XmlBool invalid handling."""
    node = self._get_node('<node a="moo"/>')
    self.assertEqual(123, manifest_xml.XmlBool(node, 'a', 123))
  def test_bool_true(self):
    """Check XmlBool true values."""
    for value in ('yes', 'true', '1'):
      node = self._get_node('<node a="%s"/>' % (value,))
      self.assertTrue(manifest_xml.XmlBool(node, 'a'))
  def test_bool_false(self):
    """Check XmlBool false values."""
    for value in ('no', 'false', '0'):
      node = self._get_node('<node a="%s"/>' % (value,))
      self.assertFalse(manifest_xml.XmlBool(node, 'a'))
  def test_int_default(self):
    """Check XmlInt default handling."""
    node = self._get_node('<node/>')
    self.assertIsNone(manifest_xml.XmlInt(node, 'a'))
    self.assertIsNone(manifest_xml.XmlInt(node, 'a', None))
    self.assertEqual(123, manifest_xml.XmlInt(node, 'a', 123))
    node = self._get_node('<node a=""/>')
    self.assertIsNone(manifest_xml.XmlInt(node, 'a'))
  def test_int_good(self):
    """Check XmlInt numeric handling."""
    for value in (-1, 0, 1, 50000):
      node = self._get_node('<node a="%s"/>' % (value,))
      self.assertEqual(value, manifest_xml.XmlInt(node, 'a'))
  def test_int_invalid(self):
    """Check XmlInt invalid handling."""
    with self.assertRaises(error.ManifestParseError):
      node = self._get_node('<node a="xx"/>')
      manifest_xml.XmlInt(node, 'a')
--- a/tests/test_project.py
+++ b/tests/test_project.py
@ -0,0 +1,367 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Unittests for the project.py module."""
 from __future__ import print_function
 import contextlib
 import os
 import shutil
 import subprocess
 import tempfile
 import unittest
 import error
 import git_config
 import platform_utils
 import project
@contextlib.contextmanager
 def TempGitTree():
  """Create a new empty git checkout for testing."""
  # TODO(vapier): Convert this to tempfile.TemporaryDirectory once we drop
  # Python 2 support entirely.
  try:
    tempdir = tempfile.mkdtemp(prefix='repo-tests')
    subprocess.check_call(['git', 'init'], cwd=tempdir)
    yield tempdir
  finally:
    platform_utils.rmtree(tempdir)
 class RepoHookShebang(unittest.TestCase):
  """Check shebang parsing in RepoHook."""
  def test_no_shebang(self):
    """Lines w/out shebangs should be rejected."""
    DATA = (
        '',
        '# -*- coding:utf-8 -*-\n',
        '#\n# foo\n',
        '# Bad shebang in script\n#!/foo\n'
    )
    for data in DATA:
      self.assertIsNone(project.RepoHook._ExtractInterpFromShebang(data))
  def test_direct_interp(self):
    """Lines whose shebang points directly to the interpreter."""
    DATA = (
        ('#!/foo', '/foo'),
        ('#! /foo', '/foo'),
        ('#!/bin/foo ', '/bin/foo'),
        ('#! /usr/foo ', '/usr/foo'),
        ('#! /usr/foo -args', '/usr/foo'),
    )
    for shebang, interp in DATA:
      self.assertEqual(project.RepoHook._ExtractInterpFromShebang(shebang),
                       interp)
  def test_env_interp(self):
    """Lines whose shebang launches through `env`."""
    DATA = (
        ('#!/usr/bin/env foo', 'foo'),
        ('#!/bin/env foo', 'foo'),
        ('#! /bin/env /bin/foo ', '/bin/foo'),
    )
    for shebang, interp in DATA:
      self.assertEqual(project.RepoHook._ExtractInterpFromShebang(shebang),
                       interp)
 class FakeProject(object):
  """A fake for Project for basic functionality."""
  def __init__(self, worktree):
    self.worktree = worktree
    self.gitdir = os.path.join(worktree, '.git')
    self.name = 'fakeproject'
    self.work_git = project.Project._GitGetByExec(
        self, bare=False, gitdir=self.gitdir)
    self.bare_git = project.Project._GitGetByExec(
        self, bare=True, gitdir=self.gitdir)
    self.config = git_config.GitConfig.ForRepository(gitdir=self.gitdir)
 class ReviewableBranchTests(unittest.TestCase):
  """Check ReviewableBranch behavior."""
  def test_smoke(self):
    """A quick run through everything."""
    with TempGitTree() as tempdir:
      fakeproj = FakeProject(tempdir)
      # Generate some commits.
      with open(os.path.join(tempdir, 'readme'), 'w') as fp:
        fp.write('txt')
      fakeproj.work_git.add('readme')
      fakeproj.work_git.commit('-mAdd file')
      fakeproj.work_git.checkout('-b', 'work')
      fakeproj.work_git.rm('-f', 'readme')
      fakeproj.work_git.commit('-mDel file')
      # Start off with the normal details.
      rb = project.ReviewableBranch(
          fakeproj, fakeproj.config.GetBranch('work'), 'master')
      self.assertEqual('work', rb.name)
      self.assertEqual(1, len(rb.commits))
      self.assertIn('Del file', rb.commits[0])
      d = rb.unabbrev_commits
      self.assertEqual(1, len(d))
      short, long = next(iter(d.items()))
      self.assertTrue(long.startswith(short))
      self.assertTrue(rb.base_exists)
      # Hard to assert anything useful about this.
      self.assertTrue(rb.date)
      # Now delete the tracking branch!
      fakeproj.work_git.branch('-D', 'master')
      rb = project.ReviewableBranch(
          fakeproj, fakeproj.config.GetBranch('work'), 'master')
      self.assertEqual(0, len(rb.commits))
      self.assertFalse(rb.base_exists)
      # Hard to assert anything useful about this.
      self.assertTrue(rb.date)
 class CopyLinkTestCase(unittest.TestCase):
  """TestCase for stub repo client checkouts.
  It'll have a layout like:
    tempdir/          # self.tempdir
      checkout/       # self.topdir
        git-project/  # self.worktree
  Attributes:
    tempdir: A dedicated temporary directory.
    worktree: The top of the repo client checkout.
    topdir: The top of a project checkout.
  """
  def setUp(self):
    self.tempdir = tempfile.mkdtemp(prefix='repo_tests')
    self.topdir = os.path.join(self.tempdir, 'checkout')
    self.worktree = os.path.join(self.topdir, 'git-project')
    os.makedirs(self.topdir)
    os.makedirs(self.worktree)
  def tearDown(self):
    shutil.rmtree(self.tempdir, ignore_errors=True)
  @staticmethod
  def touch(path):
    with open(path, 'w'):
      pass
  def assertExists(self, path, msg=None):
    """Make sure |path| exists."""
    if os.path.exists(path):
      return
    if msg is None:
      msg = ['path is missing: %s' % path]
      while path != '/':
        path = os.path.dirname(path)
        if not path:
          # If we're given something like "foo", abort once we get to "".
          break
        result = os.path.exists(path)
        msg.append('\tos.path.exists(%s): %s' % (path, result))
        if result:
          msg.append('\tcontents: %r' % os.listdir(path))
          break
      msg = '\n'.join(msg)
    raise self.failureException(msg)
 class CopyFile(CopyLinkTestCase):
  """Check _CopyFile handling."""
  def CopyFile(self, src, dest):
    return project._CopyFile(self.worktree, src, self.topdir, dest)
  def test_basic(self):
    """Basic test of copying a file from a project to the toplevel."""
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    cf = self.CopyFile('foo.txt', 'foo')
    cf._Copy()
    self.assertExists(os.path.join(self.topdir, 'foo'))
  def test_src_subdir(self):
    """Copy a file from a subdir of a project."""
    src = os.path.join(self.worktree, 'bar', 'foo.txt')
    os.makedirs(os.path.dirname(src))
    self.touch(src)
    cf = self.CopyFile('bar/foo.txt', 'new.txt')
    cf._Copy()
    self.assertExists(os.path.join(self.topdir, 'new.txt'))
  def test_dest_subdir(self):
    """Copy a file to a subdir of a checkout."""
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    cf = self.CopyFile('foo.txt', 'sub/dir/new.txt')
    self.assertFalse(os.path.exists(os.path.join(self.topdir, 'sub')))
    cf._Copy()
    self.assertExists(os.path.join(self.topdir, 'sub', 'dir', 'new.txt'))
  def test_update(self):
    """Make sure changed files get copied again."""
    src = os.path.join(self.worktree, 'foo.txt')
    dest = os.path.join(self.topdir, 'bar')
    with open(src, 'w') as f:
      f.write('1st')
    cf = self.CopyFile('foo.txt', 'bar')
    cf._Copy()
    self.assertExists(dest)
    with open(dest) as f:
      self.assertEqual(f.read(), '1st')
    with open(src, 'w') as f:
      f.write('2nd!')
    cf._Copy()
    with open(dest) as f:
      self.assertEqual(f.read(), '2nd!')
  def test_src_block_symlink(self):
    """Do not allow reading from a symlinked path."""
    src = os.path.join(self.worktree, 'foo.txt')
    sym = os.path.join(self.worktree, 'sym')
    self.touch(src)
    platform_utils.symlink('foo.txt', sym)
    self.assertExists(sym)
    cf = self.CopyFile('sym', 'foo')
    self.assertRaises(error.ManifestInvalidPathError, cf._Copy)
  def test_src_block_symlink_traversal(self):
    """Do not allow reading through a symlink dir."""
    realfile = os.path.join(self.tempdir, 'file.txt')
    self.touch(realfile)
    src = os.path.join(self.worktree, 'bar', 'file.txt')
    platform_utils.symlink(self.tempdir, os.path.join(self.worktree, 'bar'))
    self.assertExists(src)
    cf = self.CopyFile('bar/file.txt', 'foo')
    self.assertRaises(error.ManifestInvalidPathError, cf._Copy)
  def test_src_block_copy_from_dir(self):
    """Do not allow copying from a directory."""
    src = os.path.join(self.worktree, 'dir')
    os.makedirs(src)
    cf = self.CopyFile('dir', 'foo')
    self.assertRaises(error.ManifestInvalidPathError, cf._Copy)
  def test_dest_block_symlink(self):
    """Do not allow writing to a symlink."""
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    platform_utils.symlink('dest', os.path.join(self.topdir, 'sym'))
    cf = self.CopyFile('foo.txt', 'sym')
    self.assertRaises(error.ManifestInvalidPathError, cf._Copy)
  def test_dest_block_symlink_traversal(self):
    """Do not allow writing through a symlink dir."""
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    platform_utils.symlink(tempfile.gettempdir(),
                           os.path.join(self.topdir, 'sym'))
    cf = self.CopyFile('foo.txt', 'sym/foo.txt')
    self.assertRaises(error.ManifestInvalidPathError, cf._Copy)
  def test_src_block_copy_to_dir(self):
    """Do not allow copying to a directory."""
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    os.makedirs(os.path.join(self.topdir, 'dir'))
    cf = self.CopyFile('foo.txt', 'dir')
    self.assertRaises(error.ManifestInvalidPathError, cf._Copy)
 class LinkFile(CopyLinkTestCase):
  """Check _LinkFile handling."""
  def LinkFile(self, src, dest):
    return project._LinkFile(self.worktree, src, self.topdir, dest)
  def test_basic(self):
    """Basic test of linking a file from a project into the toplevel."""
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    lf = self.LinkFile('foo.txt', 'foo')
    lf._Link()
    dest = os.path.join(self.topdir, 'foo')
    self.assertExists(dest)
    self.assertTrue(os.path.islink(dest))
    self.assertEqual(os.path.join('git-project', 'foo.txt'), os.readlink(dest))
  def test_src_subdir(self):
    """Link to a file in a subdir of a project."""
    src = os.path.join(self.worktree, 'bar', 'foo.txt')
    os.makedirs(os.path.dirname(src))
    self.touch(src)
    lf = self.LinkFile('bar/foo.txt', 'foo')
    lf._Link()
    self.assertExists(os.path.join(self.topdir, 'foo'))
  def test_src_self(self):
    """Link to the project itself."""
    dest = os.path.join(self.topdir, 'foo', 'bar')
    lf = self.LinkFile('.', 'foo/bar')
    lf._Link()
    self.assertExists(dest)
    self.assertEqual(os.path.join('..', 'git-project'), os.readlink(dest))
  def test_dest_subdir(self):
    """Link a file to a subdir of a checkout."""
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    lf = self.LinkFile('foo.txt', 'sub/dir/foo/bar')
    self.assertFalse(os.path.exists(os.path.join(self.topdir, 'sub')))
    lf._Link()
    self.assertExists(os.path.join(self.topdir, 'sub', 'dir', 'foo', 'bar'))
  def test_src_block_relative(self):
    """Do not allow relative symlinks."""
    BAD_SOURCES = (
        './',
        '..',
        '../',
        'foo/.',
        'foo/./bar',
        'foo/..',
        'foo/../foo',
    )
    for src in BAD_SOURCES:
      lf = self.LinkFile(src, 'foo')
      self.assertRaises(error.ManifestInvalidPathError, lf._Link)
  def test_update(self):
    """Make sure changed targets get updated."""
    dest = os.path.join(self.topdir, 'sym')
    src = os.path.join(self.worktree, 'foo.txt')
    self.touch(src)
    lf = self.LinkFile('foo.txt', 'sym')
    lf._Link()
    self.assertEqual(os.path.join('git-project', 'foo.txt'), os.readlink(dest))
    # Point the symlink somewhere else.
    os.unlink(dest)
    platform_utils.symlink(self.tempdir, dest)
    lf._Link()
    self.assertEqual(os.path.join('git-project', 'foo.txt'), os.readlink(dest))
--- a/tests/test_wrapper.py
+++ b/tests/test_wrapper.py
@ -0,0 +1,485 @@
 # -*- coding:utf-8 -*-
 #
 # Copyright (C) 2015 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 wrapper.py module."""
 from __future__ import print_function
 import contextlib
 import os
 import re
 import shutil
 import tempfile
 import unittest
 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."""
  # TODO(vapier): Convert this to tempfile.TemporaryDirectory once we drop
  # Python 2 support entirely.
  try:
    tempdir = tempfile.mkdtemp(prefix='repo-tests')
    yield tempdir
  finally:
    platform_utils.rmtree(tempdir)
 def fixture(*paths):
  """Return a path relative to tests/fixtures.
  """
  return os.path.join(os.path.dirname(__file__), 'fixtures', *paths)
 class RepoWrapperTestCase(unittest.TestCase):
  """TestCase for the wrapper module."""
  def setUp(self):
    """Load the wrapper module every time."""
    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
  """
  def test_version(self):
    """Make sure _Version works."""
    with self.assertRaises(SystemExit) as e:
      with mock.patch('sys.stdout', new_callable=StringIO) as stdout:
        with mock.patch('sys.stderr', new_callable=StringIO) as stderr:
          self.wrapper._Version()
    self.assertEqual(0, e.exception.code)
    self.assertEqual('', stderr.getvalue())
    self.assertIn('repo launcher version', stdout.getvalue())
  def test_init_parser(self):
    """Make sure 'init' GetParser works."""
    parser = self.wrapper.GetParser(gitc_init=False)
    opts, args = parser.parse_args([])
    self.assertEqual([], args)
    self.assertIsNone(opts.manifest_url)
  def test_gitc_init_parser(self):
    """Make sure 'gitc-init' GetParser works."""
    parser = self.wrapper.GetParser(gitc_init=True)
    opts, args = parser.parse_args([])
    self.assertEqual([], args)
    self.assertIsNone(opts.manifest_file)
  def test_get_gitc_manifest_dir_no_gitc(self):
    """
    Test reading a missing gitc config file
    """
    self.wrapper.GITC_CONFIG_FILE = fixture('missing_gitc_config')
    val = self.wrapper.get_gitc_manifest_dir()
    self.assertEqual(val, '')
  def test_get_gitc_manifest_dir(self):
    """
    Test reading the gitc config file and parsing the directory
    """
    self.wrapper.GITC_CONFIG_FILE = fixture('gitc_config')
    val = self.wrapper.get_gitc_manifest_dir()
    self.assertEqual(val, '/test/usr/local/google/gitc')
  def test_gitc_parse_clientdir_no_gitc(self):
    """
    Test parsing the gitc clientdir without gitc running
    """
    self.wrapper.GITC_CONFIG_FILE = fixture('missing_gitc_config')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/something'), None)
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/test'), 'test')
  def test_gitc_parse_clientdir(self):
    """
    Test parsing the gitc clientdir
    """
    self.wrapper.GITC_CONFIG_FILE = fixture('gitc_config')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/something'), None)
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/test'), 'test')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/test/'), 'test')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/test/extra'), 'test')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test'), 'test')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/'), 'test')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/extra'),
                     'test')
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/'), None)
    self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/'), None)
 class SetGitTrace2ParentSid(RepoWrapperTestCase):
  """Check SetGitTrace2ParentSid behavior."""
  KEY = 'GIT_TRACE2_PARENT_SID'
  VALID_FORMAT = re.compile(r'^repo-[0-9]{8}T[0-9]{6}Z-P[0-9a-f]{8}$')
  def test_first_set(self):
    """Test env var not yet set."""
    env = {}
    self.wrapper.SetGitTrace2ParentSid(env)
    self.assertIn(self.KEY, env)
    value = env[self.KEY]
    self.assertRegex(value, self.VALID_FORMAT)
  def test_append(self):
    """Test env var is appended."""
    env = {self.KEY: 'pfx'}
    self.wrapper.SetGitTrace2ParentSid(env)
    self.assertIn(self.KEY, env)
    value = env[self.KEY]
    self.assertTrue(value.startswith('pfx/'))
    self.assertRegex(value[4:], self.VALID_FORMAT)
  def test_global_context(self):
    """Check os.environ gets updated by default."""
    os.environ.pop(self.KEY, None)
    self.wrapper.SetGitTrace2ParentSid()
    self.assertIn(self.KEY, os.environ)
    value = os.environ[self.KEY]
    self.assertRegex(value, self.VALID_FORMAT)
 class RunCommand(RepoWrapperTestCase):
  """Check run_command behavior."""
  def test_capture(self):
    """Check capture_output handling."""
    ret = self.wrapper.run_command(['echo', 'hi'], capture_output=True)
    self.assertEqual(ret.stdout, 'hi\n')
  def test_check(self):
    """Check check handling."""
    self.wrapper.run_command(['true'], check=False)
    self.wrapper.run_command(['true'], check=True)
    self.wrapper.run_command(['false'], check=False)
    with self.assertRaises(self.wrapper.RunError):
      self.wrapper.run_command(['false'], check=True)
 class RunGit(RepoWrapperTestCase):
  """Check run_git behavior."""
  def test_capture(self):
    """Check capture_output handling."""
    ret = self.wrapper.run_git('--version')
    self.assertIn('git', ret.stdout)
  def test_check(self):
    """Check check handling."""
    with self.assertRaises(self.wrapper.CloneFailure):
      self.wrapper.run_git('--version-asdfasdf')
    self.wrapper.run_git('--version-asdfasdf', check=False)
 class ParseGitVersion(RepoWrapperTestCase):
  """Check ParseGitVersion behavior."""
  def test_autoload(self):
    """Check we can load the version from the live git."""
    ret = self.wrapper.ParseGitVersion()
    self.assertIsNotNone(ret)
  def test_bad_ver(self):
    """Check handling of bad git versions."""
    ret = self.wrapper.ParseGitVersion(ver_str='asdf')
    self.assertIsNone(ret)
  def test_normal_ver(self):
    """Check handling of normal git versions."""
    ret = self.wrapper.ParseGitVersion(ver_str='git version 2.25.1')
    self.assertEqual(2, ret.major)
    self.assertEqual(25, ret.minor)
    self.assertEqual(1, ret.micro)
    self.assertEqual('2.25.1', ret.full)
  def test_extended_ver(self):
    """Check handling of extended distro git versions."""
    ret = self.wrapper.ParseGitVersion(
        ver_str='git version 1.30.50.696.g5e7596f4ac-goog')
    self.assertEqual(1, ret.major)
    self.assertEqual(30, ret.minor)
    self.assertEqual(50, ret.micro)
    self.assertEqual('1.30.50.696.g5e7596f4ac-goog', ret.full)
 class CheckGitVersion(RepoWrapperTestCase):
  """Check _CheckGitVersion behavior."""
  def test_unknown(self):
    """Unknown versions should abort."""
    with mock.patch.object(self.wrapper, 'ParseGitVersion', return_value=None):
      with self.assertRaises(self.wrapper.CloneFailure):
        self.wrapper._CheckGitVersion()
  def test_old(self):
    """Old versions should abort."""
    with mock.patch.object(
        self.wrapper, 'ParseGitVersion',
        return_value=self.wrapper.GitVersion(1, 0, 0, '1.0.0')):
      with self.assertRaises(self.wrapper.CloneFailure):
        self.wrapper._CheckGitVersion()
  def test_new(self):
    """Newer versions should run fine."""
    with mock.patch.object(
        self.wrapper, 'ParseGitVersion',
        return_value=self.wrapper.GitVersion(100, 0, 0, '100.0.0')):
      self.wrapper._CheckGitVersion()
 class NeedSetupGnuPG(RepoWrapperTestCase):
  """Check NeedSetupGnuPG behavior."""
  def test_missing_dir(self):
    """The ~/.repoconfig tree doesn't exist yet."""
    with TemporaryDirectory() as tempdir:
      self.wrapper.home_dot_repo = os.path.join(tempdir, 'foo')
      self.assertTrue(self.wrapper.NeedSetupGnuPG())
  def test_missing_keyring(self):
    """The keyring-version file doesn't exist yet."""
    with TemporaryDirectory() as tempdir:
      self.wrapper.home_dot_repo = tempdir
      self.assertTrue(self.wrapper.NeedSetupGnuPG())
  def test_empty_keyring(self):
    """The keyring-version file exists, but is empty."""
    with TemporaryDirectory() as tempdir:
      self.wrapper.home_dot_repo = tempdir
      with open(os.path.join(tempdir, 'keyring-version'), 'w'):
        pass
      self.assertTrue(self.wrapper.NeedSetupGnuPG())
  def test_old_keyring(self):
    """The keyring-version file exists, but it's old."""
    with TemporaryDirectory() as tempdir:
      self.wrapper.home_dot_repo = tempdir
      with open(os.path.join(tempdir, 'keyring-version'), 'w') as fp:
        fp.write('1.0\n')
      self.assertTrue(self.wrapper.NeedSetupGnuPG())
  def test_new_keyring(self):
    """The keyring-version file exists, and is up-to-date."""
    with TemporaryDirectory() as tempdir:
      self.wrapper.home_dot_repo = tempdir
      with open(os.path.join(tempdir, 'keyring-version'), 'w') as fp:
        fp.write('1000.0\n')
      self.assertFalse(self.wrapper.NeedSetupGnuPG())
 class SetupGnuPG(RepoWrapperTestCase):
  """Check SetupGnuPG behavior."""
  def test_full(self):
    """Make sure it works completely."""
    with TemporaryDirectory() as tempdir:
      self.wrapper.home_dot_repo = tempdir
      self.wrapper.gpg_dir = os.path.join(self.wrapper.home_dot_repo, 'gnupg')
      self.assertTrue(self.wrapper.SetupGnuPG(True))
      with open(os.path.join(tempdir, 'keyring-version'), 'r') as fp:
        data = fp.read()
      self.assertEqual('.'.join(str(x) for x in self.wrapper.KEYRING_VERSION),
                       data.strip())
 class VerifyRev(RepoWrapperTestCase):
  """Check verify_rev behavior."""
  def test_verify_passes(self):
    """Check when we have a valid signed tag."""
    desc_result = self.wrapper.RunResult(0, 'v1.0\n', '')
    gpg_result = self.wrapper.RunResult(0, '', '')
    with mock.patch.object(self.wrapper, 'run_git',
                           side_effect=(desc_result, gpg_result)):
      ret = self.wrapper.verify_rev('/', 'refs/heads/stable', '1234', True)
      self.assertEqual('v1.0^0', ret)
  def test_unsigned_commit(self):
    """Check we fall back to signed tag when we have an unsigned commit."""
    desc_result = self.wrapper.RunResult(0, 'v1.0-10-g1234\n', '')
    gpg_result = self.wrapper.RunResult(0, '', '')
    with mock.patch.object(self.wrapper, 'run_git',
                           side_effect=(desc_result, gpg_result)):
      ret = self.wrapper.verify_rev('/', 'refs/heads/stable', '1234', True)
      self.assertEqual('v1.0^0', ret)
  def test_verify_fails(self):
    """Check we fall back to signed tag when we have an unsigned commit."""
    desc_result = self.wrapper.RunResult(0, 'v1.0-10-g1234\n', '')
    gpg_result = Exception
    with mock.patch.object(self.wrapper, 'run_git',
                           side_effect=(desc_result, gpg_result)):
      with self.assertRaises(Exception):
        self.wrapper.verify_rev('/', 'refs/heads/stable', '1234', True)
 class GitCheckoutTestCase(RepoWrapperTestCase):
  """Tests that use a real/small git checkout."""
  GIT_DIR = None
  REV_LIST = None
  @classmethod
  def setUpClass(cls):
    # Create a repo to operate on, but do it once per-class.
    cls.GIT_DIR = tempfile.mkdtemp(prefix='repo-rev-tests')
    run_git = wrapper.Wrapper().run_git
    remote = os.path.join(cls.GIT_DIR, 'remote')
    os.mkdir(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)
    run_git('commit', '--allow-empty', '-m2nd commit', cwd=remote)
    cls.REV_LIST = run_git('rev-list', 'HEAD', cwd=remote).stdout.splitlines()
    run_git('init', cwd=cls.GIT_DIR)
    run_git('fetch', remote, '+refs/heads/*:refs/remotes/origin/*', cwd=cls.GIT_DIR)
  @classmethod
  def tearDownClass(cls):
    if not cls.GIT_DIR:
      return
    shutil.rmtree(cls.GIT_DIR)
 class ResolveRepoRev(GitCheckoutTestCase):
  """Check resolve_repo_rev behavior."""
  def test_explicit_branch(self):
    """Check refs/heads/branch argument."""
    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'refs/heads/stable')
    self.assertEqual('refs/heads/stable', rrev)
    self.assertEqual(self.REV_LIST[1], lrev)
    with self.assertRaises(wrapper.CloneFailure):
      self.wrapper.resolve_repo_rev(self.GIT_DIR, 'refs/heads/unknown')
  def test_explicit_tag(self):
    """Check refs/tags/tag argument."""
    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'refs/tags/v1.0')
    self.assertEqual('refs/tags/v1.0', rrev)
    self.assertEqual(self.REV_LIST[1], lrev)
    with self.assertRaises(wrapper.CloneFailure):
      self.wrapper.resolve_repo_rev(self.GIT_DIR, 'refs/tags/unknown')
  def test_branch_name(self):
    """Check branch argument."""
    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'stable')
    self.assertEqual('refs/heads/stable', rrev)
    self.assertEqual(self.REV_LIST[1], lrev)
    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):
    """Check tag argument."""
    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'v1.0')
    self.assertEqual('refs/tags/v1.0', rrev)
    self.assertEqual(self.REV_LIST[1], lrev)
  def test_full_commit(self):
    """Check specific commit argument."""
    commit = self.REV_LIST[0]
    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, commit)
    self.assertEqual(commit, rrev)
    self.assertEqual(commit, lrev)
  def test_partial_commit(self):
    """Check specific (partial) commit argument."""
    commit = self.REV_LIST[0][0:20]
    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, commit)
    self.assertEqual(self.REV_LIST[0], rrev)
    self.assertEqual(self.REV_LIST[0], lrev)
  def test_unknown(self):
    """Check unknown ref/commit argument."""
    with self.assertRaises(wrapper.CloneFailure):
      self.wrapper.resolve_repo_rev(self.GIT_DIR, 'boooooooya')
 class CheckRepoVerify(RepoWrapperTestCase):
  """Check check_repo_verify behavior."""
  def test_no_verify(self):
    """Always fail with --no-repo-verify."""
    self.assertFalse(self.wrapper.check_repo_verify(False))
  def test_gpg_initialized(self):
    """Should pass if gpg is setup already."""
    with mock.patch.object(self.wrapper, 'NeedSetupGnuPG', return_value=False):
      self.assertTrue(self.wrapper.check_repo_verify(True))
  def test_need_gpg_setup(self):
    """Should pass/fail based on gpg setup."""
    with mock.patch.object(self.wrapper, 'NeedSetupGnuPG', return_value=True):
      with mock.patch.object(self.wrapper, 'SetupGnuPG') as m:
        m.return_value = True
        self.assertTrue(self.wrapper.check_repo_verify(True))
        m.return_value = False
        self.assertFalse(self.wrapper.check_repo_verify(True))
 class CheckRepoRev(GitCheckoutTestCase):
  """Check check_repo_rev behavior."""
  def test_verify_works(self):
    """Should pass when verification passes."""
    with mock.patch.object(self.wrapper, 'check_repo_verify', return_value=True):
      with mock.patch.object(self.wrapper, 'verify_rev', return_value='12345'):
        rrev, lrev = self.wrapper.check_repo_rev(self.GIT_DIR, 'stable')
    self.assertEqual('refs/heads/stable', rrev)
    self.assertEqual('12345', lrev)
  def test_verify_fails(self):
    """Should fail when verification fails."""
    with mock.patch.object(self.wrapper, 'check_repo_verify', return_value=True):
      with mock.patch.object(self.wrapper, 'verify_rev', side_effect=Exception):
        with self.assertRaises(Exception):
          self.wrapper.check_repo_rev(self.GIT_DIR, 'stable')
  def test_verify_ignore(self):
    """Should pass when verification is disabled."""
    with mock.patch.object(self.wrapper, 'verify_rev', side_effect=Exception):
      rrev, lrev = self.wrapper.check_repo_rev(self.GIT_DIR, 'stable', repo_verify=False)
    self.assertEqual('refs/heads/stable', rrev)
    self.assertEqual(self.REV_LIST[1], lrev)
 if __name__ == '__main__':
  unittest.main()
--- a/tox.ini
+++ b/tox.ini
@ -0,0 +1,38 @@
 # Copyright 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # https://tox.readthedocs.io/
 [tox]
 envlist = py27, py36, py37, py38
 [gh-actions]
 python =
    2.7: py27
    3.6: py36
    3.7: py37
    3.8: py38
 [testenv]
 deps = pytest
 commands = {envpython} run_tests
 setenv =
    GIT_AUTHOR_NAME = Repo test author
    GIT_COMMITTER_NAME = Repo test committer
    EMAIL = repo@gerrit.nodomain
 [testenv:py27]
 deps =
    mock
    pytest
--- a/wrapper.py
+++ b/wrapper.py
@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# -*- coding:utf-8 -*-
 #
 # Copyright (C) 2014 The Android Open Source Project
 #
@ -15,16 +15,24 @@
 # limitations under the License.
 from __future__ import print_function
-import imp
+try:
  from importlib.machinery import SourceFileLoader
  _loader = lambda *args: SourceFileLoader(*args).load_module()
 except ImportError:
  import imp
  _loader = lambda *args: imp.load_source(*args)
 import os
 def WrapperPath():
  return os.path.join(os.path.dirname(__file__), 'repo')
 _wrapper_module = None
 def Wrapper():
  global _wrapper_module
  if not _wrapper_module:
-    _wrapper_module = imp.load_source('wrapper', WrapperPath())
+    _wrapper_module = _loader('wrapper', WrapperPath())
  return _wrapper_module
		`@ -0,0 +1,2 @@`
							`These are helper tools for managing official releases.`
							`See the [release process](../docs/release-process.md) document for more details.`
		`@ -0,0 +1,2 @@`
							`/.repo_not.present.gitconfig.json`
							`/.repo_test.gitconfig.json`