tools/git-repo.git, branch maint

Revert "Save cookies back to jar when fetching clone.bundle"

2020-02-12T02:03:35+00:00

This reverts commit 4abf8e6ef81e78469148b156ae2d2da70ace627a. The curl process for updating the cookie file is not atomic. When fetching many bundles in parallel, we can sometimes corrupt the file causing it to be cleared. Since users should manage gitcookies on their own, leave it read-only. Bug: https://crbug.com/gerrit/12300 Change-Id: Id472c99b197bc4cf8533c649f8881509f38643c1 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254092 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger (cherry picked from commit dc1d0e0c7fffa5109048ac52a67aa97bb362ae3a)

repo: bump launcher version

2020-02-12T00:12:14+00:00

This way we can push out the updated stable branch change. Change-Id: I72d5dab4523a10dfeb6529796892096aa80eba3c Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254492 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger

project: fix bytes/str encoding when updating git submodules

2020-02-11T19:46:13+00:00

Since tempfile.mkstemp() returns a file handle in binary mode, make sure we turn our strings into bytes before writing. Bug: https://crbug.com/gerrit/12043 Change-Id: I3e84d595e84b8bc12a1fbc7fd0bb3ea0ba2832b0 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254393 Reviewed-by: Michael Mortensen Reviewed-by: Mike Frysinger Tested-by: Mike Frysinger (cherry picked from commit 163d42eb43ba79677aae22fa859896010badba9b)

repo: allow REPO_REV to be an env var

2020-02-11T19:44:29+00:00

We do this for REPO_URL already. Bug: https://crbug.com/gerrit/10233 Change-Id: I53410645474b00d900467c96fa5d8446f3a607d3 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253552 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger (cherry picked from commit 563f1a651298eaa3616f92c3cd7b264fe5442379)

Fixing forall subcommand for Py3

2020-02-11T04:31:45+00:00

Execution of 'repo forall -p -c' doesn't work with Py3 and ends up with an error: Got an error, terminating the pool: TypeError: can only concatenate str (not "bytes") to str That's fixed by using the decode() method. Change-Id: Ice01aaa1822dde8d957b5bf096021dd5a2b7dd51 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253659 Reviewed-by: Mike Frysinger Reviewed-by: David Pursehouse Tested-by: Jiri Tyr (cherry picked from commit 83a3227b62c936b346b825b333fc2ca65528ecfd)

remove spurious +x bits

2020-02-11T04:31:03+00:00

These files are not directly executable, so drop the +x bits. Change-Id: Iaf19a03a497686cc21103e7ddf08073173440dd1 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254076 Tested-by: Mike Frysinger Reviewed-by: David Pursehouse (cherry picked from commit e7c91889a6ff23931d3fbc25481b276e50ed8229)

find python via env

2020-02-11T04:30:58+00:00

This allows these scripts to run through the active version of the virtualenv python when invoked via tox. Change-Id: Ib52f475b7b20c34d62cfd179a1341da1a08a8b5c Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253974 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger (cherry picked from commit 1b117db767804856a310210c012fdd40addae66a)

git_config: fix encoding handling in GetUrlCookieFile

2020-02-11T04:28:40+00:00

Make sure we decode the bytes coming from the subprocess.Popen as we're treating them as strings. Change-Id: I44100ca5cd94f68a35d489936292eb641006edbe Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253973 Reviewed-by: Jonathan Nieder Tested-by: Mike Frysinger (cherry picked from commit ded477dbb9c6993cbe8b93b10654682b04fdeea8)

Fix inverted logic around [gitc-]init and -c

2020-02-07T20:54:52+00:00

Instead of not using '-c' for '--current-branch' when using gitc, we were only using '-c' when using gitc, so we still had the conflict with the gitc option, and other users still couldn't use '-c'. Test: repo init -u https://android.googlesource.com/platform/manifest; repo init -c Test: repo gitc-init -u ... -b ... -c testing Change-Id: I71e4950a49c281418249f0783c6a2ea34f0d3e2b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253795 Reviewed-by: Mike Frysinger Tested-by: Dan Willemsen (cherry picked from commit 93293ca47f3a898b30eecf21e7b4e1038780c867)

Do not try to fetch default revision for mirrors always

2020-02-06T14:19:35+00:00

* Mirrors may contain multiple projects, some of which may not always contain the default revision. * Only fetch the default revision explicitly if '--current-branch' is set. * Fixes breakage casued by commit 6856f98467aa5c98085cdee02587dbab984cebb1 "Fix repo mirror with --current-branch" Bug: https://crbug.com/gerrit/12274 Change-Id: Iaafabe2992f76f3644b841f24245d3e19c9515a9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253093 Reviewed-by: Kuang-che Wu Reviewed-by: Mike Frysinger Tested-by: Chirayu Desai (cherry picked from commit f7b64e3350a622ee87e1927cdbc8d854a5696d85)