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

git_config: Fixed test.gitconfig getting updated when running tests.

2021-09-30T21:45:09+00:00

Moved test_GetSyncAnalysisStateData to GitConfigReadWriteTests class. Deleted [repo "syncstate*..] data from tests/fixtures/test.gitconfig. Tested: ./run_tests ... tests/test_git_config.py::GitConfigReadWriteTests::test_GetSyncAnalysisStateData PASSED [ 84%] ... Bug: https://crbug.com/gerrit/15103 Change-Id: I8cb89ce10b025994a045106c9c66dd243ae8ba50 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319557 Tested-by: Raman Tenneti Reviewed-by: Mike Frysinger

Merge "Merge history of v2.14.5." into main

2021-09-30T21:37:09+00:00

Merge history of v2.14.5.

2021-09-30T21:36:56+00:00

The v2.14.[345] releases were cut on a branch based on v2.14.2. We had some regression fixes we wanted in v2.14, but too many risky changes landed in main since to cut another v2.14.x directly, and we didn't want to destabilize even more by pushing a v2.15 right away. So we branched to keep things healthy. But people with old checkouts trying to upgrade from those versions run into an old repo bug where it only selfupdates with fast-forwards, and repo can't fast-forward from those divergent histories. So let's do a merge commit to stitch the history back together. There's no actual changes in here. Change-Id: I05a96048e3846321e57c5f5224fb8dcf3c191d35

Merge history of v1.13.11.

2021-09-30T18:49:08+00:00

For older versions of repo, this would make it easier for it to perform a self update by making it a fast-forward from the following tags: v1.13.9.2, v1.13.9.3, v1.13.9.4, v1.13.10, v1.13.11 Change-Id: Ia75776312eaf802a150db8bd7c0a6dce57914580

trace2_event: Add remove_prefix to fix failing tests on Linux & macOS.

2021-09-29T21:24:59+00:00

removeprefix is available i python 3.9. Mac and Linux are running in a version below 3.9. Thus tests are failing with the following error: "AttributeError: 'str' object has no attribute 'removeprefix' " Replaced the removeprefix with custom function which we will delete once Linux and macOS versions are updated. Tested: $ ./run_tests Bug: [google internal] b/201453085 Change-Id: I9b4d564ff1176e1b4471805ef05472c1914cd9f9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319375 Tested-by: Raman Tenneti Reviewed-by: Mike Frysinger

git_config: update error handling with no config file

2021-09-29T01:02:47+00:00

Now that _do throws an exception when `git` fails, update the logic that tries to read config files but the file doesn't exist. Bug: b/192664812 Change-Id: I6417ecd70891b8f2d5f2bdb819f91df69ac4b70c Test: `repo upload` no longer crashes when .repo/config doesn't exist Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319295 Reviewed-by: Jack Neus Tested-by: Mike Frysinger

launcher: bump version for new release

2021-09-28T20:54:56+00:00

Change-Id: I9812185c9dfc11289547f5956c0cbe567d720f7f Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319335 Reviewed-by: Xin Li Tested-by: Mike Frysinger

Update revisionId if required when using extend-project

2021-09-28T20:12:00+00:00

When a hard revision ID is provided in a regular project tag then the revisionId is updated as well if it is a commit hash. The difference is that if the revisionExpr is a commit, git-repo needs to update refs/remotes/m/master with update-ref not symbolic-ref, as the latter must refer to another ref, not to a specific commit. Change-Id: I215a62dabb30225e480ad2c731416d775fc0c750 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/310963 Tested-by: Michael Kelly Reviewed-by: Mike Frysinger

Add 'dest-path' to extend-project to support changing path

2021-09-28T20:12:00+00:00

This allows us to move the repository to a new location in the source tree without having to remove-project + add a new project tag. Change-Id: I4dba6151842e57f6f2b8fe60cda260ecea68b7b4 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/310962 Reviewed-by: Mike Frysinger Tested-by: Michael Kelly

superproject: Only trigger enrollment logic when manifest have it.

2021-09-28T19:42:01+00:00

The current code would check for enrollment status when the user did not explicitly specify --[no-]use-superproject and do not have a remembered value in their repo client. However, because superproject only makes sense for manifests that have one specified, we should skip the enrollment logic in that case. Address this by checking manifest.superproject prior to proceeding. This would avoid showing the greeting message of superproject enrollment which can be confusing for developers. Tested: For manifest without superproject: - repo sync --use-superproject will still show message for superproject; - repo sync will not show message regardless of enrollment state For manifest with superproject: - repo sync will show message and perform enrollment if not previously enrolled Bug: https://crbug.com/gerrit/15039 Change-Id: Ic2be9f9d037f0e7cf3446da474a5a0d0e4bd88da Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319255 Tested-by: Xin Li Reviewed-by: Raman Tenneti Reviewed-by: Mike Frysinger