summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
* | test suite: dpkgsourceignores-docs: Correct restrictionIan Jackson2018-01-06
| | | | | | | | | | | | | | | | | | | | Restrictions need to be invoked in test suites with t-restrict NAME-OF-RESTRICTION not by calling t-restrction-something. Only the former gets translated to the format used in debian/tests/control. Reported-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: document Sean's changesIan Jackson2017-08-15
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix trailing whitespaceSean Whitton2017-08-15
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | changelog: Fix typoSean Whitton2017-08-15
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | changelog: start 4.2Ian Jackson2017-08-15
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: finalise 4.1debian/4.1archive/debian/4.1Ian Jackson2017-08-14
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: Document test suite changesIan Jackson2017-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gitworktree: Test quiltificationIan Jackson2017-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gitworktree: Add some more operationsIan Jackson2017-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: dpkgsourceignores-correct: Test that the rune DTRTIan Jackson2017-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: dpkg_source_ignores: Exclude the right set of thingsIan Jackson2017-08-04
| | | | | | | | | | | | | | | | | | Change the dpkg-source -i argument to exclude exactly the right set of things. (Sadly this is not a simple rune.) Previously we might exclude `foo.git', for example ! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Properly shellquote --git-builder argument to gbpIan Jackson2017-08-04
| | | | | | | | | | | | | | | | This is about to contain more exciting shell metacharacters. (Even now, it is wrong without quoting as we end up telling gbp to pass -i.git/ rather than -i\.git/ to dpkg-source.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: dpkgsourceignores-docs: Use print-dpkg-source-ignoresIan Jackson2017-08-04
| | | | | | | | | | | | Rather than fishing the value out of the in-tree dgit source code. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: print-dpkg-source-ignores actionIan Jackson2017-08-04
| | | | | | | | | | | | | | New print-dpkg-source-ignores option to print the big rune you need to pass to dpkg-source to make it work exactly the right. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: dpkgsourceignores-docs: Check dgit-maint-merge(7) -i -I runeIan Jackson2017-08-04
| | | | | | | | | | | | Check that the rune we document is the same as dgit actually uses. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit-maint-merge(7): Add ' ' around -i\.git/Ian Jackson2017-08-04
| | | | | | | | | | | | | | | | | | | | This manpage should present a shell rune, not a half-quoted thing whose interpretation is left as a tricky exercise to othe reader. The ' ' protect the \ so that it would actually get passed to dpkg-buildpackage. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit-maint-merge(7): Reformat slightlyIan Jackson2017-08-04
| | | | | | | | | | | | | | Introduce semantic newlines around the dpg-buildpackage -i -I rune. This will make it easier to test. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Break out -i -I rune into a variableIan Jackson2017-08-04
| | | | | | | | | | | | | | There is also an instance in dgit-maint-merge.7.pod but that's trickier to unify. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: Break out t-dgit-manpageIan Jackson2017-08-04
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: stunt gnupg: Much better logging of race errorsIan Jackson2017-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: stunt gnupg runs gpg again if it exits status 2Ian Jackson2017-08-04
| | | | | | | | | | | | | | | | | | Work around gnupg agent connection races by having our stunt gpg wrapper simply try running gpg again, once, if it exits 2. This does not fully suppress the bug but it does significantly reduce the probability. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: Make t-dgit print pwd to stderr, not stdoutIan Jackson2017-08-03
| | | | | | | | | | | | | | This means that tests can capture the output from t-dgit without going wrong. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: Document worktree supportIan Jackson2017-08-03
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 13:33:54 +0000