aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/pq.py
Commit message (Collapse)AuthorAge
* 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
* Fix command outputGuido Günther2014-03-27
| | | | | | | | | | | | | The first line lacked the subcommand like: $ gbp pull --help Usage: gbp [options] - safely update a repository from remote instead of $ gbp pull --help Usage: gbp pull [options] - safely update a repository from remote ^^^^
* Avoid backtrace on config file parse errorsGuido Günther2014-01-05
| | | | | | "gbp buildpackage" did this already but others didn't Closes: #733759
* pq: support 'Topic' patch-export commandMarkus Lehtonen2013-10-31
| | | | | | | | | Topic can be defined with either 'Gbp: Topic <topic>' or 'Gbp-Pq: Topic <topic>' in the commit message. This is to replace the "gbp-pq-topic: <topic>" command. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* pq: listen to 'Gbp-Pq:' commands, tooMarkus Lehtonen2013-10-31
| | | | Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* pq: support patch-export commandsMarkus Lehtonen2013-10-31
| | | | | | | | | | | Support giving commands to pq as a meta tag in commit message. The format is "Gbp: <command> [args]". Currently, only one command is supported. namely 'ignore'. That is, one can use 'Gbp: Ignore' in the commit message for ignoring the commit in patch-generation. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* pq: rewrite patch export functionalityMarkus Lehtonen2013-10-31
| | | | | | | | | | | | | | | Use our own function for constructing the patch files instead of using the format-patch command of git. This way, we get the desired output format directly, without the need for the error-prone "format-patch, parse patch files, mangle and re-write patch files" cycle. Also, fix patch naming in patch generation when '--no-patch-numbers' is used. Previously, multiple commits with the same subject resulted in multiple patches having the same filename. This lead into broken series with missing patches as patch files were overwritten by the topmost commit. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* pq: Only print number or tries if we try more than onceGuido Günther2013-09-16
|
* pq: print which patch failed to applyGuido Günther2013-09-16
|
* Use open() instead of file()Guido Günther2013-08-28
| | | | since the later doesn't exist in python3
* pq: exclude patches from Debian packaging branchGuido Günther2013-08-24
| | | | | | | When regenerating the patch queue including patches from the Debian branch is not useful. Addresses parts of See #680705. Thanks: Benjamin Cama for the detailed analysis
* pq: do author guessing outside the apply_patch functionsMarkus Lehtonen2013-01-16
| | | | | | | | | Call the author parsing/guessing function outside the apply patch functions. This way, the caller can decide when to do the guessing, and with which parameters. Now the apply_patch functions do what their name suggests. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* New configuration option for setting the output color schemeMarkus Lehtonen2012-11-25
| | | | | | | Adds a new command line and config file option 'color-scheme' for selecting the colors used in log output. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* gbp-pq: don't use plural form when there's only one try leftGuido Günther2012-11-24
|
* pq: Allow to pass in custom fucntion to fetch authorship informationGuido Günther2012-11-23
| | | | | so the RPM based tools don't need to rely on a control file but can e.g. look at the spec file.
* Print number of tries leftGuido Günther2012-10-25
|
* PEP-8 and pyflakes cleanupsGuido Günther2012-10-25
|
* GitRepository: raise GitRepositoryError on git errorsGuido Günther2012-07-28
| | | | | | | Raise GitRepositoryError in cases where CommandExecFailed (from GitCommand) was previously silently passed forward. Heavily based on a patch by Markus Lehtonen <markus.lehtonen@linux.intel.com>
* Make exception syntax consistentGuido Günther2012-07-02
|
* Refactor gbp-pq as preparation for rpm supportMarkus Lehtonen2012-04-18
| | | | | | | | Separate some functions of gbp-pq into a basemodule, intended to be re-used by the upcoming rpm variant of the tool. Also, introduces a new python subpackage gbp.scripts.common to be used for the re-usable parts of the scripts in the refactoring work.
* gbp-pq: refactor args of write_patch()Markus Lehtonen2012-02-20
| | | | | | | Allows defining the formerly hardcoded patch_dir. This makes write_patch() re-usable in the upcoming RPM-tools. Signed-off-by: Guido Günther <agx@sigxcpu.org>
* Merge tag 'debian/0.6.0_git20120218' into experimentalGuido Günther2012-02-18
|\ | | | | | | Debian release 0.6.0~git20120218
| * gbp-pq: Properly print patch nameGuido Günther2012-02-18
| | | | | | | | when guessing authorship information
* | Refactor config.py as preparation for rpm support.Markus Lehtonen2012-02-13
|/ | | | | | | | | | | Split GbpOptionParser in to a common base class and a Debian specific subclass, as a preparation for upcoming RPM support. This allows having different default values (and help texts) for common options between different package types, and, clearer separation of package type specific options. Signed-off-by: Guido Günther <agx@sigxcpu.org>
* gbp-pq: don't crash in get_maintainer_from_control()Markus Lehtonen2012-01-23
| | | | even if debian/control is missing.
* GitRepository: Add num option to git_commitsGuido Günther2011-12-27
| | | | | to limit number of returned commits and fix path option to also accept a list of paths instead of a string.
* gbp-pq: add "switch" actionGuido Günther2011-12-26
| | | | to quickly switch between patch-queue and base branch.
* Rename gbp.pq to gbp.patch_seriesGuido Günther2011-12-26
| | | | since that's what it currently handles.
* pq.Patch: move support for parsing patch headers into Patch classGuido Günther2011-12-26
| | | | and add tests.
* pq: rename PatchQueue to PatchSeriesGuido Günther2011-12-26
| | | | since this models a quilt patch series
* scripts/pq: handle patches without filename extensionGuido Günther2011-12-18
| | | | | Don't fail if patches don't have a proper patch header and filename extensions (like in the heimdal package)
* scripts/pq: Move patch name handling to separate functionGuido Günther2011-12-18
| | | | and add tests
* pq: add --force option to fore recreation of pq branchGuido Günther2011-12-16
| | | | so one doesn't have to drop the old one first.
* gbp-pq: Instead of looking for the signature don't let git generate itGuido Günther2011-11-21
| | | | Thanks: Robert Luberda
* gbp-pq: don't claim we're uptodateGuido Günther2011-11-04
| | | | if 'rebase' is invoked from the pq branch.
* Get rid of the symlinkGuido Günther2011-11-01
by moving the commands to gbp/scripts/