Commit Graph

11 Commits

Author SHA1 Message Date
Michael Bestas
2538c7d1f9 aosp-merger: s/lineageos_branch/os_branch/
Reduce the diff between CalyxOS/LineageOS scripts

Change-Id: I70e409e4bb050c4fd6b826912c7a9640c46ab9df
2023-03-21 04:59:43 +05:30
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
cf357b2ac3 aosp-merger: Get the correct branch for squash/push from git
Change-Id: I54c3fe16b6c05c7b39ede9c4a4ef05f5b4f44e28
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
b92af37df1 aosp-merger: Adapt for LineageOS vars usage
Change-Id: Id63a7377ed68ee7d7743af31747eade2d785369e
2023-03-21 04:59:43 +05:30
Chirayu Desai
adcf6fca04 aosp-merger: Prepare for device merging
Change-Id: Ifcd99f733b3c7e2cc3969e10b7a7247ecbe34678
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
d10751ac91 aosp-merger: Switch to SPDX copyright header
* Less clutter

Change-Id: Ib8496ec5d02521ce76a886fb0b48133d57a6f707
2023-03-21 04:59:42 +05:30
Chirayu Desai
c5e7492b3b aosp-merger: Add script to squash changes for review
Change-Id: I1ffc3678fa40938bae62d5112c8fcacbffab4651
2023-03-21 04:59:42 +05:30