Google Git
Sign in
gerrit / git-repo / 46790229fcdb041c414a27035b72cbc0d2e78af6
commit46790229fcdb041c414a27035b72cbc0d2e78af6[log] [tgz]
authorJosip Sokcevic <sokcevic@chromium.org>Thu Mar 07 22:18:58 2024 +0000
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>Fri Mar 08 17:58:24 2024 +0000
tree67dd6b331edd153680e856b8859d99c634a4995d
parentedadb25c0270398e9afa3eb0093d6b94aa51c3f4 [diff]
sync: Fix sorting for nested projects

The current logic to create checkout layers doesn't work in all cases.
For example, let's assume there are three projects: "foo", "foo/bar" and
"foo-bar". Sorting lexicographical order is incorrect as foo-bar would
be placed between foo and foo/bar, breaking layering logic.

Instead, we split filepaths based using path delimiter (always /) and
then use lexicographical sort.

BUG=b:325119758
TEST=./run_tests, manual sync on chromiumos repository

Change-Id: I76924c3cc6ba2bb860d7a3e48406a6bba8f58c10
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/412338
Tested-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: George Engelbrecht <engeg@google.com>
2 files changed
tree: 67dd6b331edd153680e856b8859d99c634a4995d
  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. editor.py
  20. error.py
  21. event_log.py
  22. fetch.py
  23. git_command.py
  24. git_config.py
  25. git_refs.py
  26. git_ssh
  27. git_superproject.py
  28. git_trace2_event_log.py
  29. git_trace2_event_log_base.py
  30. hooks.py
  31. LICENSE
  32. main.py
  33. MANIFEST.in
  34. manifest_xml.py
  35. pager.py
  36. platform_utils.py
  37. platform_utils_win32.py
  38. progress.py
  39. project.py
  40. pyproject.toml
  41. README.md
  42. repo
  43. repo_logging.py
  44. repo_trace.py
  45. requirements.json
  46. run_tests
  47. run_tests.vpython3
  48. setup.py
  49. ssh.py
  50. SUBMITTING_PATCHES.md
  51. tox.ini
  52. 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