8971003d67
Revert "aosp-merger: Check if branch exists before abandoning"
...
This reverts commit c687bd73d9
2023-12-04 22:32:40 +02:00
c687bd73d9
aosp-merger: Check if branch exists before abandoning
...
This gets rid of repo abandon errors.
Change-Id: I97698b393e58365a56b02c3173b5482e8344d587
2023-11-06 23:25:25 +02:00
259965cf96
aosp-merger: Make script output a bit more readable
...
Change-Id: Ia624f82dd19b7d6e7902eaec3584748db72a90b5
2023-11-06 23:25:24 +02:00
a57dda10d1
aosp-merger: Support merging lineage device/kernels
...
Change-Id: I6c2212fde254500119091e7523982a2346dfe768
2023-03-24 19:43:09 +02:00
e49477fdcc
aosp-merger: Run git diff with --no-ext-diff
...
* In case one is using an external diff program
such as difftastic, this won't work as expected
* thread 'main' panicked at 'Hunk lines should be present in matched lines', /home/$USER/.cargo/registry/src/github.com-1ecc6299db9ec823/difftastic-0.37.0/src/display/hunks.rs:637:31
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
fatal: external diff died, stopping at core/Makefile
Change-Id: Ie455016fa24b6e00ea021088cc5fc1e4bca3bf94
2022-11-08 21:20:42 +00:00
1ce7a286f4
aosp-merger: Fix CLO branch detection in push-merge.sh
...
Change-Id: I9fd8ccbc4913732a652cb7005d6d5c34a1bd9395
2022-10-05 21:11:43 +03:00
390b267587
aosp-merger: Use full paths for kernel_repos
...
Change-Id: I12617ad5b93d8f3aae3c131e343588f368c22dd9
2022-10-05 21:11:42 +03:00
ac8ca7ff50
aosp-merger: Use device_branch for pixel device/kernel merges
...
Change-Id: Ib3c0479fc753aeeccc13c5fbe8e80c5231cf1a19
2022-10-05 21:11:42 +03:00
6929de032c
aosp-merger: Move aospremote to merge helpers
...
This ensures aospremote always runs on device/kernel merge
Change-Id: I1cea400a1e22aea3c682765f1c6e09ba9263840d
2022-10-05 21:11:42 +03:00
21c32f97d6
aosp-merger: Fix CLO merge/submit logic
...
Change-Id: I023edf71d6bc7e3b0717c20b96940dbdd0cb6c2c
2022-10-05 21:11:42 +03:00
e9ee2c9a2d
aosp-merger: Fix wrong branch in logs
...
Change-Id: I564004799cb4c52fb25afa3826013b7cc414a779
2022-10-05 21:11:42 +03:00
1a46783c3d
aosp-merger: Implement LineageOS merging
...
Change-Id: Ic158d31aeba77cba4a9db8507f8445b399b84aad
2022-10-05 21:11:41 +03:00
e4a8f06d9d
aosp-merger: Don't checkout the same branch twice
...
We are already in staging branch before this step,
avoid useless errors.
Change-Id: I45ffb6e01c212664efb9bbdd2550a391accf8e0d
2022-10-05 21:11:41 +03:00
03fcb953be
aosp-merger: s/calyxos_branch/os_branch/
...
Reduce the diff between CalyxOS/LineageOS scripts
Change-Id: I70e409e4bb050c4fd6b826912c7a9640c46ab9df
2022-10-05 21:11:41 +03:00
d830353741
aosp-merger: s/CalyxOS//
...
No need to brand simple console logs
Change-Id: Id2224ecc4b414919212328b2b25f0a7e3ccd4c6e
2022-10-05 21:11:41 +03:00
344ff1254f
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
2022-10-05 21:11:41 +03:00
8f4db6a7e6
aosp-merger: Implement CLO merging
...
Change-Id: I57eeb68f1b8b1fc756ad665b790071d8872c4ebe
2022-10-05 21:11:41 +03:00
2b3507c4bc
aosp-merger: Allow using --new-tag as topic when uploading squash
...
Change-Id: I0b36d6e66ae94a82af8fbfe943563a2f083f564d
2022-10-05 21:11:40 +03:00
78ac8cbe88
aosp-merger: Remove unused BRANCH from logs
...
Change-Id: Ie744348a31eb159914b93ec4627be03bc7e1be34
2022-10-05 20:41:36 +03:00
57d5bb59ee
aosp-merger: Get the correct branch for squash/push from git
...
Change-Id: I54c3fe16b6c05c7b39ede9c4a4ef05f5b4f44e28
2022-10-05 20:41:36 +03:00
c4a2aef709
aosp-merger: Allow merge without --old-tag set
...
Change-Id: I7ef5fde1a9f8b1706f21d2a8c0e1abfcff8bfba0
2022-10-05 20:41:36 +03:00
33421d4e54
aosp-merger: Add some comments
...
Change-Id: Id5b8711981776edb169f5894c25b705e5bb9aa56
2022-10-05 20:41:36 +03:00
9c3917c665
aosp-merger: Abandon staging branch inside _merge_helper
...
Change-Id: Iea165da1de035cd4228ac28ce351ee3616c4e050
2022-10-05 20:41:36 +03:00
f54b4292f3
aosp-merger: Always use upstream from .gitupstream when it exists
...
Change-Id: Ibcaa3b567964865f6cecb7058533ab2331be43d8
2022-10-05 20:41:36 +03:00
b44a7cf8e8
aosp-merger: Switch all scripts to argument parsing
...
Change-Id: I7af863d3952e7ae9de16860404bccd2b582caa20
2022-10-05 20:41:36 +03:00
f40bcd9fa4
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
2022-10-05 20:41:35 +03:00
3d4a098173
aosp-merger: Implement subtree merge handling for pixels
...
Change-Id: Idbb5427497d5d04766f8a37e7fa6e1264458dd29
2022-10-05 20:41:35 +03:00
cd3c1eb78c
aosp-merger: Force fetch AOSP tags
...
* There might be conflicting tags due to subtree use in device
and kernel repositories, preventing the actual merge from happening.
Change-Id: I96d6421b2e8675fc898e28b57e2f948c9db2c27c
2022-10-05 20:41:35 +03:00
79b5b2f1b4
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
2022-10-05 20:41:35 +03:00
b80cfd7bcb
aosp-merger: Support merging
...
Change-Id: If5e4ff6672828c9af464e001224b02cd2e35782d
2022-07-08 20:14:39 +05:30
ae4923ffb9
aosp-merger: Use pixels for device list
...
Change-Id: Ib9eb5ca0c600bc5e3c9272cf286581ad8d11cce8
2022-05-07 01:14:08 +05:30
2129e87f7a
aosp-merger: Improve empty merge check
...
* Handles "Already up to date." merge being registered as "merge"
instead of "nochange" in merged_repos.txt
Change-Id: I6e73013aa5c30a17f150a444b16365c39cf4280e
2022-01-15 08:13:03 +05:30
c6b02fa9c7
aosp-merger: push-merge: Print filename of the merged_repos.txt we're handling
...
* Good to have this just before we print the branch name and tag being pushed
Change-Id: Ie45d4a9bcf65ec18972d58e7b748190759e1f0cd
2022-01-12 16:18:05 -05:00
e6e4eaf315
aosp-merger: Implement kernel merging
...
Change-Id: I2dcc15ccf7d0a509880cd631435d1b8a1e07f5fb
2022-01-12 16:18:05 -05:00
ee62a5ef5b
aosp-merger: remove merged_repos.txt early
...
* To be able to re-run the script cleanly
Change-Id: I7eb65bc5d7265d0b4d892cb5c2921a8bec02103c
2022-01-12 16:18:05 -05:00
2efdea6eca
aosp-merger: Implement device merging
...
Change-Id: Ic8872d6acd1d291398dfa97ee2fb930d33b0fe75
2022-01-12 16:18:05 -05:00
da257cbca9
aosp-merger: push-merge: Push new tag as well
...
* Helps in figuring out if a commit is in a particular tag on
GitLab / GitHub
Change-Id: Ia62b706e02506dfcef6f676d8469b5a1de447295
2022-01-12 16:18:05 -05:00
a96a0eb1e3
aosp-merger: upload-squash: Use topic from a var
...
* For consistency, since there can be multiple tags for a month
Change-Id: I077649c2bc90613b6543187c969165d076f44b86
2022-01-12 16:18:05 -05:00
b8540b308a
aosp-merger: Export LC_MESSAGES=C LC_TIME=C
...
* Ensure system locale doesn't affect git commit messages
Change-Id: I2bb458cd57efb7a9a41f08f1fc8beeb832789c79
2022-01-11 00:04:26 +02:00
5a45c52a25
aosp-merger: Fix merged_repos.txt handling after refactor
...
Change-Id: I8719e4ab8ddd043eefc1e0c1dca9d427b0f0cc7e
2022-01-11 00:04:08 +02:00
b4ad4cf00c
aosp-merger: allow running from any directory
...
Change-Id: I14907315ed2e9fcbc3db7bcb0a74e3d5e00c68c8
2022-01-11 00:03:29 +02:00
949b4a157c
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
2022-01-11 00:03:29 +02:00
70b2979611
aosp-merger: Add script that pushes the merge to refs/heads
...
Change-Id: I6d263d8ccc6fc6854b8e9d7301e556b15987a2e7
2022-01-10 22:06:10 +02:00
9d530d7c79
aosp-merger: Add script that pushes squashed merge to gerrit
...
Change-Id: I17ca8ca1a18a2c74d2e595d2bb34c231a403dc04
2022-01-10 22:06:09 +02:00
5cbdc752f7
aosp-merger: _merge_helper.sh: Fix old tag error message
...
Change-Id: I3fd067ac7bf51c96b8a7b197312f98b6759bffc5
2022-01-10 22:06:09 +02:00
afbc3e5278
aosp-merger: _merge_helper.sh: Fix breakage when tags are the same
...
* Leftover from the time this code was running in a for loop
Change-Id: Ie315f95502e2d83cd0acf2dd1fdfdd1f7606c3b5
2022-01-10 20:50:06 +02:00
9de0780653
aosp-merger: Skip empty merges
...
* Sometimes we get empty merges caused by AOSP internal
branch merges. Let's just skip those.
Change-Id: I5a13e8e53af38fe1cb9da4b18a13b88682cb4758
2022-01-10 23:52:21 +05:30
c0fa9e2ee5
aosp-merger: Never use git reset --hard ${NEWTAG}
...
* This makes repositories end up with inconsistent
git history, requiring force push at some cases.
Just merge normally, if there are no changes we
are going to handle it in a cleaner way.
Change-Id: Ida69e91c1881c52dc6d805a07d870d9fe26d6279
2022-01-10 23:46:00 +05:30
33ab01b4eb
aosp-merger: Abandon staging branch if there were no changes
...
Change-Id: Ia1a526bf6df0c457b30739be58962da7ac2bde78
2022-01-10 23:46:00 +05:30
1157c7b775
aosp-merger: Clean up common ancestor logging
...
Change-Id: I07e5d156b07eee88cbd82b69072a840403b3e437
2022-01-10 23:46:00 +05:30
Michael Bestas