git cl upload: switch default to --squash |
||||||
Issue descriptionAt least these repos: angle and ffmpeg and cros
,
Jun 10 2016
,
Jun 10 2016
,
Jun 10 2016
doc: https://docs.google.com/a/chromium.org/document/d/1D-AcG3Rc5T4Cfd78dzblgZJUtNSb32426zaPkww93Mw/edit?usp=sharing basic idea: switch default, but let developers who prefer git cl upload --no-squash keep their personal default with: git config --bool gerrit.squash-uploads false or even git config --global --bool gerrit.squash-uploads false
,
Jun 10 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/26f3e4eecb09d2608b1ac304de9d5d3c68de67ce commit 26f3e4eecb09d2608b1ac304de9d5d3c68de67ce Author: tandrii <tandrii@chromium.org> Date: Fri Jun 10 15:37:04 2016 Update message for Gerrit git cl --no-squash users. R=andybons@chromium.org BUG= 611892 Review-Url: https://codereview.chromium.org/2055233002 [modify] https://crrev.com/26f3e4eecb09d2608b1ac304de9d5d3c68de67ce/git_cl.py [modify] https://crrev.com/26f3e4eecb09d2608b1ac304de9d5d3c68de67ce/tests/git_cl_test.py
,
Jun 10 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build.git/+/503ad374d736d23be9e6bb74718106a3bbe68307 commit 503ad374d736d23be9e6bb74718106a3bbe68307 Author: recipe-roller <recipe-roller@chromium.org> Date: Fri Jun 10 15:45:19 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) depot_tools: https://crrev.com/26f3e4eecb09d2608b1ac304de9d5d3c68de67ce Update message for Gerrit git cl --no-squash users. (tandrii@chromium.org) R=andybons@chromium.org,tandrii@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2058803002 [modify] https://crrev.com/503ad374d736d23be9e6bb74718106a3bbe68307/infra/config/recipes.cfg
,
Jun 10 2016
The following revision refers to this bug: https://chromium.googlesource.com/infra/infra.git/+/6bfd0f4a190831e5e67072e1f14872c0ae0b7db0 commit 6bfd0f4a190831e5e67072e1f14872c0ae0b7db0 Author: recipe-roller <recipe-roller@chromium.org> Date: Fri Jun 10 16:05:51 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) build: https://crrev.com/503ad374d736d23be9e6bb74718106a3bbe68307 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) depot_tools: https://crrev.com/26f3e4eecb09d2608b1ac304de9d5d3c68de67ce Update message for Gerrit git cl --no-squash users. (tandrii@chromium.org) R=phajdan.jr@chromium.org,tandrii@chromium.org,andybons@chromium.org,martiniss@chromium.org,recipe-roller@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2058663003 [modify] https://crrev.com/6bfd0f4a190831e5e67072e1f14872c0ae0b7db0/infra/config/recipes.cfg
,
Jun 15 2016
> Also if possible, the user's 'git config' squash setting could override the repo setting (but this wouldn't be desirable if you plan on setting gerrit.squash-uploads unconditionally). TODO: Hm, I thought that's already the case. I'll check, and if not, I'll fix that.
,
Jun 15 2016
,
Jun 15 2016
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/768ec9a75560b5e5903d86654d4c1ab2afe17361 commit 768ec9a75560b5e5903d86654d4c1ab2afe17361 Author: tandrii <tandrii@chromium.org> Date: Thu Jun 16 14:39:10 2016 Gerrit git cl: allow overriding GERRIT_SQUASH_UPLOADS in git config. Previously, if GERRIT_SQUASH_UPLOADS was found in codereview.settings, a local repository value of gerrit.squash-uploads would be set. This CL changes that, so that gerrit.squash-uploads property is written with GERRIT_SQUASH_UPLOADS value ONLY IF the property wasn't set before. This allows individual users to choose their own way with git config [--global] -bool gerrit.squash-uploads (true|false) BUG= 611892 R=andybons@chromium.org,sergiyb@chromium.org Review-Url: https://codereview.chromium.org/2070013002 [modify] https://crrev.com/768ec9a75560b5e5903d86654d4c1ab2afe17361/git_cl.py
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build.git/+/16cb724b7e1582dffa8df9cbd84f0b357a851071 commit 16cb724b7e1582dffa8df9cbd84f0b357a851071 Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 14:45:53 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) depot_tools: https://crrev.com/768ec9a75560b5e5903d86654d4c1ab2afe17361 Gerrit git cl: allow overriding GERRIT_SQUASH_UPLOADS in git config. (tandrii@chromium.org) R=sergiyb@chromium.org,andybons@chromium.org,tandrii@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2071693004 [modify] https://crrev.com/16cb724b7e1582dffa8df9cbd84f0b357a851071/infra/config/recipes.cfg
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/infra/infra.git/+/bc17ea73f6d05a1aa8eb292529a7f62fbc81296e commit bc17ea73f6d05a1aa8eb292529a7f62fbc81296e Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 15:19:36 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) build: https://crrev.com/200a8b341ac525c98dd8033d3205c6baaac95c27 V8: Use default compiler where possible (machenbach@chromium.org) https://crrev.com/16cb724b7e1582dffa8df9cbd84f0b357a851071 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) depot_tools: https://crrev.com/768ec9a75560b5e5903d86654d4c1ab2afe17361 Gerrit git cl: allow overriding GERRIT_SQUASH_UPLOADS in git config. (tandrii@chromium.org) R=tandrii@chromium.org,kjellander@chromium.org,machenbach@chromium.org,andybons@chromium.org,recipe-roller@chromium.org,martiniss@chromium.org,phajdan.jr@chromium.org,sergiyb@chromium.org BUG= 611892 , 616035 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2065383006 [modify] https://crrev.com/bc17ea73f6d05a1aa8eb292529a7f62fbc81296e/infra/config/recipes.cfg
,
Jun 16 2016
Internal thread with Angle team https://groups.google.com/a/google.com/d/msg/angle-team/sSkI-COYQrk/vBYB4UtNAQAJ reached agreement on this. I intend to finally switch on default by end of this week.
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/8dd81ea20b3830a816be88d73e61db2097716548 commit 8dd81ea20b3830a816be88d73e61db2097716548 Author: tandrii <tandrii@chromium.org> Date: Thu Jun 16 20:24:23 2016 Revert of Gerrit git cl: allow overriding GERRIT_SQUASH_UPLOADS in git config. (patchset #2 id:20001 of https://codereview.chromium.org/2070013002/ ) Reason for revert: I suspect this broke squash setting setup. Original issue's description: > Gerrit git cl: allow overriding GERRIT_SQUASH_UPLOADS in git config. > > Previously, if GERRIT_SQUASH_UPLOADS was found in codereview.settings, > a local repository value of gerrit.squash-uploads would be set. > > This CL changes that, so that gerrit.squash-uploads property is written > with GERRIT_SQUASH_UPLOADS value ONLY IF the property wasn't set before. > > This allows individual users to choose their own way with > git config [--global] -bool gerrit.squash-uploads (true|false) > > BUG= 611892 > R=andybons@chromium.org,sergiyb@chromium.org > > Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/768ec9a75560b5e5903d86654d4c1ab2afe17361 TBR=andybons@chromium.org,sergiyb@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= 611892 Review-Url: https://codereview.chromium.org/2071963002 [modify] https://crrev.com/8dd81ea20b3830a816be88d73e61db2097716548/git_cl.py
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build.git/+/5c6d13060169e458a7b81d71ae3279e7380a5045 commit 5c6d13060169e458a7b81d71ae3279e7380a5045 Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 20:36:05 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) depot_tools: https://crrev.com/8dd81ea20b3830a816be88d73e61db2097716548 Revert of Gerrit git cl: allow overriding GERRIT_SQUASH_UPLOADS in git config. (patchset #2 id:20001 of https://codereview.chromium.org/2070013002/ ) (tandrii@chromium.org) R=sergiyb@chromium.org,andybons@chromium.org,tandrii@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2075823002 [modify] https://crrev.com/5c6d13060169e458a7b81d71ae3279e7380a5045/infra/config/recipes.cfg
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/infra/infra.git/+/9f9d5cfbdf0abfb4ee31d4be30470c0eb6c2024e commit 9f9d5cfbdf0abfb4ee31d4be30470c0eb6c2024e Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 21:05:52 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) build: https://crrev.com/b88ae3abc2b3228ea717ac597573ab95442efef2 Write LAST_CHANGE file containing the revision after uploading layout test files (wangxianzhu@chromium.org) https://crrev.com/5c6d13060169e458a7b81d71ae3279e7380a5045 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) depot_tools: https://crrev.com/8dd81ea20b3830a816be88d73e61db2097716548 Revert of Gerrit git cl: allow overriding GERRIT_SQUASH_UPLOADS in git config. (patchset #2 id:20001 of https://codereview.chromium.org/2070013002/ ) (tandrii@chromium.org) R=tandrii@chromium.org,andybons@chromium.org,recipe-roller@chromium.org,wangxianzhu@chromium.org,martiniss@chromium.org,phajdan.jr@chromium.org,sergiyb@chromium.org BUG= 574272 , 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2078633002 [modify] https://crrev.com/9f9d5cfbdf0abfb4ee31d4be30470c0eb6c2024e/infra/config/recipes.cfg
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/edbf9a3e853be0f58240a36d3063e00d9d2d9ad1 commit edbf9a3e853be0f58240a36d3063e00d9d2d9ad1 Author: tandrii <tandrii@chromium.org> Date: Thu Jun 16 22:49:37 2016 Gerrit git cl upload: Remove --no-squash warning message. First, it's wrong because of instruction in it is ineffective. Second, it was also shown during --squash upload, which is completely wrong. TBR=sergiyb@chromium.org BUG= 611892 Review-Url: https://codereview.chromium.org/2072923002 [modify] https://crrev.com/edbf9a3e853be0f58240a36d3063e00d9d2d9ad1/git_cl.py [modify] https://crrev.com/edbf9a3e853be0f58240a36d3063e00d9d2d9ad1/tests/git_cl_test.py
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build.git/+/8abae53fc7c0ebc964d5ce3c88fb6328b30157f2 commit 8abae53fc7c0ebc964d5ce3c88fb6328b30157f2 Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 22:56:04 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) depot_tools: https://crrev.com/edbf9a3e853be0f58240a36d3063e00d9d2d9ad1 Gerrit git cl upload: Remove --no-squash warning message. (tandrii@chromium.org) R=sergiyb@chromium.org,tandrii@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2072873004 [modify] https://crrev.com/8abae53fc7c0ebc964d5ce3c88fb6328b30157f2/infra/config/recipes.cfg
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/infra/infra.git/+/9c1558b4a27d97921201fe0fd3fbdc2cf6b4623d commit 9c1558b4a27d97921201fe0fd3fbdc2cf6b4623d Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 23:16:05 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) build: https://crrev.com/8abae53fc7c0ebc964d5ce3c88fb6328b30157f2 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) depot_tools: https://crrev.com/edbf9a3e853be0f58240a36d3063e00d9d2d9ad1 Gerrit git cl upload: Remove --no-squash warning message. (tandrii@chromium.org) R=phajdan.jr@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,martiniss@chromium.org,recipe-roller@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2077753002 [modify] https://crrev.com/9c1558b4a27d97921201fe0fd3fbdc2cf6b4623d/infra/config/recipes.cfg
,
Jun 16 2016
The following revision refers to this bug: https://chromium.googlesource.com/infra/infra.git/+/4edb0390938ddefa6d24769ec4f87a8e046ee427 commit 4edb0390938ddefa6d24769ec4f87a8e046ee427 Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 23:49:37 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) build: https://crrev.com/8abae53fc7c0ebc964d5ce3c88fb6328b30157f2 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) https://crrev.com/d8716c656c65ddd081f75e953f5daf6b16b69d7c compile.py: Remove unused --build-dir option. (thakis@chromium.org) https://crrev.com/fb254f4fee115ec6e021510579ce386a5c55daf6 compile.py: Remove some unused imports (thakis@chromium.org) depot_tools: https://crrev.com/edbf9a3e853be0f58240a36d3063e00d9d2d9ad1 Gerrit git cl upload: Remove --no-squash warning message. (tandrii@chromium.org) R=tandrii@chromium.org,recipe-roller@chromium.org,thakis@chromium.org,martiniss@chromium.org,phajdan.jr@chromium.org,sergiyb@chromium.org BUG=none,611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2079633002 [modify] https://crrev.com/4edb0390938ddefa6d24769ec4f87a8e046ee427/infra/config/recipes.cfg
,
Jun 17 2016
OK, summary of intended design: (-> means overridable by) 0: default(squash), 1: overridden by GERRIT_SQUASH_UPLOADS per repo 2: overridden by gerrit.override-squash-uploads per user ~/.gitconfig 3: overridden by gerrit.override-squash-uploads per repo's .git/config 2->3 is provided by git itself 1->2 didn't work before, because on load, git cl's Settings set gerrit.squash-upload locally to whatever is in codereview.settings. So, I had to add yet another git config option "gerrit.override-squash-uploads". If it's set, then gerrit.squash-uploads is ignored.
,
Jun 17 2016
The following revision refers to this bug: https://chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave/+/d9bfb13b5b3f73ca5d4e0e16702c338e6f117b91 commit d9bfb13b5b3f73ca5d4e0e16702c338e6f117b91 Author: recipe-roller <recipe-roller@chromium.org> Date: Fri Jun 10 15:48:47 2016
,
Jun 17 2016
The following revision refers to this bug: https://chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave/+/0769265641b3b252d191a8315b390b1d3dedb221 commit 0769265641b3b252d191a8315b390b1d3dedb221 Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 14:49:02 2016
,
Jun 17 2016
The following revision refers to this bug: https://chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave/+/8f32e8ebbf00a622c2c1eaed6aead7dfc8954bc7 commit 8f32e8ebbf00a622c2c1eaed6aead7dfc8954bc7 Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 20:38:38 2016
,
Jun 17 2016
The following revision refers to this bug: https://chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave/+/bbfb739833b5199c88a5e25f56953bad7c2381f9 commit bbfb739833b5199c88a5e25f56953bad7c2381f9 Author: recipe-roller <recipe-roller@chromium.org> Date: Thu Jun 16 22:58:32 2016
,
Jun 17 2016
Angle has switched to specifying default in their repository: https://chromium-review.googlesource.com/#/c/353039/ And final Cl that will enable squash by default https://codereview.chromium.org/2072363002, which I'll land next week.
,
Jun 20 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/a60502f2d3d74e70ffc77b2e54353a7dd0d31774 commit a60502f2d3d74e70ffc77b2e54353a7dd0d31774 Author: tandrii <tandrii@chromium.org> Date: Mon Jun 20 09:01:53 2016 Gerrit git cl upload: --squash is now default. You can override it for all devs of repo by adding line to codereview.settings: GERRIT_SQUASH_UPLOADS: (True|False) And even with that, individual devs can overide it for themselves with: git config [--global] --bool gerrit.override-squash-uploads (true|false) BUG= 611892 Review-Url: https://codereview.chromium.org/2072363002 [modify] https://crrev.com/a60502f2d3d74e70ffc77b2e54353a7dd0d31774/git_cl.py [modify] https://crrev.com/a60502f2d3d74e70ffc77b2e54353a7dd0d31774/tests/git_cl_test.py
,
Jun 20 2016
The following revision refers to this bug: https://chromium.googlesource.com/chromium/tools/build.git/+/dc71ba3f5a4afad14c8e6dc9db11ff20922e7f98 commit dc71ba3f5a4afad14c8e6dc9db11ff20922e7f98 Author: recipe-roller <recipe-roller@chromium.org> Date: Mon Jun 20 09:05:56 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) depot_tools: https://crrev.com/a60502f2d3d74e70ffc77b2e54353a7dd0d31774 Gerrit git cl upload: --squash is now default. (tandrii@chromium.org) R=tandrii@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2074413002 [modify] https://crrev.com/dc71ba3f5a4afad14c8e6dc9db11ff20922e7f98/infra/config/recipes.cfg
,
Jun 20 2016
The following revision refers to this bug: https://chrome-internal.googlesource.com/chrome/tools/build_limited/scripts/slave/+/7994249edb28dbd5f62e6ac1c3562aa0a3f2b622 commit 7994249edb28dbd5f62e6ac1c3562aa0a3f2b622 Author: recipe-roller <recipe-roller@chromium.org> Date: Mon Jun 20 09:08:15 2016
,
Jun 20 2016
,
Jun 20 2016
The following revision refers to this bug: https://chromium.googlesource.com/infra/infra.git/+/e92eeebec759bee3d7d5a44487ccf1f2a45dbb42 commit e92eeebec759bee3d7d5a44487ccf1f2a45dbb42 Author: recipe-roller <recipe-roller@chromium.org> Date: Mon Jun 20 09:26:00 2016 Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) build: https://crrev.com/dc71ba3f5a4afad14c8e6dc9db11ff20922e7f98 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) depot_tools: https://crrev.com/a60502f2d3d74e70ffc77b2e54353a7dd0d31774 Gerrit git cl upload: --squash is now default. (tandrii@chromium.org) R=phajdan.jr@chromium.org,tandrii@chromium.org,martiniss@chromium.org,recipe-roller@chromium.org BUG= 611892 TBR=martiniss@chromium.org,phajdan.jr@chromium.org Review-Url: https://codereview.chromium.org/2078383002 [modify] https://crrev.com/e92eeebec759bee3d7d5a44487ccf1f2a45dbb42/infra/config/recipes.cfg |
||||||
►
Sign in to add a comment |
||||||
Comment 1 by tandrii@chromium.org
, May 13 2016