summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* dgit(7): Discuss file executability.Ian Jackson2018-01-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: archive-api-query: Avoid crashing due to lack of $isuiteIan Jackson2018-01-07
| | | | | | | | | | Otherwise: Use of uninitialized value $isuite in concatenation (.) or string at dgit line 705. This breaks the infrastructure. Closes:#886592. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 4.3Ian Jackson2018-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 4.2debian/4.2archive/debian/4.2Ian Jackson2018-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Set distribution to unstableSean Whitton2018-01-07
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: Document using dpkg-source to build source packagesSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Entry for push-source subcommandSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: push-source: new testsSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add library function t-push-was-source-onlySean Whitton2018-01-07
| | | | | | | No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Update some copyright infoSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Entry for build-source recommends using push-sourceSean Whitton2018-01-07
| | | | | | | | | If the user invokes build-source because they are going to upload, they should use push-source rather than push to benefit from the additional safety check that the upload is actually source-only. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Note that push-source doesn't need --rm-old-changesSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: New command: push-sourceSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Implement test_source_only_changesSean Whitton2018-01-07
| | | | | | | No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build_source bypasses dpkg-buildpackageSean Whitton2018-01-07
| | | | | | | | | | | | This is to avoid the inclusion of .buildinfo in the .changes. Quoting <https://lists.debian.org/debian-dpkg/2017/06/msg00005.html>: A .buildinfo file is not useful for a source-only upload which is veried to be identical to the intended source as present in the uploader's version control (eg, by the use of dgit). Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* quilt-gbp test: Set DGIT_TEST_TOLERATE_UNPATCHED_CLEANSean Whitton2018-01-07
| | | | | | | | | | | | | | | In quilt-gbp we want to test whether dgit detects that quilt fixups cannot be linear because the user has failed to pass an appropriate quilt option in a patches-unapplied tree. build_source() cleans before applying patches, and the package's clean target might error out because patches are not applied. This prevents dgit from attempting quilt linearisation and thus determining that the tree might be patches-unapplied. So set an environment variable telling the package's clean target not to do that. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* example_1.0 worktree: Accept DGIT_TEST_TOLERATE_UNPATCHED_CLEANSean Whitton2018-01-07
| | | | | | | | | | | | The clean target in the quilt-tip-2 branch in the example_1.0 worktree errors out if patches are not applied. With this change, if DGIT_TEST_TOLERATE_UNPATCHED_CLEAN is set to "true", it will not error out in this case. No users, so no functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Fix pod syntaxIan Jackson2018-01-07
| | | | | | | | This was broken in b405f072572fd2e4e2acaa94562b697bc639b86d dgit-maint-merge(7): Include instructions to clone existing repo Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib: t-git-fsck: put dgit-test-fsck.errs in git dirIan Jackson2018-01-07
| | | | | | | | | | This needs to not be in the working tree; it causes trouble there. This was broken in 090071ae8e31c8f81283af477c1114835ed8fd02 "test suite: Tolerate worktrees when trying to git-fsck" Reported-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: t-git-fsck: Introduce fsckerrs variableIan Jackson2018-01-07
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gnupg: Do not fail if we have no tty when we failIan Jackson2018-01-07
| | | | | | | Tolerate failure of the error log reporting arrangement. That way the retry loop is effective even if we don't have a tty. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gnupg: Fix sleep length in apt-get gpg --import caseIan Jackson2018-01-07
| | | | | | | This was supposed to sleep for 5 seconds _instead_. This is a kind-of-expected error and it's best to carry on a bit quicker. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document gnupg workaroundsIan Jackson2018-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: In ad-hoc runs, honour DGIT_TEST_RETRY_COUNTIan Jackson2018-01-07
| | | | | | | | | | | | | | This lets us retry each failed test. This is beneficial because the gnupg race is sort-of independent. When we want to test every commit, the success probability before is ( 1 - P(gnupg causes test fail)) ) ^ (number of tests) for each commit. With this change it's ( 1 - P(gnupg causes test fail)^retries ) ^ (number of tests) which is much much better. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gnupg: Do not count as "trouble" a 0-byte input file failureIan Jackson2018-01-07
| | | | | | | apt-key seems to feed gpg --import an empty pipe. This makes gpg exit with status 2. We think this is trouble, but it isn't. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gnupg: Save stdin on apt-key's import invocationsIan Jackson2018-01-07
| | | | | | | | | | | | Recognise these with an ad-hoc pattern on the command line arguments. When they occur, save stdin to a temporary file. We can't do this generally, because stdin might be some thing that gpg's caller doesn't expect gpg to eat. When we do this saving, print the size in bytes of the input file. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gnupg: Run with a lock heldIan Jackson2018-01-07
| | | | | | This is also an attempt to reduce the impact of the gnupg races. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Export troot as an environment variableIan Jackson2018-01-07
| | | | | | This will be useful in a moment. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gnupg: Have three goes, rather than twoIan Jackson2018-01-07
| | | | | | | | | The retry strategy is, empirically, fairly successful. But the failure probability is still high enough to be a real nuisance. Let's try running it a 3rd time if the second fails. Maybe this will reduce the overall impact. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gnupg setup: give each individual test its own AGENT.logIan Jackson2018-01-07
| | | | | | | | | | This was always the intent. However, the structure here arranged to put the actual value of GNUPGHOME into the import script. Instead, move the GNUGPHOME setting into the setup fragment, which is evaluated by the importer. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge branch stable into masterIan Jackson2018-01-07
|\ | | | | | | | | | | Also regenerate debian/tests/control Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 3.13debian/3.13archive/debian/3.13Ian Jackson2017-10-22
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Add missing `chiark-utils-bin' to Test-Depends.Ian Jackson2017-10-22
| | | | | | | | | | | | Not normally a visible bug because dgit-infrastructure depends on it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Add missing `use' for Dpkg::Compresson et al.Ian Jackson2017-10-22
| | | | | | | | | | | | | | Closes:#879526. Reported-by: Didier 'OdyX' Raboud Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Start 3.13~Ian Jackson2017-10-22
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: When source discrepancy involves mode changes, report them specially.Ian Jackson2018-01-06
| | | | | | | | | | | | Closes:#886442. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix suggested diff rune in split brain modeIan Jackson2018-01-06
| | | | | | | | | | | | | | | | | | | | | | In split brain mode, with unexpected diffs, print dgit view commitid in suggested diff rune. HEAD is wrong in this case. Closes:#886443. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix message about missing quilt cache entryIan Jackson2018-01-06
| | | | | | | | | | | | | | | | Should refer to HEAD rather than tree, since dgit needs a commit. Closes:#884646. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | debian/control: Remove dependency alternative on realpathIan Jackson2018-01-06
| | | | | | | | | | | | That package last existed in Debian wheezy. Closes:#877552. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit(1): Add a bit more rationale (polemic, even). Closes:#874221.Ian Jackson2018-01-06
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit-user(7): Recommend mk-build-deps rather than apt-get build-dep.Ian Jackson2018-01-06
| | | | | | | | | | | | | | Closes:#863361. Suggested-by: Nikolaus Rath <Nikolaus@rath.org> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: mention dgit-*(7) changeIan Jackson2018-01-06
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit-*(7): --deliberately-not-fast-forward for first dgit pushSean Whitton2018-01-06
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | changelog: mention dgit-maint-merge changes (more)Ian Jackson2018-01-06
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit-maint-merge(7): Include instructions to clone existing repoSean Whitton2018-01-06
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | changelog: mention dgit-maint-merge changesIan Jackson2018-01-06
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit-maint-merge(7): Mandate pushing upstream branch to aliothSean Whitton2018-01-06
| | | | | | | | | | | | | | | | | | | | | | In the case where we are using gbp-import-orig(1) to maintain a virtual upstream branch, we must push that branch somewhere. It is needed whenever we import a new upstream release. Thanks to Johannes Schauer for pointing out that the manpage previously said that pushing to alioth is always optional. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | dgit-maint-merge(7): Restructure "NEW UPSTREAM RELEASES"Sean Whitton2018-01-06
| | | | | | | | | | | | | | | | | | | | Previously, some instructions applicable and needed whether or not upstream tags releases in git were given only for the case where upstream tags releases in git. Thanks Johannes Schauer for noticing this problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | dgit-maint-merge(7): Configure --merge-mode for gbp-import-orig(1)Sean Whitton2018-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For 3.0 (quilt) source packages, gbp-import-orig(1) defaults to --merge-mode=replace, which does the wrong thing for patches-applied repositories (see gbp-import-orig(1)). Note that we do override this when importing the first upstream version. This is needed because git-merge(1) will refuse to merge unrelated histories. Thanks to Johannes Schauer for reporting the problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | dgit-maint-merge(7): Create an empty branch for upstream sourceSean Whitton2018-01-06
| | | | | | | | | | | | Thanks to Johannes Schauer for finding the problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>