aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp
Commit message (Collapse)AuthorAge
* 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.
* 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.
* 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.
* 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>
* 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
* 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
* 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
* import_ref: Fix warningGuido 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>
* 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
|
* 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
* 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
* 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 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
* 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.
* 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
* Ignore merge commits when looking at the pristine-tar branchIain Lane2018-08-17
| | | | | | | | | | | | | | | | 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
* pull: allow to set up branch tracking for missing branchesGuido Günther2018-08-08
| | | | If the remote branch does not exist at all that's currently not fatal.
* clone: split out remote name logicGuido Günther2018-08-08
| | | | Gbp-Dch: Ignore
* GitRepository: api doc fixesGuido Günther2018-08-08
| | | | Gbp-Dch: Ignore
* pull: Check that repo is clean before fetching anythingGuido Günther2018-08-08
|
* create_remote_repo: import urllib.parseCarsten Schoenert2018-06-10
| | | | | | urllib.parse did not get imported in packaegs without changelog. Signed-off-by: Guido Günther <agx@sigxcpu.org>
* changelog: try iso8859-1 when utf-8 failsGuus Sliepen2018-06-07
| | | | | | | | Fall back to iso8859-1 when opening the changelog. Helps when importing old versions. Closes: #900841 Signed-off-by: Guido Günther <agx@sigxcpu.org>
* import-{dsc,orig}: Make --download deprecation text more usefulChris Lamb2018-06-05
| | | | | | | | Point to the manpages for usage examples. Closes: #900606 Signed-off-by: Guido Günther <agx@sigxcpu.org>
* gbp import-ref: New command to merge in changes from a upstream using gitGuido Günther2018-05-24
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 13:52:54 +0000