Brian Gan
33aaf275be
If the manifest checkout in `.repo/manifests` is on a detached HEAD, or on a local branch without an upstream, `Sync._GetBranch` read a missing `merge` config and crashed with `'NoneType' object has no attribute 'startswith'`. When smart sync is enabled by default, this broke plain `repo sync` for such checkouts because `AttributeError` bypassed the fallback to a regular ToT sync in `_ExecuteHelper`, which only catches `SmartSyncError` and `ManifestParseError`. Pinning the manifest via `repo init -b <sha>` or `repo init -b refs/tags/<tag>` also sent the raw revision to the manifest server as a branch name. Add `ManifestProject.GetMergeBranch(heads_only=...)` (shared with `XmlManifest._Load`) to resolve the upstream ref of the current manifest branch, returning `None` under `heads_only=True` unless it tracks `refs/heads/*`, and raise `SmartSyncError` in `_SmartSyncSetup` before running the remote helper or contacting the manifest server. Implicit smart sync now falls back to a regular ToT sync, and explicit smart sync fails early with an actionable error message. Bug: 580004259 Test: vpython3 run_tests Change-Id: Ice1f9bfe7ea8c923a283bcbd0ac7576cf33e42f6 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/655123 Tested-by: Brian Gan <brgan@google.com> Commit-Queue: Brian Gan <brgan@google.com> Reviewed-by: Gavin Mak <gavinmak@google.com>
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
- Bug reports: https://issues.gerritcodereview.com/issues?q=is:open%20componentid:1370071
- 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
- repo Hooks
- Contributing
- Running Repo in Microsoft Windows
- 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 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.
# 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.
$ mkdir -p ~/.bin
$ PATH="${HOME}/.bin:${PATH}"
$ curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
$ chmod a+rx ~/.bin/repo
Shell Completion
Repo includes completion scripts for Bash and Zsh.
Bash
To enable completion in Bash, source completion.bash in your ~/.bashrc:
source /path/to/git-repo/completion.bash
Zsh
To enable completion in Zsh, you can either:
-
Copy or symlink
completion.zshto a file named_repoin a directory in your$fpath:mkdir -p ~/.zsh/completion # You can copy the file: cp /path/to/git-repo/completion.zsh ~/.zsh/completion/_repo # Or symlink it: ln -s /path/to/git-repo/completion.zsh ~/.zsh/completion/_repoThen add that directory to your
fpathin~/.zshrcbeforecompinit:fpath=(~/.zsh/completion $fpath) autoload -Uz compinit compinit -
Or source the file directly and call
compdefin your~/.zshrc:source /path/to/git-repo/completion.zsh compdef _repo repo