| Commit message (Collapse) | Author | Age |
|
|
|
| |
This makes flake8 happy
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With post-unpack scripts is currently possible to filter out files that are
not needed from the upstream branch, however it is not possible to use it to
filter files that will end up in the orig file, and in some scenarios this
is not easily doable just using a filter list.
So, run the post-unpack hook just after unpacking and before repacking the
tar.
Add tests to verify this both when using with regular --filter option
and by itself.
Closes: #812721
|
|
|
|
|
| |
Use an $GBP_SOURCES_DIR to expose the post-unpack sources dir to the hook.
Include a test that checks that all the expected env variables are set.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We used the tests to check whether the right exception was returned but
python 3.8 breaks this again:
File "/var/scratch/src/git-buildpackage/git-buildpackage/tests/doctests/test_GitVfs.py", line 56, in test_read
Failed example:
gf = vfs.open('doesnotexist') # doctest:+ELLIPSIS
Expected:
Traceback (most recent call last):
...
OSError: can't get HEAD:doesnotexist: fatal: Path 'doesnotexist' does not exist in 'HEAD'
Got:
Traceback (most recent call last):
File "/var/scratch/src/git-buildpackage/git-buildpackage/gbp/git/vfs.py", line 74, in open
return GitVfs._File(self._repo.show(
File "/var/scratch/src/git-buildpackage/git-buildpackage/gbp/git/repository.py", line 1645, in show
raise GitRepositoryError("can't get %s: %s" % (id, stderr.decode().rstrip()))
gbp.git.repository.GitRepositoryError: can't get HEAD:doesnotexist: fatal: path 'doesnotexist' does not exist in 'HEAD'
<BLANKLINE>
During handling of the above exception, another exception occurred:
<BLANKLINE>
Traceback (most recent call last):
File "/usr/lib/python3.8/doctest.py", line 1329, in __run
exec(compile(example.source, filename, "single",
File "<doctest test_read[12]>", line 1, in <module>
gf = vfs.open('doesnotexist') # doctest:+ELLIPSIS
File "/var/scratch/src/git-buildpackage/git-buildpackage/gbp/git/vfs.py", line 78, in open
raise OSError(e)
OSError: can't get HEAD:doesnotexist: fatal: path 'doesnotexist' does not exist in 'HEAD'
Doctest were a nice feature but keeping up with the subtle breackage is
too cumbersome.
|
|
|
|
|
|
|
| |
Add option `--upstream-signatures=[on|auto|off]` to export-orig.
Add option `--git-upstream-signatures=[on|auto|off]` to buildpackage.
Closes: 872864
|
| |
|
| |
|
| |
|
|
|
|
| |
This gives us signature data
|
|
|
|
|
| |
This will help on upstream tarball signatures as well as
improving additional tarball handling.
|
|
|
|
|
| |
This is a valid use case in overlay mode
Thanks: Thomas Koch for the report
|
|
|
|
| |
Closes: #941894
|
|
|
|
|
| |
The working directory of the hook is the top temporary directory the
tarballs are being unpacked into.
|
|
|
|
|
|
|
| |
As a result of 74669f0925b7c3d08a735d4e302b656b766d15cf we don't parse
these out anymore (but don't need them either)
Gbp-Dch: Ignore
|
|
|
|
|
|
|
|
| |
If the patch only has '---' we pass empty data to git-mail-info
otherwise.
Thanks: James Cowgill for the detailed report
Closes: #916545
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Add support for passing %(version), %(hversion) and %(version%A%B) in
buildpackage --git-tarball-dir and export-orig --tarball-dir.
Closes: #909266
Signed-off-by: Luca Boccassi <bluca@debian.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are patches around that use
Content-Transfer-Encoding: base64
but the actual patch after '---' is unencoded ascii resulting in garbage
after the patch description when imported into a patch queue.
Since we're discarding the patch part of git-mailinfo anyway don't pass
this on in the first place.
Closes: #912426
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Sometimes it is necessary to perform operations before preparing the
tarballs and exporting to the build directory.
One such case is when having to handle extremely large binary assets in
the orig tarball and at the same time complex packaging code, which
makes it desirable to separate the two into different repositories for
easier handling.
A pre-export hook allows to ensure that the tarball repository is
present and checked out at the correct branch.
Closes: #909266
Signed-off-by: Luca Boccassi <bluca@debian.org>
|
|
|
|
|
|
| |
See also
https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
|
|
|
|
|
|
|
|
|
|
|
|
| |
Merge behaviour in newer git versions (> v2.16) is slightly different.
This broke one test with an error something like:
Traceback (most recent call last):
File "tests/component/rpm/test_import_orig_rpm.py", line 243, in test_misc_options
eq_(len(repo.get_commits(until='pack')), 3)
AssertionError: 2 != 3
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
| |
Pseudo headers are now moved to the top of the patch.
|
| |
|
|
|
|
|
| |
Currently the extra DEP-3 headers may end up as trailers instead of
should be pseudo-headers.
|
|
|
|
| |
This reverts commit 3384a0f7a763144e5d627c454d7d76c2841e553b.
|
|
|
|
| |
Gbp-Dch: Ignore
|
|
|
|
|
|
|
|
| |
using git"
This reverts commit 1592882c38fcbb107332d9a0a63b8da4e0bf8a48.
It's not ready yet.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When there is a merge commit in this branch, we currently get the
warning:
gbp:warning: Unknown compression type of Merge branch 'pristine-tar' into 'pristine-tar', assuming gzip
because we're grepping the commit logs to find out the compression type
of the tarballs in there.
For now, we can just use `git log ... --no-merges' to not see these
commits.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Closes: #906331
|
|
|
|
| |
If the remote branch does not exist at all that's currently not fatal.
|
|
|
|
| |
Gbp-Dch: Ignore
|
| |
|
| |
|
|
|
|
|
|
|
| |
Push of tag and or branch can be skipped by setting
--{upstream,debian}-{branch,tag}='' .
Closes: #899234
|
|
|
|
|
| |
This is more in line with what `git config` does and eases usage in
scripts.
|
|
|
|
|
|
| |
This changes the tarballs and therefore the checksums.
This reverts commit fd81e454339de50931594bd150857eb88a516a98.
|
|
|
|
|
|
|
|
| |
Add some additional skipIf statements, checking for the existence of the
debchange tool. Makes it possible to run unit tests in an environment
that doesn't have devscripts installed.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
|
|
|
|
|
| |
Add new have_cmd() helper for checking if a command is available,
and, a skip_without_cmd() decorator for skipping tests in case a command
is missing. Convert existing checks for commands to use these new
functions.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
| |
|
|
|
|
| |
so it can be reused in gbp import-ref
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
and not using pristine-tar.
Gives a 50% speedup on my machine:
$ time gbp export-orig --no-pristine-tar --force-create
gbp:info: Creating thunderbird_52.6.0.orig.tar.xz from 'upstream/52.6.0'
gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-thunderbird-l10n.tar.xz' from 'dea43c2b49f11d68f05edac2bd9d6c5d1e1f4bcb'
gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-lightning-l10n.tar.xz' from '9adcd261726ccb160c4fd6947f7cbfe9df2e581b'
real 8m27,153s
user 7m23,717s
sys 0m3,015s
0|agx@bogon:/var/scratch/debian/icedove/icedove (debian/wheezy)$ time gbp-from-sourcetree export-orig --no-pristine-tar --force-create
gbp:info: Creating thunderbird_52.6.0.orig.tar.xz from 'upstream/52.6.0'
gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-thunderbird-l10n.tar.xz' from 'dea43c2b49f11d68f05edac2bd9d6c5d1e1f4bcb'
gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-lightning-l10n.tar.xz' from '9adcd261726ccb160c4fd6947f7cbfe9df2e581b'
real 4m3,080s
user 11m18,733s
sys 0m3,499s
Thanks: Carsten Schönert for the suggestion
Closes: #888572
|
|
|
|
|
|
|
|
| |
This allows to test for certain features more easily and to
use it not only in the error case.
Using two different streams allows us to test that messages still
end up on stderr or stdout correctly.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now gbp buildpackage-rpm is able to update the 'VCS:' tag in the exported
spec file. A new config option 'spec-vcs-tag' controls the format:
- if empty, no 'VCS' tag is inserted and possible old 'VCS' tag is
removed
- otherwise, a 'VCS' tag is inserted or the old 'VCS' tag is updated
The spec-vcs-tag is a format string which supports the following
keywords:
- '%(commit)' expands to the full commit sha1
- '%(commitish)' expands to the sha1 of the exported object (commit or
tag)
- '%(tagname)s' expands to the long tag name (from git-describe)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
|
|
|
|
| |
This updates all remote-tracking branches (for the remote that is
fetched from) whose local branch name is identical to the remote branch
name.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
| |
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
|
|
| |
Similar to what the option does in git-import-orig.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|
|
|
|
|
|
| |
Corresponding the --skip-debian-tag options of import-dsc.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
|