Commit Graph

11 Commits

Author SHA1 Message Date
Michael Bestas
559a794b49 aosp-merger: s/LineageOS//
No need to brand simple console logs

Change-Id: Id2224ecc4b414919212328b2b25f0a7e3ccd4c6e
2023-03-21 04:59:43 +05:30
Michael Bestas
3c21ead826 aosp-merger: Allow using --new-tag as topic when uploading squash
Change-Id: I0b36d6e66ae94a82af8fbfe943563a2f083f564d
2023-03-21 04:59:43 +05:30
Michael Bestas
ffddfc9fd6 aosp-merger: Remove unused BRANCH from upload-squash
Change-Id: Ie744348a31eb159914b93ec4627be03bc7e1be34
2023-03-21 04:59:43 +05:30
Michael Bestas
c44154f25c aosp-merger: Switch all scripts to argument parsing
Change-Id: I7af863d3952e7ae9de16860404bccd2b582caa20
2023-03-21 04:59:43 +05:30
Michael Bestas
a29949f546 aosp-merger: Implement subtree merge handling for pixels
Change-Id: Idbb5427497d5d04766f8a37e7fa6e1264458dd29
2023-03-21 04:59:43 +05:30
Michael Bestas
250233f538 aosp-merger: Don't run repohooks during repo upload
* These tend to fail on pure AOSP code, so just disable them
  for this script.

Change-Id: I3637f014ec38a365a2dbf07c61b39623599b6a9f
2023-03-21 04:59:43 +05:30
Michael Bestas
b92af37df1 aosp-merger: Adapt for LineageOS vars usage
Change-Id: Id63a7377ed68ee7d7743af31747eade2d785369e
2023-03-21 04:59:43 +05:30
Chirayu Desai
8beaa422b3 aosp-merger: upload-squash: Use topic from a var
* For consistency, since there can be multiple tags for a month

Change-Id: I077649c2bc90613b6543187c969165d076f44b86
2023-03-21 04:59:43 +05:30
Michael Bestas
788196f219 aosp-merger: Fix merged_repos.txt handling after refactor
Change-Id: I8719e4ab8ddd043eefc1e0c1dca9d427b0f0cc7e
2023-03-21 04:59:43 +05:30
Michael Bestas
6fb4c9a940 aosp-merger: allow running from any directory
Change-Id: I14907315ed2e9fcbc3db7bcb0a74e3d5e00c68c8
2023-03-21 04:59:43 +05:30
Michael Bestas
ecb72f12b5 aosp-merger: Add script that pushes squashed merge to gerrit
Change-Id: I17ca8ca1a18a2c74d2e595d2bb34c231a403dc04
2023-03-21 04:59:43 +05:30