summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | tests: import-r1clog: test missing date lineIan Jackson2023-10-29
| | | | | | | | | | | | Repro for #1054630. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: When importing origs, but changelog is busted, fall backIan Jackson2023-10-29
| | | | | | | | | | | | | | Fall back to using data from top changelog entry. Closes: #1054630 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Break out import_r1authline and change variable plumbingIan Jackson2023-10-29
| | | | | | | | | | | | | | | | | | | | | | Move the dicey parts into their own function. If there are no origs, or import_r1authline didn't obtain the top changelog entry, just call parsechangelog. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: error handling: Prepare for use of evalIan Jackson2023-10-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | tests: import-r1clog: new testIan Jackson2023-10-29
| | | | | | | | | | | | | | | | This lets us test various corner cases for imports. Right now it just checks that the synthetic commits importing -1 orig tarballs have the right date and author. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | clogp_authline: Pass through the changelog timezone to the commitIan Jackson2023-10-29
| | | | | | | | | | | | | | This is more stable: generated commits don't any more depend on the prevailing timezone at the time of the conversion. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | clogp_authline: Break out Date field handlingIan Jackson2023-10-29
|/ | | | | | Code motion. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 11.4Ian Jackson2023-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* document changes and finalise 11.3debian/11.3archive/debian/11.3Ian Jackson2023-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): --overwrite: Add cross reference to --split-viewIan Jackson2023-09-02
| | | | | | Apropos #1050713. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Detect tar-ignore in d/s/optionsIan Jackson2023-09-02
| | | | | | | | | | Distinguish situations where it's going to fail (until #908747 is fixed), from ones where we are probably working with a defective tree produced by importing a defective .dsc produced from a non-dgit upload. Closes: #1050709 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* get_source_format: Return an arrayIan Jackson2023-09-02
| | | | | | These options can accumulate. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* get_source_format: Call once somewhere, rather than twiceIan Jackson2023-09-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* get_source_format: Just save format in callers that don't need optionsIan Jackson2023-09-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* get_source_format: Allow callers to just get the format, not optionsIan Jackson2023-09-02
| | | | | | Use wantarray to distinguish the cases. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* d/source/options: Fix parsing to look for = not #Ian Jackson2023-09-02
| | | | | | | | | | But this is still not sufficient, because some dpkg-source options accumulate, so we mustn't just assign them. No change with existing code since right now we only test for single-debian-patch. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Prevent pushing old versions (test)Ian Jackson2023-09-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Prevent pushing old versionsIan Jackson2023-09-02
| | | | | | | | Bail out if the changelog version we are uploading is not strictly newer than the .dsc version in the archive. Closes: #1050711 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Prevent pushing old versions (prep)Ian Jackson2023-09-02
| | | | | | | | | Allow (but ignore) the --force option we're going to use. Apply it to two tests which play a bit fast and loose, (ie, which omit calls to dch to update the changelog version.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fix a minor formatting errorIan Jackson2023-09-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 11.3Ian Jackson2023-08-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document the contents of 11.2debian/11.2archive/debian/11.2Ian Jackson2023-08-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Use the old /updates security map for buster (Closes: #1050179)Matthew Vernon2023-08-22
| | | | | | | | | | | | | | The suite-map and suite-rmap for debian-security are necessary for the pre-bullseye layout of the security.debian.org archive. Since bullseye (i.e. after buster), the archive layout has changed, and these mappings are no longer necessary (indeed, they cause dgit clone to fail to work with bullseye and later security suites). Buster is the oldest suite still available on security.debian.org, so this is the only suite we still need the mapping for. Signed-off-by: Matthew Vernon <mvernon@wikimedia.org>
* changelog: start 11.2~Ian Jackson2023-07-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 11.1debian/11.1archive/debian/11.1Ian Jackson2023-07-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: manpages-format: Remove now-unneeded suppressionIan Jackson2023-07-20
| | | | | | | | Now there are no suppressions. But keep the machinery in case we need it later. See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1041317#22 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Adjust tbl formatting to avoid warningIan Jackson2023-07-20
| | | | | | | | | This moves the output text one space to the left, losing one space internally, which is fine. Closes: #1041317 Suggested-by: Branden Robinson <g.branden.robinson@gmail.com> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 11.1Ian Jackson2023-06-16
| | | | | | With a tilde. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 11.1Ian Jackson2023-06-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 11.0debian/11.0archive/debian/11.0Ian Jackson2023-06-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/tagupl: Cope with git 2.40 restrictionIan Jackson2023-06-14
| | | | | | Again, skip the test if we can't repro this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/tagupl: Rework raw-mangled to have proper error handlingIan Jackson2023-06-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document manpage fixIan Jackson2023-06-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,rebase}(7): See also gitrevisions(7)Ian Jackson2023-06-14
| | | | | | | | | Note the lack of a hyphen. Fixes commit 960c92eed9856cee "dgit-maint-{merge,rebase}(7): See also git-revisions(7)" Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,rebase}(7): See also git-revisions(7)Sean Whitton2023-06-14
| | | | | | | For help with some of the advanced git commands presented. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Pass --no-source-only-changes to sbuildIan Jackson2023-06-14
| | | | | | | | Now that bookworm is released, this is now supported even by old-old-stable. Closes: #904969 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Document test changes relating to git 2.40Ian Jackson2023-06-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/drs-push-rejects: Cope with t-make-badcommit failingIan Jackson2023-06-14
| | | | | | | | | git 2.40 rejects these. This means we don't any logner test that our push receiver also rejects them. That's OK, since we don't expect this to regress in our push receiver code before the server gets upgraded. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/drs-push-rejects: Cope with changed error message from gitIan Jackson2023-06-14
| | | | | | | git 2.40 prints a different message for trying to git-hash-object a tag without a valid `tag` line. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Abolish dgit-badcommit-fixupIan Jackson2023-06-14
| | | | | | | | | | | | | | | git 2.40 rejects the bad commits. This means we can no longer conveniently test this script. And it also means it is not likely that such a bug would be reintroduced. So: * Delete the script. * Delete its test case and remove it from debian/tests/control. * No longer install it. * Remove the lintian suppression for its lack of manpage. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 10.8Sean Whitton2023-02-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: finalise 10.7debian/10.7archive/debian/10.7Sean Whitton2023-02-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit, dgit-maint-merge(7): Merge README.source text into gen. headerSean Whitton2023-02-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit(1), dgit-maint-merge(7): Copy-edit changes since dgit 9.16Sean Whitton2023-02-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: Start 10.7Ian Jackson2023-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 10.6debian/10.6archive/debian/10.6Ian Jackson2023-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase status: Print upstream commitidIan Jackson2023-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Break out treated_anchor_msgIan Jackson2023-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): Remove launder-v0 from documentationIan Jackson2023-02-04
| | | | | | This was never really in a release and it doesn't deserve docs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): Add imprecation to call conclude or prepush, at topIan Jackson2023-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>