Age | Commit message (Collapse) | Author |
|
Closes: #732678
|
|
since I tend to use them instead of err and warn.
Closes: #728896
|
|
instead of simply using the upstream branch name. THis makes sure
we also merge upstream versions that were imported previously with
e.g. "gbp import-orig".
Closes: #698222
|
|
Closes: #636368
|
|
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>
|
|
For generating a patch file from a diff between two arbitrary commits.
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>
|
|
Encode non-ascii email headers properly. Also, set MIME headers
correctly for the message body if the commit message body contains
non-ascii characters.
The reason for constructing the message in a little bit "clumsy" way is
the intention is to match the output of git-format-patch as closely as
possible.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Implements a filter option that allows filtering out changes to certain
files/paths in the patch-generation. A commit is totally ignored if all
files would be filtered out. The path filter is given as a Python
regexp.
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>
|
|
Closes: #725666
Signed-off-by: Guan Junchun <junchunx.guan@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Previously, gbp didn't correctly parse this kind of URL and clone
failed.
Signed-off-by: Guan Junchun <junchunx.guan@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
by using --porcelain. Heavily based on a patch by rian m. carlson
Closes: #726260
|
|
|
|
|
|
Superceded byt the get_remotes() method.
Change-Id: I34f9e8b8188b5a40ce21d2f74e6068f2aaec9e60
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Use the new get_remotes() method
Change-Id: Ic34cf590a6f36e6fa0af2ffbe932c8ae3a198944
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Add a new GitRemote class for representing git remote repositories.
The initial, very limited, version only contains information about the
fetch and push URLs of the remote repository.
Also, add a new GitRepository.get_remotes() method for getting remote
repositories as instances of the new GitRemote class.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Also changes the method to utilize the GitArgs class.
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Change-Id: I9331fec6fcd0e58dad7cb4a571a683e09ce08011
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Previously empty prefix in tarball generation introduced a leading slash
in all filenames in the archive.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
External diff might break patch generation, for example.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
For generating textual diffs. Useful for Pq - for example, the 'patch'
utility does not support git binary diffs.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Lingchaox Xin <lingchaox.xin@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Useful common functionality.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
For getting diffstat and summary in the output.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Otherwise the mangled GBP_CONF_FILES affects also other doctests when
run with python-nose.
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
|
|
The symmetric difference isn't always useful since it includes changes
from both branches. See #680705.
|
|
|
|
This code that determined if we found a snapshot header was obuscated by
the code that determines the commits to add. Split those and better
document their purpose. Also always return the commit to start from so
we don't need to repeat the logic in the uper levels.
|
|
since --set-upstream is deprecated.
|
|
|
|
Move setting of the upstream branch out of the loop. This worked by
accident.
|
|
instead of the deprecated _git_getoutput
|
|
instead of the deprecated _git_inout and clarify the return codes and
exceptions raised.
|
|
No need to leak fds to the child.
|
|
We should set stdin to subprocess.PIPE when piping input according
to the subprocess docs.
|
|
It's shorter and get's rid of the unused dummy variable.
|
|
|