tools/git-repo.git, branch v2.43

sync: introduce --force-checkout

2024-03-07T17:21:51+00:00

In some cases (e.g. in a CI system), it's desirable to be able to instruct repo to force checkout. This flag passes --force flag to `git checkout` operations. Bug: b/327624021 Change-Id: I579edda546fb8147c4e1a267e2605fcf6e597421 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/411518 Commit-Queue: Josip Sokcevic Reviewed-by: Gavin Mak Reviewed-by: George Engelbrecht Tested-by: Josip Sokcevic

upload: Add support for setting patchset description

2024-03-04T18:50:24+00:00

Bug: 308467447 Change-Id: I7abcbc98131b826120fc9ab85d5b889f90db4b0a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/355968 Tested-by: Sergiy Belozorov Reviewed-by: Mike Frysinger Commit-Queue: Sergiy Belozorov

sync: Introduce git checkout levels

2024-02-27T17:28:33+00:00

If a repo manifest is updated so that project B is placed within a project A, and if project A had content in new B's location in the old checkout, then repo sync could break depending on checkout order, since B can't be checked out before A. This change introduces checkout levels which enforces right sequence of checkouts while still allowing for parallel checkout. In an example above, A will always be checked out first before B. BUG=b:325119758 TEST=./run_tests, manual sync on ChromeOS repository Change-Id: Ib3b5e4d2639ca56620a1e4c6bf76d7b1ab805250 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/410421 Tested-by: Josip Sokcevic Reviewed-by: Greg Edelston Commit-Queue: Josip Sokcevic Reviewed-by: Gavin Mak

git_command: Return None from GetEventTargetPath() if set to empty string

2024-02-26T17:51:11+00:00

If trace2.eventTarget was set to the empty string, match git behavior and don't write a trace. Bug: 319673783 Change-Id: I02b3884ad97551f8a9d7363c2cbe6b0adee6f73e Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/410518 Reviewed-by: Josip Sokcevic Commit-Queue: Josip Sokcevic Tested-by: Peter Collingbourne

trace: Save trace2 sid in REPO_TRACE file

2024-02-22T20:55:09+00:00

git-trace2 events contain additional information what git is doing under the hood, and repo doesn't have visibility into. Instead of relying on timestamp information to match REPO_TRACE with git-trace2 events, add SID information into REPO_TRACE. Change-Id: I37672a3face81858072c7a3ce34ca3379199dab5 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/410280 Tested-by: Josip Sokcevic Reviewed-by: Gavin Mak Commit-Queue: Josip Sokcevic

subcmds: sync: Remove deprecated _AUTO_GC

2024-02-20T19:55:15+00:00

Opportunistic cleanup. It looks like this deprecated feature was slated for deletion nearly a year ago. Bug: None Test: ./run_tests Change-Id: I0bd0c0e6acbd1eaee1c0b4945c79038257d22f44 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/410198 Reviewed-by: Yiwei Zhang Commit-Queue: Greg Edelston Tested-by: Greg Edelston

launcher: Set shebang to python3

2024-02-07T20:44:32+00:00

Some (most?) Linux repos don't have /usr/bin/python, unless python-is-python3 is installed. While package owners can adjust shebang, we have seen an increase in number of bugs filed as extra steps are required. Per PEP-0394, python3 is acceptable and should be available if python3 is supported. We no longer support python2, and repo no longer works with python2, so this change makes that explicit. Bug: 40014585 Change-Id: I9aed90fd470ef601bd33bd596af3df69da69ef5d Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/407497 Commit-Queue: Josip Sokcevic Reviewed-by: Jason Chang Reviewed-by: Gavin Mak Reviewed-by: Максим Паймушкин Tested-by: Josip Sokcevic

sync: ensure RepoChangedException propagated

2024-02-06T18:46:19+00:00

Prior to this change RepoChangedException would be caught and re-rasied as a different exception. This would prevent RepoChangedException handler from running in main.py Bug: b/323232806 Change-Id: I9055ff95d439d6ff225206c5bf1755cc718bcfcc Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/407144 Tested-by: Josip Sokcevic Reviewed-by: Josip Sokcevic Commit-Queue: Josip Sokcevic

stop passing project to UpdateManifestError

2024-02-02T18:35:13+00:00

UpdateManifestError inherits from RepoExitError which inherits from BaseRepoError. None of them takes project as kwargs causing the error like "UpdateManifestError() takes no keyword arguments" in b/317183321 [1]: https://gerrit.googlesource.com/git-repo/+/449b23b698d7d4b13909667a49a0698eb495eeaa/error.py#144 Bug: b/317183321 Change-Id: I64c3dc502027f9dda56a0824f2712364b4502934 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/398997 Commit-Queue: Yiwei Zhang Tested-by: Yiwei Zhang Reviewed-by: Josip Sokcevic Reviewed-by: Jason Chang

project: Rename if deletion fails

2024-01-25T21:32:58+00:00

If a project contains files not owned by the current user, remove will fail. In order to ensure repo sync continues to work, rename the affected project instead, and let user know about it. Bug: 321273512 Change-Id: I0779d61fc67042308a0226adea7d98167252a5d3 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/404372 Reviewed-by: Mike Frysinger Tested-by: Josip Sokcevic Commit-Queue: Josip Sokcevic