project: fix sync of shallow projects sharing objdir

Repo sync fails when the following conditions are met:

* There are several checkouts of the same project
  in different paths.
* The checkouts are using git hashes as revisions
  (not branches).
* There is a clone-depth set on these projects.
* sync-c="true" is set in the manifest.
* The revision specified in the manifest
  has moved forward since the first repo init.

The sync fails because only the first gitdir gets the "shallow" file,
and subsequent dirs can't be synced.

Do not optimize away the fetch when the conditions above happen.

Simplified the boolean check in Sync_NetworkHalf and _RemoteFetch
using has_shallow, renamed loop variable to avoid shadowing.

Test: create a manifest matching conditions above, repo init,
forward the hash, and repo sync.
Test: added tests in test_project.py
Bug: 505072873
Originally-by: Elvira Khabirova <elvira.khabirova@volvocars.com>

Change-Id: I37c533c382e34fc5ddab489c5593b9e5d3875be2
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/601441
Tested-by: Sainath Varanasi <varanasisai@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Sainath Varanasi <varanasisai@google.com>
2 files changed
tree: 86dae645176976811c024fcb2e2a4e5422b3fdf0
  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