LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
225 Commits 2 Branches 0 Tags
ee1036d3d888940ad0a19b3924ae2a4cb9949266
Commit Graph

31 Commits

Author SHA1 Message Date
Michael Bestas
7b7ffd7ed1 aosp-merger: Support pushing merge instead of squash 
Change-Id: If5e4ff6672828c9af464e001224b02cd2e35782d
 2023-03-28 21:02:20 +03:00
Michael Bestas
fb2f8aa34f aosp-merger: Rename some functions to match downstream scripts 
Change-Id: I69eda606b12dc3965866ac28ce2037ed3f6b25a6
 2023-03-21 04:59:43 +05:30
Michael Bestas
3b291f5436 aosp-merger: Remove double enter press 
Change-Id: I2bdbcab5369692e338dbf7deea5276778993830f
 2023-03-21 04:59:43 +05:30
Michael Bestas
61d10adbfb aosp-merger: Use full paths for kernel_repos 
Change-Id: I12617ad5b93d8f3aae3c131e343588f368c22dd9
 2023-03-21 04:59:43 +05:30
Michael Bestas
f4883e22ea aosp-merger: Use device_branch for pixel device/kernel merges 
Change-Id: Ib3c0479fc753aeeccc13c5fbe8e80c5231cf1a19
 2023-03-21 04:59:43 +05:30
Michael Bestas
68f947275c aosp-merger: Fix CLO merge/submit logic 
Change-Id: I023edf71d6bc7e3b0717c20b96940dbdd0cb6c2c
 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
041e617cee aosp-merger: Merge clo tags independently 
Read group from 2nd argument and merge the proper tag
instead of merging all at once.

Change-Id: Ie9bff27573cefdae7de29d906998e9eb4f662f3d
 2023-03-21 04:59:43 +05:30
Michael Bestas
938454fa01 aosp-merger: Implement CLO merging 
Change-Id: I57eeb68f1b8b1fc756ad665b790071d8872c4ebe
 2023-03-21 04:59:43 +05:30
Michael Bestas
35c904f949 aosp-merger: Add some comments 
Change-Id: Id5b8711981776edb169f5894c25b705e5bb9aa56
 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
f3b9352ed8 aosp-merger: Use merged_repos_${kernel}_kernel.txt for kernels 
This prevents kernel merge overriding device merge which could
result in the wrong repository being pushed while running
`aosp-merger.sh submit-devices`

Change-Id: I89fccce5786ea0cbdd572ce1d3a2e9cac8ff91cd
 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
Chirayu Desai
d22bbbf6c5 aosp-merger: Implement kernel merging 
Change-Id: I2dcc15ccf7d0a509880cd631435d1b8a1e07f5fb
 2023-03-21 04:59:43 +05:30
Chirayu Desai
5a13bfe6df aosp-merger: Use pixels for device list 
Change-Id: Ib9eb5ca0c600bc5e3c9272cf286581ad8d11cce8
 2023-03-21 04:59:43 +05:30
Chirayu Desai
5ba12ef3e8 aosp-merger: Implement device merging 
Change-Id: Ic8872d6acd1d291398dfa97ee2fb930d33b0fe75
 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
44bbda6481 aosp-merger: Export LC_MESSAGES=C LC_TIME=C 
* Ensure system locale doesn't affect git commit messages

Change-Id: I2bb458cd57efb7a9a41f08f1fc8beeb832789c79
 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
e736c1d62e aosp-merger: Add script that pushes the merge to refs/heads 
Change-Id: I6d263d8ccc6fc6854b8e9d7301e556b15987a2e7
 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
Chirayu Desai
134fd8ad0a aosp-merger: Add a tiny script that does the merging based on variables 
Change-Id: I58bb25255293495bcb07667da1769f47640fdf4b
 2023-03-21 04:59:42 +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
Chirayu Desai
b6a649c37b aosp-merger: Split out the for loop guts to _merge_helper.sh 
* This script can be used by other callers to merge individual repos
* Get branch name from our variables
* Don't repo sync -d, it removes any local changes we made to merge
  scripts. Let's just manually sync before running this script.

Change-Id: I7ddfbfd934908e4a72fc2742753b4c704fa6c5e3
 2023-03-21 04:59:42 +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
68d049c830 aosp-merger: Do not force-fully rebasing 
* I know what I'm doing, when I say merge, I want to merge,
  whether there's common ancestry or not!

Change-Id: I75bd3818b93d33a878de53f5cdd38c138ba690c8
 2023-03-21 04:59:42 +05:30
Chirayu Desai
f07e1584f7 aosp-merger: Get branch reliably 
Change-Id: I6457cd7ab0d444ea22fba6a3ced65ef88e24fa3a
 2021-01-06 23:20:17 +01:00
Michael Bestas
2fea5942d2 aosp-merger: Adapt for new default manifest location 
Change-Id: I1067ba74381201b85172a2dfdc41d5ac15ac2dc6
 2020-10-10 21:55:43 +03:00
Rashed Abdel-Tawab
ccde24991f scripts: Add simplified AOSP merger 
Usage: ./lineage/scripts/aosp-merger/aosp-merger.sh [merge|rebase] <oldaosptag> <newaosptag>

Change-Id: I6663e51ee22d7ea262ef634ed5e33c189ee1c2d6
 2018-11-06 04:27:09 +01:00