| Commit message (Collapse) | Author | Age |
| |
|
| |
|
|
|
|
|
| |
This commits the changes in the pq right away. This is currently
experimental and subject to change.
|
|
|
|
| |
Closes: #761160
|
|
|
|
| |
since they now show up with --list-cmds
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
This allows us to build an internal list of valid options and print
these.
|
|
|
|
|
|
| |
mostly reverting e1780f0.
Closes: #742907
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
^^^^
|
|
|
|
|
|
| |
"gbp buildpackage" did this already but others didn't
Closes: #733759
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
| |
|
|
|
|
| |
since the later doesn't exist in python3
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
| |
so the RPM based tools don't need to rely on a control file but
can e.g. look at the spec file.
|
| |
|
| |
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Debian release 0.6.0~git20120218
|
| |
| |
| |
| | |
when guessing authorship information
|
|/
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
even if debian/control is missing.
|
|
|
|
|
| |
to limit number of returned commits and fix path option to also accept a
list of paths instead of a string.
|
|
|
|
| |
to quickly switch between patch-queue and base branch.
|
|
|
|
| |
since that's what it currently handles.
|
|
|
|
| |
and add tests.
|
|
|
|
| |
since this models a quilt patch series
|
|
|
|
|
| |
Don't fail if patches don't have a proper patch header and filename
extensions (like in the heimdal package)
|
|
|
|
| |
and add tests
|
|
|
|
| |
so one doesn't have to drop the old one first.
|
|
|
|
| |
Thanks: Robert Luberda
|
|
|
|
| |
if 'rebase' is invoked from the pq branch.
|
|
by moving the commands to gbp/scripts/
|