summaryrefslogtreecommitdiffstats
path: root/bin/git-qt-merge-mainlines
Commit message (Collapse)AuthorAgeFilesLines
* git-qt-merge-mainlines: find related changes for conflictsLiang Qi2016-11-211-0/+61
| | | | | | | | | | Only shows author date instead of commit date for changes. And better to make sure rerere.enabled is disabled when analyzing the conflicts. Change-Id: I4268b55efb39cc94572117e46686cd5eaa6233c6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* git-qt-merge-mainlines: add wip featureLiang Qi2016-11-071-3/+57
| | | | | | | | Create a WIP change when conflicts arise. Change-Id: Ifd9f4c78df3491642241754b256ac623399158cf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* git-qt-merge-mainlines: split some long linesEdward Welbourne2016-07-051-11/+22
| | | | | Change-Id: Iaa8a4ff67e532b65d27c239f5623a00e4151a7cb Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* git-qt-merge-mainlines: write pythonicallyEdward Welbourne2016-07-051-12/+11
| | | | | | | | | | | Stray semicolon at end of line, testing len rather than the thing itself. Use elif rather than if nested within else; append to existing lists rather than creating new ones by doing arithmetic. Prefer .startswith() over comparing [0]; it can take a tuple of candidates. Change-Id: I8272e21cb237fe376d6ec097c6ae322adae00c65 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* git-qt-merge-mainlines: reverse a condition to ease readingEdward Welbourne2016-07-051-3/+3
| | | | | | | | Swap the two branches of an if/else clause so that we can test a positive condition that's simpler and easier to read than its negation. Change-Id: I72aa0b6ba7eabfee4d9cb62cc9ff3daa4acafb76 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* git-qt-merge-mainlines: group the action argumentsEdward Welbourne2016-07-051-5/+6
| | | | | | | | This makes it easier to document that you need one of them ! That wasn't obvious before ... Change-Id: Id35ed832721781d26d02fd642162f9ec78821f8c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* git-qt-merge-mainlines: no need for separate Config classEdward Welbourne2016-07-051-6/+3
| | | | | | | | It just duplicates the argparse.Namespace class that's used for the default return from parse_args() anyway. Change-Id: Id306acd5e0367105c9fdabd3806567158b06852f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* git-qt-merge-mainlines: skip type=str (the default) from parser optionsEdward Welbourne2016-07-041-4/+4
| | | | | Change-Id: Ib237cd0dea97d6a750e490bf257de9f056533299 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* git-qt-merge-mainlines: shuffle code to make --help a clean no-opEdward Welbourne2016-07-041-8/+15
| | | | | | | | | | | | | The call to get_submodules() produced output distracting to those needing help; move it later and simply set args.modules if unset, instead of supplying the list as default to the parser. Moved banner line after arg-parse, too, as it duplicates the help message's description. Added an epilog to the help message saying how to invoke this script. Change-Id: Ib970f7a9ffa235c9523256d4ccfee448afd37ab2 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Obtain sha1s from supermodule instead of using branch tipsLiang Qi2016-05-061-10/+35
| | | | | | | | | Without supermodule integration, the changes are potentially harmful for dependent modules. Change-Id: Ie092275822fe3bf0e060c31bcfb7d520ac568b2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-111-2/+2
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: If3c8d221bcf8e5010048ed5f1c50cd35c04e7199 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Unify use of shebang line to invoke toolsSamuel Gaist2015-01-161-1/+1
| | | | | | | | | | | Currently some of the scripts uses env and others don't. This patch aims to unify these so all scripts behave the same and follow git rules. From git's mailing list, by default, e.g. /usr/bin/perl should be used. That path can be customized when installing git. Change-Id: If2cb48e6bd3d630e86a0a275077609a8e90fc6c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add mergetool option to merge scriptFrederik Gladhorn2014-10-211-1/+7
| | | | | Change-Id: I79ded5e4a437e84d444f98e20c70bef023f66398 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix submodule merge scriptFrederik Gladhorn2014-10-131-1/+4
| | | | | | | | Submodules that have no changes actually show up with space in front of the sha-1 which would mess up the logic when splitting by spaces. Change-Id: I15506c6e3780efb29d885ff456ecfac60526c03d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix qt-git-merge-mainlines to deal with submodules dynamicallyFrederik Gladhorn2014-09-071-32/+22
| | | | | Change-Id: Ia8fb489715e2ba0f0c29ad76ada20800a1ab5c54 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* git-qt-merge-mainlines: Add qtwebsockets to the default listSergio Ahumada2014-02-251-0/+1
| | | | | | Change-Id: I118f57de2210bf361ec24d8fb32ca18f753a4c59 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add qtenginio to merge mainlines scriptFrederik Gladhorn2014-01-061-0/+1
| | | | | Change-Id: I3f765054b9449847f30f96f451769f890a60ccd3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Be more robust when a module fails to mergeFrederik Gladhorn2013-11-281-17/+25
| | | | | | | | The exception handling would actually mean that "cd .." was missed when an exception occurred (eg no gerrit remote in repo). Change-Id: I056e103cce6c5714a905c434e8341273d48db591 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* git-qt-merge-mainlines: Add qtandroidextras to the default listSergio Ahumada2013-09-241-0/+1
| | | | | Change-Id: Id82a09c0b99985bf2a750b786f8cd857e82f9603 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* git-qt-merge-mainlines: Add some new modules to the default listSergio Ahumada2013-09-231-0/+4
| | | | | | | | | | | | | - qtconnectivity - qtlocation - qtmacextras - qtwinextras will be added for Qt 5.2.0 Change-Id: I4559f095138c257f8d9787a9dd3e8bb45712844c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* git-qt-merge-mainlines: Remove qtjsbackend module from the listSergio Ahumada2013-09-111-1/+0
| | | | | | | This module will be deprecated for Qt 5.2.0 Change-Id: Iae55550bd62e868e9eae588d09ac52a031e47f20 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix --list-modules arg to do as advertisedFrederik Gladhorn2013-08-121-1/+2
| | | | | Change-Id: I26aba3b0ce6f218c566051d8f4118c7e93f4ac84 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Import the print function from __future__Frederik Gladhorn2013-08-121-0/+2
| | | | | | | Otherwise the print() looks ... not so good with py2 Change-Id: Ia7e6925cf55073e20e269d3de6705f616f455933 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* git-qt-merge: Use #!/usr/bin/env instead of #!/usr/bin/python3Sergio Ahumada2013-08-021-1/+4
| | | | | | | | It prevents the script to fail if python3 is not installed. Also workaround the use of raw_input() with python3. Change-Id: If9d95ef3a5ffbd6ad29521f2b81c4622c6e51d4f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add script to help mergingFrederik Gladhorn2013-07-011-0/+214
This script has to be run from a directory with the modules checked out. By default it merges stable->dev but can be used for any direction. Change-Id: I0dba5f7fb7a671833e47c7fd7c42e77885e26e7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 23:57:16 +0000