sync: tell apart same-path submanifest projects

Interleaved sync remembers which projects are done and which ones are
still pending by Project.relpath, and lists failing projects by it as
well. That path is relative to the project's own (sub)manifest though,
so once several manifests are synced together two projects can share
it, and the sets no longer tell them apart.

The damage is done when a project turns up in a later pass, e.g. a
submodule that is only derived once its parent has been synced: its
path is already recorded as finished, so it is left out of every pass
that follows and never synced, while sync still reports success. With
an outer manifest holding

  <project name="a" path="a" sync-s="true"/>

where a carries a submodule at b, and a submanifest at sub/ holding

  <project name="sub-ab" path="a/b"/>

a fresh `repo sync` checks out sub/a/b but never a/b. Failing projects
are reported under the same ambiguous path, and the stall detection
merges them too.

Use RelPath(local=opt.this_manifest_only) instead, which is unique
within the set of projects being synced and is what GetProjects() and
the other subcommands already use.

Spotted during the review of I30395b8a16a9154f60972e1f408a066af64ba77c.

Change-Id: I5fa694b968774667be6060d9722cb57acbd2b579
Signed-off-by: kimhappy <hwanhee.kim@laplacian.cc>
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/622641
Reviewed-by: Gavin Mak <gavinmak@google.com>
Reviewed-by: Brian Gan <brgan@google.com>
2 files changed
tree: 076fd007d8833d48ffcd5541d9fcd3270c355656
  1. .github/
  2. agents/
  3. docs/
  4. hooks/
  5. man/
  6. release/
  7. subcmds/
  8. tests/
  9. .flake8
  10. .gitattributes
  11. .gitignore
  12. .gitreview
  13. .mailmap
  14. .project
  15. .pydevproject
  16. cipd_manifest.txt
  17. cipd_manifest.versions
  18. color.py
  19. command.py
  20. completion.bash
  21. completion.zsh
  22. constraints.txt
  23. CONTRIBUTING.md
  24. editor.py
  25. error.py
  26. event_log.py
  27. fetch.py
  28. git_command.py
  29. git_config.py
  30. git_refs.py
  31. git_ssh
  32. git_superproject.py
  33. git_trace2_event_log.py
  34. git_trace2_event_log_base.py
  35. hooks.py
  36. LICENSE
  37. main.py
  38. MANIFEST.in
  39. manifest_xml.py
  40. pager.py
  41. platform_utils.py
  42. platform_utils_win32.py
  43. progress.py
  44. project.py
  45. pyproject.toml
  46. README.md
  47. repo
  48. repo_logging.py
  49. repo_trace.py
  50. requirements.json
  51. run_tests
  52. run_tests.vpython3
  53. run_tests.vpython3.8
  54. setup.py
  55. ssh.py
  56. wrapper.py
README.md

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.

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:

  1. Copy or symlink completion.zsh to a file named _repo in 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/_repo
    

    Then add that directory to your fpath in ~/.zshrc before compinit:

    fpath=(~/.zsh/completion $fpath)
    autoload -Uz compinit
    compinit
    
  2. Or source the file directly and call compdef in your ~/.zshrc:

    source /path/to/git-repo/completion.zsh
    compdef _repo repo