summaryrefslogtreecommitdiffstats
path: root/scripts/qt/branch_qt.py
Commit message (Collapse)AuthorAgeFilesLines
* branch_qt: Fix merge and sync to update staging branchesKari Oikarinen2019-11-061-13/+14
| | | | | | | | | | | | Staging branches need to be updated to match the new target branches so that CI will work correctly. Now both merge and sync will also avoid pushing while there are changes staged or integrating in the target branch. Version bumps were already taking care of not pushing in that situation. Change-Id: I1d3bde14cc367429721873043ef54544ef43a90d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* branch_qt: Update help to note that sync is now implementedKari Oikarinen2019-11-061-1/+0
| | | | | | | Amends 62a653d32176956365f1fe8b5cb148a6391a6c9d. Change-Id: I2e3c49cd9d753f1b47b8f634264f398fe6990522 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* branch_qt: implement syncFrederik Gladhorn2019-10-311-5/+20
| | | | | | | | | We sometimes want to quickly fast forward branches where possible, for example 5.13 was just updated with 5.13.2 where fast forward merges were possible. Change-Id: I6460df11f505b792947e6f688f2bd86e54b29086 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* Gracefully skip branches that do not exist in extra reposFrederik Gladhorn2019-10-311-0/+3
| | | | | | | | For qt/qtcoap the 5.12 branch does not exist. Log that as error without aborting the rest of the script. Change-Id: Ibbde48d773a8c09892924e420a4ef009e443f936 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* branch_qt: allow skipping git hooksFrederik Gladhorn2019-10-301-3/+6
| | | | | | | | We need to be able to bump versions in lts branches, but the hooks will prevent that since we don't create cherry-pick commits. Change-Id: Ifb6411c94d00518f29cf9575464055f70f4f6a72 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* branch_qt.py: Handle merges that have conflictsKari Oikarinen2019-09-061-3/+8
| | | | | | | | | Note that the merge had conflicts and those need to be resolved manually and continue for all the other modules. Change-Id: Id4409bf16e8ea22ef7dc32d92b38a0a0adf75f60 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Extend help text for branch_qt.py scriptFrederik Gladhorn2019-07-291-1/+8
| | | | | Change-Id: I92f7d9bb861440172ea03bed3282b513b56c5d00 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix branch_qt.py script branch and merge modeFrederik Gladhorn2019-07-291-10/+8
| | | | | | | | | | | We pass instances of git.Repo into the functions, not git submodule instances. The check for skipped modules in branch_repo is no longer needed, since we do that globally before calling any of the more specific functions in run(). Change-Id: I29df0f8e9aab5b21e034fb7c7c9c98985864f9ea Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Create a new branch_qt script in PythonFrederik Gladhorn2019-07-261-0/+386
bump versions up, merge, branch. Automatically adds the person running the script into the push masters group in Gerrit, provided they have the right setup and admin rights and removes them when done. Includes a few extra repositories that are not part of qt5.git (automation). These were often forgotten in the past. Change-Id: Id8c031c2352af4f0c283d43e3f99323aa4b841ed Reviewed-by: Paul Wicking <paul.wicking@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 12:59:49 +0000