Michael Bestas
ab49b1e556
aosp-merger: Move aospremote to merge helpers
...
This ensures aospremote always runs on device/kernel merge
Change-Id: I1cea400a1e22aea3c682765f1c6e09ba9263840d
2023-03-21 04:59:43 +05:30
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
d9c87a53d5
aosp-merger: Abandon staging branch inside _merge_helper
...
Change-Id: Iea165da1de035cd4228ac28ce351ee3616c4e050
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
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
Chirayu Desai
f1363b6619
aosp-merger: remove merged_repos.txt early
...
* To be able to re-run the script cleanly
Change-Id: I7eb65bc5d7265d0b4d892cb5c2921a8bec02103c
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
f5199e1afa
aosp-merger: Add script that merges non-forked repositories
...
* Useful to find differences and potential missing commits
between AOSP tags with different ancestor on repositories
that we have not forked.
One example is this month, switching from Pixel 6
December 2021 tag to qcom Pixel January 2022 tag.
Change-Id: Ib5bafd50c20375368255ad9bbb8ca702c3361652
2023-03-21 04:59:43 +05:30
Michael Bestas
551da8082b
aosp-merger: Rename aosp-merger.sh to merge-aosp-forks.sh
...
* In preperation for the upcoming script changes
Change-Id: If963ca2f8af703655963e7f5d3ab56484270b358
2023-03-21 04:59:42 +05:30
