Commit Graph

13 Commits

Author SHA1 Message Date
Anton Hansson
2f51277ebf Improve how "likely an AOSP change" is detected
git branch -vv can be incredibly slow (over 5s on my machine/repo), so
when aosp_sha.sh is called multiple times per commit, the repo upload
hook can take a very long time to run (>2 mins for my stack of changes).

The only output used from git branch -vv was the upstream of the current
branch, which can be determined in a much faster/simpler way via
printing the ref name of @{u} (git lingo for the upstream HEAD).

Test: $ { aosp_sha.sh HEAD && echo ok || echo no } in aosp and internal
Change-Id: I993496d8ec9e55c13803590bbb6c5d9d49cde158
2022-01-13 17:30:18 +00:00
Vince Harron
b3a17c77be BSD grep doesn't support -P
Test: New grep command tested on Linux and macOS
Bug: b/206150971
Change-Id: I9f1684298672fee1561166a03392bd07be8c5cd6
2021-11-17 22:32:57 +00:00
Treehugger Robot
542c95130e Merge "Mention the tag to use to bypass the AOSP-first check." am: 7c25a55f5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814778

Change-Id: Iaa9997aafcf6058e83a3d9286ec2bd2015d2efbe
2021-08-31 19:03:39 +00:00
Martin Stjernholm
f1ca127e8a Mention the tag to use to bypass the AOSP-first check.
Test: `repo upload` with a CL in system/unwinding in an internal branch
Change-Id: Ice32cbfbd12737771e5e7abcb590ed4d6b6da9b8
2021-08-31 16:52:15 +01:00
Seth Moore
31c1300fe1 Merge "Check for Ignore-AOSP-First commit tag" into sc-dev am: a63e111574
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703967

Change-Id: If7120daa47a8fd6d3b01afa2d7bae9826bf3b1ea
2021-05-26 16:27:41 +00:00
Seth Moore
f3d78421ba Check for Ignore-AOSP-First commit tag
If the Ignore-AOSP-First tag is in a commit message, it means the
committer is intentionally bypassing the AOSP source of truth. Check
for this tag in the AOSP-first presubmit hook so that devs don't have
to turn off hooks to get past the AOSP-first policy in exceptional
cases.

Bug: 189139990
Change-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Merged-In: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Test: Manual testing with various commit messages
2021-05-26 09:17:27 -07:00
Seth Moore
627b9ca3b7 Check for Ignore-AOSP-First commit tag
If the Ignore-AOSP-First tag is in a commit message, it means the
committer is intentionally bypassing the AOSP source of truth. Check
for this tag in the AOSP-first presubmit hook so that devs don't have
to turn off hooks to get past the AOSP-first policy in exceptional
cases.

Bug: 189139990
Change-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Test: Manual testing with various commit messages
2021-05-24 14:15:36 -07:00
Christopher Ferris
d1172f3b04 Merge "Add a cherry-pick exception." am: 9510033467 am: 6733d0ef8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1711190

Change-Id: I81ac1a60ab33b059488109f1aa7efada363bb3ff
2021-05-18 23:36:45 +00:00
Christopher Ferris
9fbe8a8279 Add a cherry-pick exception.
If someone is trying to cherry-pick back to aosp, don't force them
to use --no-verify, allow it.

Right now, the only form of cherry-pick allowed is:

  cherry picked from

Test: Ran on a commit with the message and without and observed that
Test: with the cherry pick message, no error, without, error message.
Change-Id: I27581f782cdc1a1c4fa207a3aae392c0d434eb5a
2021-05-18 13:49:08 -07:00
Alan Stokes
293096a0cb Use red-on-white rather than red-on-black.
Relying purely on color change is unfriendly to those of us that are
color blind; red on black is a particularly challenging
combination. (Even worse when working from home, since video
compression can lead to washed out colors.)

Changing from light on dark to dark on light should make it fairly
obvious even to those with monochrome vision.

Test: Manual
Change-Id: I79013686038cb4ebea6087b53cece3266bf6ec0b
2020-07-28 18:19:20 +01:00
Jeff Sharkey
aaaf1b7a88 People don't read warnings.
Bug: 113136846
Test: manual
Change-Id: If7e313b4f0fa90875795b24817553bbd9a8c60ff
2018-12-03 10:58:42 -07:00
Jeff Sharkey
5b471996eb Tweaks to AOSP upload hook logic.
Lists all matching files, and slightly more robust path handling.

Bug: 113136846
Test: manual
Change-Id: Ic1971a3df97b8b137993b5856b47d0d706a996cd
2018-09-11 12:14:48 -06:00
Jeff Sharkey
0a9c731969 Upload hook that guides people towards AOSP.
The canonical location of certain parts of the source tree live in
AOSP, and should not be changed internally to avoid merge conflicts.

This initially starts with "OWNERS" files, but the hook can easily
be repeated to match any files based on file path regexes.

Bug: 113136846
Test: manual
Change-Id: I113e63b6133f20389d84ec0d6d8b81cdbdf35d38
Merged-In: I113e63b6133f20389d84ec0d6d8b81cdbdf35d38
2018-09-11 11:09:05 -06:00