aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/pq.py
Commit message (Collapse)AuthorAge
* Fix typoChris Lamb2018-12-29
| | | | Closes: #914280
* Fix flake8's W605 (invalid escape sequence)Guido Günther2018-10-15
| | | | | | See also https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
* pq: import pq branch on switchGuido Günther2017-10-20
| | | | Closes: #761166
* pq: recommend 'rebase' and 'switch' when pq branch already existsGuido Günther2017-10-19
|
* pq: import patches before rebaseGuido Günther2017-10-19
| | | | | | if the pq branch doesn't exist yet. Closes: #876800
* pq: don't care which branch get's passed to find_upstream_commitGuido Günther2017-10-19
| | | | | So far we only passed in the base branch, make it accept the pq branch too.
* pq: Move import to separate functionGuido Günther2017-10-18
| | | | | | This way we can call it from rebase to create the missing branch Gbp-Dch: Ignore
* pq: Be clearer what '--commit' didGuido Günther2017-09-08
| | | | instead of a confusing "git status".
* pq: make --abbrev= configurableChris Lamb2017-08-22
| | | | | Closes: #872351 Signed-off-by: Guido Günther <agx@sigxcpu.org>
* pq: use more gittish commit message in --commitGuido Günther2017-08-19
| | | | Use present instead of past tense
* pq: don't create empty pq branch on rebase and switchGuido Günther2017-08-05
| | | | | | We always want to start from an imported series. Thanks: Chris Lamb for the reproducer
* pq: unbreak --commit when patch series becomes emptyGuido Günther2017-03-14
| | | | | We skipped the commit when the patch series became completely empty but we want to commit that change too.
* pq: Filter out comments from series diffGuido Günther2017-01-29
| | | | | | | When creating the delta of added and dropped pachtches ignore comment lines in the series file. Closes: #852817
* tests/component/rpm: flake8 cleanGuido Günther2017-01-03
|
* GitVfs: make objects usable as context managersGuido Günther2017-01-02
|
* pq: Don't fail --commit on empty commitsGuido Günther2016-12-23
| | | | | | | | So far we would fail empty commits with the confusing error $ gbp pq export --commit gbp:info: Generating patches from git (debian/sid..patch-queue/debian/sid) gbp:error: Error running git commit:
* Fix new flake8 errorsGuido Günther2016-11-15
| | | | E305 expected 2 blank lines after class or function definition
* pq: introduce pq_on_upstream_tagGuido Günther2016-09-28
|
* pq: remove redundancies in --pq-from code pathsGuido Günther2016-09-28
|
* pq: restrict choices of pq-from to 'DEBIAN' and 'TAG'Guido Günther2016-09-27
|
* Unbreak patch delta outputGuido Günther2016-09-16
| | | | broken by "pq: Ensure we are working in the right git directory"
* pep8/pyflakes cleanupsGuido Günther2016-09-12
|
* pq: Ensure we are working in the right git directoryMaximiliano Curia2016-09-07
| | | | | This is particularly bothering for the tests, as they are usually ran from the gbp git, and pq might happily apply the patches there into it.
* pq: Handle unmerged debian branches (export)Maximiliano Curia2016-09-07
|
* pq: Handle unmerged debian branches (rebase)Maximiliano Curia2016-09-07
|
* pq: Handle unmerged debian branches (import)Maximiliano Curia2016-09-07
| | | | | | | This add two new parameters to pq, upstream_tag, and pq_from, the last one is used to use the canonical merged branches logic and the use upstream_tag as the base for the pq branch. This is similar to what's currently used in the rpm code, and could be merged in future updates.
* Give more instructions when config is unparseableGuido Günther2016-07-04
| | | | | | | | and make return codes and messages consistent. This allows us to move some test code from the component tests to the unit tests which is always nice. Closes: #733640
* buildpackage: Handle Ctrl-C more gracefullyGuido Günther2016-07-04
|
* pq: Report number of imported patchesGuido Günther2016-06-03
|
* Add meta-closes-bugnum to gbp-pq as wellGuido Günther2015-09-05
| | | | since it's used with "export --commit".
* Allow exported patches to be renumbered and the patch number prefix format ↵Carlos Maddela2015-07-10
| | | | | | | | | | | | | | to be specified as an option Now that gbp-pq preserves patch names on import and export the --[no-]patch-numbers options have been rendered largely useless unless the patch queue commits are amended with the Gbp[-Pq]: Name tags removed. The options remain useful if support for renumbering is added. It's also handy to allow the choice of the format to use for the numeric prefixes. Closes: #790890 Signed-off-by: Guido Günther <agx@sigxcpu.org>
* Fix FSF address - thanks rpmlintEvgeni Golov2015-06-22
| | | | use gnu.org/licences instead of a postal address, as suggested by Guido
* pq: Allow to preserve the patch name on import/exportGuido Günther2015-06-02
| | | | Closes: #761161
* Use python3 compatible exception syntaxGuido Günther2015-06-02
|
* Extract exception message in a less arcane wayGuido Günther2015-03-27
|
* Handle ConfigParser -> configparser renameGuido Günther2015-02-20
| | | | | | to work towards Python3 support Gbp-Dch: Ignore
* parse_gbp_commands: support command filteringGuido Günther2015-02-08
| | | | | | | | | When we write out patches to subdirs using a topic we want to filter out this topic from the commit message. Support for this was lost in 7ce15d2434ee42aa5a1afce3d03069c5efb2db1b add it back. Also fix parsing of the deprecated commands.
* pq: deprecate the usage of 'gbp-pq-topic:'Markus Lehtonen2015-02-08
| | | | | | Replaced by the "Gbp[-Pq]: Topic <topic>" command. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* Revert "pq: deprecate the usage of 'gbp-pq-topic:'"Guido Günther2015-01-29
| | | | | | | "Gbp-Pq: Topic <topic>" leaves the marker in the exorted patch so we shouldn't use it by default. This reverts commit 7ce15d2434ee42aa5a1afce3d03069c5efb2db1b.
* pq: deprecate the usage of 'gbp-pq-topic:'Markus Lehtonen2015-01-25
| | | | | | Replaced by the "Gbp[-Pq]: Topic <topic>" command. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* pq: move switch_pq() to commonMarkus Lehtonen2014-12-05
| | | | | | So that it can be re-used by the upcoming pq-rpm tool. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* Improve change reporting a bitGuido Günther2014-10-17
|
* pq: Don't fail commit if the series file is empty on the source branchGuido Günther2014-10-14
|
* pq: Add "pq export --commit" optionGuido Günther2014-10-12
| | | | | This commits the changes in the pq right away. This is currently experimental and subject to change.
* Allow to always drop pq branch after exportGuido Günther2014-09-12
| | | | Closes: #761160
* Unify doc strings a bitGuido Günther2014-08-23
| | | | since they now show up with --list-cmds
* pq: Try harder to cleanup after a failed patchGuido Günther2014-05-19
| | | | | | | | | | | | | | | | | If we fail to apply the patch the tree is left in a dirty state so reset to the last head. This avoids irritating errors like: gbp:error: Failed to apply 'debian/patches/poison+remember_trash': Failed to commit tree: fatal: invalid date format: 1998/03/21 following files would be overwritten by checkout: doc/hosts.nntp.5 innd/art.c innd/innd.h innd/rc.c Please, commit your changes or stash them before you can switch branches. Aborting Thanks: Marco d'Itri for the repo to debug this
* pq: Print proper error message if we fail to apply the treeGuido Günther2014-05-19
| | | | | | | | | | e.g. instead of gbp:error: Failed to apply 'debian/patches/poison+remember_trash' we now have gbp:error: Failed to apply 'debian/patches/poison+remember_trash': Failed to commit tree: fatal: invalid date format: 1998/03/21
* config: add decorator to add_option_* functionsGuido Günther2014-04-03
| | | | | This allows us to build an internal list of valid options and print these.
* Use a much simpler version to fix the command name in --helpGuido Günther2014-03-29
| | | | | | mostly reverting e1780f0. Closes: #742907
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 19:09:31 +0000