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

sync: properly handle standalone manifests for `sync` command

2021-10-15T17:20:00+00:00

sync should not attempt to sync the manifest project if it was created from a standalone manifest. The current work around is to run sync with --nmu. BUG=none TEST=manual runs Change-Id: I2e121af0badf9642143e77c7af89d1c2d993b0f3 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/321195 Tested-by: Jack Neus Reviewed-by: Mike Frysinger

subcmds/sync: Use pack-refs instead of gc for redundant gitdirs.

2021-10-14T12:27:12+00:00

Previously `git gc` was being run on every gitdir even when they shared the same objects. Instead only call it once and use pack-refs for the gitdirs that were not gc'ed. Bug: https://crbug.com/gerrit/15113 Test: repo sync -j # and check that git pack-refs is called Change-Id: Icff37ab3ec78cfb44391d8cc7f2d875991532320 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/320275 Tested-by: Allen Webb Reviewed-by: Mike Frysinger

repo: more arg checking for --standalone-manifest re-inits

2021-10-11T18:58:11+00:00

`repo init` doesn't do anything on re-init when the checkout has been initialized using --standalone manifest. Rather than let the tool run through its existing flows (which happen to noop), check the args and explicitly quit if a bare `repo init` is run on a standalone checkout. BUG=none TEST=manual tests Change-Id: Ie4346ef6df1282ec3e3f8045a08138c93653fece Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/320735 Tested-by: Jack Neus Reviewed-by: Mike Frysinger

repo: fix bug with --standalone-manifest

2021-10-11T18:57:57+00:00

We were accidentally always setting manifest.standlone in config, which was messing up behavior for standard use cases. BUG=gerrit:15160 TEST=manual runs Change-Id: Ic80f084ae97de5721aced3bb52d3ea9115f8d833 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/320715 Tested-by: Jack Neus Reviewed-by: Mike Frysinger

sign-launcher: make the help text more automatic

2021-10-06T17:02:56+00:00

Rather than display "3.0" all the time and confuse people, extract the version from the launcher we're signing and display that. Also reformat the text to follow our current practice: upload the versioned launcher by itself first, and then later copy that over the default. And while we're here, add tips for rollbacks. Change-Id: I1654425c88e5c67d78879f2f33ad685c59be14dc Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319637 Reviewed-by: Xin Li Tested-by: Mike Frysinger

subcmds/sync: Disable autoDetach for git gc.

2021-10-05T14:12:01+00:00

gc.autoDetach is enabled by default which makes 'git gc --auto' return immediately and run in background. This can lead to a pile up of operations all using large amounts of memory at the same time. To avoid this set gc.autoDetach to false so that the garbage collect task waits for instances to finish before spawning more. Bug: https://crbug.com/gerrit/15113 Test: repo sync -j # and check the number of 'git gc' processes Change-Id: Ic0815156ba3db03972968f33f6f9f51e4928f23b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319835 Tested-by: Allen Webb Reviewed-by: Mike Frysinger

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