mirror of
https://gerrit.googlesource.com/git-repo
synced 2026-11-14 16:27:13 +00:00
Brian Gan
1e88f21cb1
In `_SyncInterleaved`, `_UpdateManifestLists` only ran after fetching and checking out all projects. When a manifest replaced a parent project `foo` with a nested child project `foo/bar`, `foo/bar` was checked out inside the still-existing obsolete `foo` worktree before `UpdateProjectList` deleted `foo`. Because `bar/` was tracked by `foo`, `git status` in `foo` saw `foo/bar`'s newly checked-out files as modified and untracked files belonging to `foo`, causing `DeleteWorktree` to fail with `DeleteDirtyWorktreeError` (and similarly, when `foo/bar` was merged back into `foo`, `foo`'s checkout collided with the not-yet-deleted `foo/bar` worktree): error: foo: Cannot remove project: uncommitted changes are present. error: Unable to fully sync the tree error: Updating local project lists failed. Split `_UpdateManifestLists` into `_UpdateProjectLists` and `_UpdateCopyLinkfileLists`, and run `_UpdateProjectLists` before the sync loop in `_SyncInterleaved` so obsolete manifest projects are deleted before new project checkouts begin (and `--fail-fast` aborts before fetching if an obsolete project cannot be removed). Run `_UpdateProjectLists` again after the sync loop (passing the set of paths that already failed removal pre-sync so they are not retried or reported twice) together with `_UpdateCopyLinkfileLists` so derived submodules discovered or dropped when `_ReloadManifest` runs during the loop are updated in `project.list` and copyfiles/linkfiles are updated. Because the pre-sync `_UpdateProjectLists` pass in `_SyncInterleaved` runs before projects are fetched (unlike `_SyncPhased`, which runs it after `_FetchMain`), a `sync-s="true"` parent project whose manifest revision moved to an unfetched commit cannot derive its submodules yet (`GetSubmoduleRevisions() is None`). Retain existing submodule checkouts under such parents until a post-fetch pass can determine whether their submodules were removed. Also continue past individual `DeleteWorktreeError` failures in `UpdateProjectList` (skipping obsolete ancestors of any retained child worktree) so remaining clean obsolete projects are still removed while failed paths stay tracked in `project.list`, and skip project list and copy/linkfile updates when `--network-only` is set so `-n` does not mutate local worktrees. Bug: 574048485 Test: vpython3 run_tests Change-Id: I530337977f063173a9a8a48df3250627cd4bc57f Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/656283 Commit-Queue: Brian Gan <brgan@google.com> Reviewed-by: Gavin Mak <gavinmak@google.com> Tested-by: Brian Gan <brgan@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