aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* d/control: Bump standards versionHEADmasterGuido Günther6 days
| | | | no changes needed
* docs: Fix typosGuido Günther6 days
| | | | Thanks: lintian
* export-orig: Check 'origin/pristine-tar' as well for compression typeGuido Günther6 days
| | | | Closes: #941894
* docs: Fix wrong argument order of branch renameGuido Günther2019-09-24
| | | | | Closes: #941110 Thanks: Jens Reyer
* pq: Don't bubble up FileNotFoundExceptionGuido Günther2019-09-11
| | | | Closes: #940043
* Document changes and release 0.9.15debian/0.9.15Guido Günther2019-09-07
|
* gbp-clone: Support salsa: pseudo urlsGuido Günther2019-08-13
|
* Fix over intended linesGuido Günther2019-07-21
| | | | | | (rightfully tripping up newer flake8) Gbp-Dch: Ignore
* import-orig/merge_replace Avoid calling force_headMaximiliano Curia2019-07-21
| | | | | | The debian_merge_by_replace function ends up calling force_head, but up to this point the current branch could be anything, and thus when called from a feature branch the latest commits get lost.
* gbp.conf: Set default compresson to xzHideki Yamane2019-05-18
| | | | | The value is commented out so does not have any effect but it's better to recommend the right value.
* docs: import-dsc: Document --upstream-vcs-tagGuido Günther2019-04-26
|
* import_dsc: Support upstream-vcs-tagGuido Günther2019-04-26
| | | | Closes: #782886
* import_orig: Move upstream-vcs-tag's help to configGuido Günther2019-04-26
| | | | This way it can be shared.
* docs: Document gbp import-orig --postunpackGuido Günther2019-04-25
|
* import-orig: Allow to run a post unpack hookGuido Günther2019-04-25
| | | | | The working directory of the hook is the top temporary directory the tarballs are being unpacked into.
* Document changes and release 0.9.14debian/0.9.14Guido Günther2019-03-21
|
* tests: Drop mime headers from test caseGuido Günther2019-03-21
| | | | | | | As a result of 74669f0925b7c3d08a735d4e302b656b766d15cf we don't parse these out anymore (but don't need them either) Gbp-Dch: Ignore
* Dep3Patch: Ignore MIME headersSimon McVittie2019-03-21
| | | | | | | | | | | Otherwise, if we import a patch containing non-ASCII characters exported by `gbp pq export` or `git format-patch` using DEP-3 syntax, we'd misinterpret these fields as semantically significant and copy them into pseudo-headers, causing them to be duplicated in the commit's long description. Closes: #924478 Signed-off-by: Simon McVittie <smcv@debian.org>
* setup.py: Move version parser into setup.pyGuido Günther2019-03-19
| | | | This makes sure it ends up in the sdist tarball.
* Disable PGP signatures when retrieving list of commitsGabriel Filion2019-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gbp dch errors out with the following output if the "log.showSignature" git config is enabled: $ gbp dch --verbose gbp:debug: ['git', 'rev-parse', '--show-cdup'] gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] gbp:debug: ['git', 'rev-parse', '--git-dir'] gbp:debug: ['git', 'symbolic-ref', 'HEAD'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'tag', '-l', 'debian/2.7.3-2'] gbp:debug: ['git', 'tag', '-l', 'debian/2.7.3-2'] gbp:debug: ['git', 'log', '--pretty=format:%H', '-1', '--', 'debian/changelog'] gbp:info: Changelog last touched at 'gpg: Signature made Fri 01 Feb 2019 03:56:19 PM EST' gbp:debug: ['git', 'log', '--pretty=format:%H', 'gpg: Signature made Fri 01 Feb 2019 03:56:19 PM EST..HEAD', '--no-merges', '--'] fatal: bad revision 'gpg: Signature made Fri 01 Feb 2019 03:56:19 PM EST..HEAD' gbp:error: Error getting commits gpg: Signature made Fri 01 Feb 2019 03:56:19 PM EST..HEAD This is caused by gbp dch receiving unexpected output for the PGP signatures and trying to use this unexpected output. To avoid any surprises, let's disable signatures being output when we list commits. Also, when collecting a shortlog-like output from commit objects, the same unexpected PGP signature output is sprayed all over the changelog. We'll avoid this by also disable showing signatures when showing each commit's first line. Closes: #923087
* docs: Fix typoRoberto C. Sánchez2019-01-21
|
* Merge 414292838ac45665e36455a57ff034fddf5a3b7a into ↵Michael Prokop2019-01-18
|\ | | | | | | db9ce9fc5b5cf29c3c7df18d84540dd400d4bc6e
| * docs: update examples for pristine-tar usage, requiring commit actionMichael Prokop2019-01-18
|/ | | | Closes: #919677
* Document changes and release 0.9.13debian/0.9.13Guido Günther2018-12-29
|
* 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.