aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* rpm_ch: Escape \S in regex replacementGuido Günther2018-12-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the \S in the substitution. Otherwise we fail on Python3.7 like ====================================================================== ERROR: Test determining the author name/email ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/lib/python3.7/sre_parse.py", line 1021, in parse_template this = chr(ESCAPES[this][1]) KeyError: '\\S' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/var/scratch/src/git-buildpackage/git-buildpackage/tests/component/rpm/test_rpm_ch.py", line 182, in test_author eq_(mock_ch([]), 0) File "/var/scratch/src/git-buildpackage/git-buildpackage/tests/component/rpm/test_rpm_ch.py", line 37, in mock_ch '--spawn-editor=never'] + args) File "/var/scratch/src/git-buildpackage/git-buildpackage/gbp/scripts/rpm_ch.py", line 422, in main since = get_start_commit(ch_file.changelog, repo, options) File "/var/scratch/src/git-buildpackage/git-buildpackage/gbp/scripts/rpm_ch.py", line 230, in get_start_commit since = guess_commit(changelog.sections[0], repo, options) File "/var/scratch/src/git-buildpackage/git-buildpackage/gbp/scripts/rpm_ch.py", line 180, in guess_commit options.changelog_revision) File "/usr/lib/python3.7/re.py", line 192, in sub return _compile(pattern, flags).sub(repl, string, count) File "/usr/lib/python3.7/re.py", line 309, in _subx template = _compile_repl(template, pattern) File "/usr/lib/python3.7/re.py", line 300, in _compile_repl return sre_parse.parse_template(repl, pattern) File "/usr/lib/python3.7/sre_parse.py", line 1024, in parse_template raise s.error('bad escape %s' % this, len(this)) re.error: bad escape \S at position 7
* gbp-pull: Invoke gbp pq correctly for --redo-pq optionSimon McVittie2018-12-29
| | | | | | | | `gbp pull --redo-pq` assumed that `gbp-pq` exists in PATH, which isn't normally true since 0.6.24 (2015). Signed-off-by: Simon McVittie <smcv@debian.org> Closes: #917637
* zsh completion: Fix typo in redirection to _gbp-import-dscSimon McVittie2018-12-29
| | | | | Signed-off-by: Simon McVittie <smcv@debian.org> Closes: #917636
* Fix typoChris Lamb2018-12-29
| | | | Closes: #914280
* push: Push Debian branch firstGuido Günther2018-12-17
| | | | | | This makes sure in new repos this is the correct default branch. Closes: #916651
* PatchSeries: Don't fail if there's only a patch end markerGuido Günther2018-12-16
| | | | | | | | If the patch only has '---' we pass empty data to git-mail-info otherwise. Thanks: James Cowgill for the detailed report Closes: #916545
* Document changes and release 0.9.12debian/0.9.12Guido Günther2018-12-11
|
* import_ref: Fix warningGuido Günther2018-12-11
|
* Document changes and release 0.9.11debian/0.9.11Guido Günther2018-12-11
|
* gbp-import-ref: Add warningGuido Günther2018-12-11
| | | | | | | This is still experimental but let's ship it since it's useful in some cases already. Gbp-Dch: Ignore
* gbp.deb: Correct "otherwise" spelling in commentKen Dreyer2018-12-10
|
* Fix "was build" typosChris Lamb2018-12-09
| | | | Closes: #916044
* import-orig: rename sourcepackage to nameGuido Günther2018-11-24
| | | | since it's the source package's name
* PristineTar: Don't fail if pristine-tar does't support signaturesGuido Günther2018-11-24
|
* PristienTar: Properly detect signature featureGuido Günther2018-11-24
|
* DebianSource: Drop unused variableGuido Günther2018-11-24
|
* Make it simple to print exception detailsGuido Günther2018-11-24
|
* pristine-tar: support checking in/out upstream signaturesGuido Günther2018-11-24
|
* pristine-tar: detect signature verification supportGuido Günther2018-11-24
|
* Deduplicate version_mangle_reGuido Günther2018-11-23
|
* buildpackage, export-orig: support version substitution for --git-tarball-dirLuca Boccassi2018-11-23
| | | | | | | | | 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>
* Refresh tests data submoduleLuca Boccassi2018-11-23
|
* PatchSeries: Only pass patch description and header to git-mailinfoGuido Günther2018-11-08
| | | | | | | | | | | | | | 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
* GitRepository: Make git_inout available everywhereGuido Günther2018-11-08
|
* docs: update references from <http://dep.debian.net> to ↵Arnaud Rebillout2018-11-02
| | | | <https://dep-team.pages.debian.net>.
* setup.py: Fix gbp problem when installed with pipKiss György2018-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | when installed with "pip install gbp" it will be installed as version "0.0" because the released version doesn't have a debian/changelog file, so it will be installed with a warning: balabit-bbos-tools 1.0.0 has requirement gbp==0.9.8, but you'll have gbp 0.0 which is incompatible. and will cause an Exception when using gbp from a setuptools entrypoint script: File "/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages/pkg_resources/__init__.py", line 574, in _build_master ws.require(__requires__) File "/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages/pkg_resources/__init__.py", line 892, in require needed = self.resolve(parse_requirements(requirements)) File "/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages/pkg_resources/__init__.py", line 783, in resolve raise VersionConflict(dist, req).with_context(dependent_req) pkg_resources.ContextualVersionConflict: (gbp 0.0 (/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages), Requirement.parse('gbp==0.9.8'), {'requiresgbp'}) This is because pkg_resources checks every dependency version and if it doesn't match with the egg-info, it raises this Exception. Instead, we try to parse the debian/changelog first, then load the version, or if the debian/changelog file doesn't exists (this is the case at pip install) we read the gbp/version.py and parse the version from it. There is a "round trip check", which means the parsed version is written, then it will be read back immediately to see if there is any problem.
* builpackage-rpm: Use GBP_TMP_DIR instead f GBP_BUILD_DIRGuido Günther2018-10-28
| | | | | | This is consistent with --git-post-export and unbreaks tests/component/rpm/test_buildpackage_rpm.py:TestGbpRpm.test_hook_options
* buildpackage{,-rpm}: add preexport hookLuca Boccassi2018-10-28
| | | | | | | | | | | | | | | 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>
* Fix flake8's W605 (invalid escape sequence)Guido Günther2018-10-15
| | | | | | See also https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
* Ignore flake8's 'W504 line break after binary operator'Guido Günther2018-10-15
| | | | | | | | | | | | | | With flake8's other warnings this doesn't make much sense since indentation accoding to https://hg.python.org/peps/rev/3857909d7956 does not work. It triggers - 'W503 line break before binary operator' - 'E129 visually indented line with same indent as next logical line' If one want to align the operators one hits - 'E127 continuation line over-indented for visual indent' So let's leave things as is for the moment.
* repository: Remove superfluous blank lineGuido Günther2018-10-15
| | | | | | to make flake8 happy Gbp-Dch: Ignore
* PkgPolicy.symlink_orig: also remove dangling symlinksAndreas Beckmann2018-09-21
|
* hook: Fix harmless typoAndreas Beckmann2018-09-21
| | | | Gbp-Dch: Ignore
* debian.source: Enumerate components only onceAndreas Beckmann2018-09-21
|
* buildpackage: Unify 'extract' messagesAndreas Beckmann2018-09-21
| | | | Gbp-Dch: Ignore
* tests: small fix for import-orig-rpm component testMarkus Lehtonen2018-09-20
| | | | | | | | | | | | 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>
* travisci: Test Python 3.7 as wellGuido Günther2018-09-17
| | | | | | | | Use the workaround from https://github.com/travis-ci/travis-ci/issues/9815 since Python 3.7 is not yet supported by the default image.
* gbp.git: fix doctest with recent python-dateutil.Markus Lehtonen2018-09-17
| | | | | | Traceback format has changed in recent python-dateutil. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* pq: Fix testcaseGuido Günther2018-08-24
| | | | Pseudo headers are now moved to the top of the patch.
* pq import: Always put DEP-3 headers as pseudo-headersBen Hutchings2018-08-24
| | | | | | If there are any non-git DEP-3 header fields, put them at the top of the body text, regardless of whether Description or Subject is used. Also put a blank line between them and the rest of the message body.
* pq import: Look for DEP-3 header fields even if git mailimport succeedsBen Hutchings2018-08-24
| | | | Closes: #905934
* Add test case for bug #905934Ben Hutchings2018-08-24
|
* Add test case for conversion of extra DEP-3 headers to pseudo-headersGuido Günther2018-08-24
| | | | | Currently the extra DEP-3 headers may end up as trailers instead of should be pseudo-headers.
* import-orig: Allow to import the requested version with --uscanMathieu Parent2018-08-24
| | | | Closes: #741148
* New command to merge in changes from a upstream using gitGuido Günther2018-08-19
| | | | This reverts commit 3384a0f7a763144e5d627c454d7d76c2841e553b.
* Document changes and release 0.9.10debian/0.9.10Guido Günther2018-08-19
|
* Depend on sensible-utilsGuido Günther2018-08-19
| | | | gbp-dch uses sensible-editor.
* Make flak8 happyGuido Günther2018-08-19
| | | | Gbp-Dch: Ignore
* Revert "gbp import-ref: New command to merge in changes from a upstream ↵Guido Günther2018-08-19
| | | | | | | | using git" This reverts commit 1592882c38fcbb107332d9a0a63b8da4e0bf8a48. It's not ready yet.
* GitRepository.grep_log: Switch to GitArgsGuido Günther2018-08-17
| | | | Gbp-Dch: Ignore