Google Git
Sign in
gerrit / git-repo / b577444a90e29558ff4222c2ed9e43aeaf3d2c44
commitb577444a90e29558ff4222c2ed9e43aeaf3d2c44[log] [tgz]
authorBrian Norris <briannorris@google.com>Tue Sep 17 15:53:37 2024 -0700
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>Thu Sep 19 00:11:52 2024 +0000
tree912b77c53a6c5f5f2128783965ce6fd2ed954881
parent1e19f7dd61923b8835d9c6e1a7e560575dafaf1e [diff]
project: Copy and link files even with local branches

In the winding maze that constitutes Sync_LocalHalf(), there are paths
in which we don't copy-and-link files. Examples include something like:

  cd some/project/
  repo start head .
  # do some work, make some commit, upload that commit to Gerrit

  [[ ... in the meantime, someone addes a <linkfile ...> for
     some/project/ in the manifest ... ]]

  cd some/project/
  git pull --rebase
  repo sync

In this case, we never hit a `repo rebase` case, which might have saved
us. Instead, the developer is left confused why some/project/ never had
its <linkfile>s created.

Notably, this opens up one more corner case in which <linkfile ... /> or
<copyfile ... /> could potentially clobber existing work in the
destination directory, but there are existing cases where that's true,
and frankly, those seem like bigger holes than this new one.

Change-Id: I394b0e4529023a8ee319dc25d03d513a19251a4a
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/437421
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Tested-by: Brian Norris <briannorris@google.com>
Commit-Queue: Brian Norris <briannorris@google.com>
1 file changed
tree: 912b77c53a6c5f5f2128783965ce6fd2ed954881
  1. .github/
  2. docs/
  3. hooks/
  4. man/
  5. release/
  6. subcmds/
  7. tests/
  8. .flake8
  9. .gitattributes
  10. .gitignore
  11. .gitreview
  12. .isort.cfg
  13. .mailmap
  14. .project
  15. .pydevproject
  16. color.py
  17. command.py
  18. completion.bash
  19. constraints.txt
  20. editor.py
  21. error.py
  22. event_log.py
  23. fetch.py
  24. git_command.py
  25. git_config.py
  26. git_refs.py
  27. git_ssh
  28. git_superproject.py
  29. git_trace2_event_log.py
  30. git_trace2_event_log_base.py
  31. hooks.py
  32. LICENSE
  33. main.py
  34. MANIFEST.in
  35. manifest_xml.py
  36. pager.py
  37. platform_utils.py
  38. platform_utils_win32.py
  39. progress.py
  40. project.py
  41. pyproject.toml
  42. README.md
  43. repo
  44. repo_logging.py
  45. repo_trace.py
  46. requirements.json
  47. run_tests
  48. run_tests.vpython3
  49. setup.py
  50. ssh.py
  51. SUBMITTING_PATCHES.md
  52. tox.ini
  53. 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