Age | Commit message (Collapse) | Author |
|
|
|
All other gbp branches have configurable names. This commit adds the
readiness for user to configure/change the name of the patch-queue
branches, as well.
Patch-queue is defined in options as a format string, where '%(branch)s'
refers to the debian/packaging branch. If the pq-branch format string
does not contain '%(branch)s', there is only one patch-queue branch and
the debian/packaging branch is used as its base branch. That is, e.g. a
'gbp-pq switch' operation from the patch-queue branch always switches to
the debian/packaging branch.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Olev Kartau <olev.kartau@intel.com>
Minor adjustments,
Signed-off-by: Tzafrir Cohen <tzafrir@debian.org>
|
|
Signed-off-by: Tzafrir Cohen <tzafrir@debian.org>
|
|
This should make the usage of gbp-pq more flexible and prevent mistakes
caused by e.g. running gbp-pq import under some subdirectory.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Return tar data as a generator object, if the 'output' option is not
defined.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
A step towards being able to run GBP tools from subdirectories.
Now expands '%(top_dir)s' and '%(git_dir)s' in config file path to root
of the working directory and git metadata directory, respectively.
Also, adds a new method _read_config_file() in preparation for
supporting per-tree config files.
Fixes tests.test_Config: currently the only correct way to define the
config file(s) to be parsed is by using the GBP_CONF_FILES environment
variable.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
This allows initialization of a GitRepository object, even if the
current working directory (or path given to GitRepository) is not the
top level directory of the git repository.
Don't guess the git meta data dir, but, take it as reported by git
itself.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
The new option can be used to "copy" files from the packaging branch to
the patch-queue branch when doing pq import. The files defined with this
option will appear as new files in one monolithic commit in the
development/patch-queue branch.
By default, the local gbp conf files are imported in order to try to
ensure that gbp sees the same settings on the patch-queue branch as
on the packaging branch.
NOTE: This option does not affect the importing (i.e. apply and commit)
of patches.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Initial version of gbp-pq-rpm - a tool for managing patch queues for rpm
packages. The functionality more or less corresponds to that of the
(Debian) gbp-pq. The only major difference probably being (in addition
to the obvious of working with .spec files instead of debian/) is that
patches are always imported on top of the upstream version, not on top
of the packaging branch (which might not even contain any source code).
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Olev Kartau <olev.kartau@intel.com>
|
|
For selecting whether to dump all the files recursively or just the top
level directory of the tree.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Simple wrapper to the git-status command.
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Make difference between regular files and directories, eliminating the
requirement of listing directories in the file list.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
This is a method of getting the filename and status information of a
diff. That is, a list of files that changed and their status, "added",
"modified" etc.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
So that it can be re-used by the upcoming pq-rpm tool.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Preventing a infinite recursion which can be triggered by gbp pq export
--commit.
|
|
Closes: #761160
|
|
This avoids spurious error messages during test runs.
|
|
to avoid pristine-tar showing up in the matched branches
|
|
Initial version of the git-import-srpm: a tool for importing source
rpms.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
|
|
Implements a new gbp.rpm module that contains functionality for e.g.
parsing and editing spec files, reading src.rpm files rpm-specific
packaging policy etc.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
Signed-off-by: Huang Hao <hao.h.huang@intel.com>
|
|
Thanks: Sandro Tosi
Closes: #748339
|
|
This allows us to build an internal list of valid options and print
these.
|
|
|
|
This only allows to print single config values so far.
Closes: #733470
|
|
revealing another bug where we overwrote parsed values with defaults
Closes: #733759
|
|
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
This avoids file name collisions and weired files in the working copy.
|
|
The dch tool might not report it's version if it is incorrectly
compiled. Create a dummy changelog and parse it "manually" to determine
the default urgency level.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Closes: #739888
|
|
This would otherwise overwrite values set in the legacy config sections.
Closes: #733759
|
|
Determine the default urgency level by determining the version number of
the dch tool from command line.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Closes: #732384
|
|
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>
|
|
Change-Id: Ida67f9640624a92ffc1afd90dc33efe01b38db5c
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Prevent some confusing name clashes.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
Change-Id: I0ba9e6b59e2a819b5cde1be6fbb53b8ecbb67025
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
For consistency and better assert error messages.
Change-Id: Ie6502daac6cee0176db5f099b91803292c17ceea
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
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>
|
|
For better assert messages.
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>
|