summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* lintian: Override some checksIan Jackson2019-09-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mannpage message on line 51 is warning: file `<standard input>', around line 51: table wider than line width and refers to this line dgit-maint-gbp(7) for maintainers already using git-buildpackage which does in fact fit (just) in an 80-column xterm. I hope dgit-badcommit-fixup is never going to be needed enough again to need a manpage. I don't agree that trailing whitespace in changelog is a problem. Remaining messages from lintian -EI --pedantic --no-tag-display-limit --suppress-tags=syntax-error-in-debian-changelog,changelog-empty-entry ../bpd/dgit_9.9~_multi.changes are as follows: W: dgit source: missing-debian-source-format I: dgit source: older-source-format 1.0 I don't agree that source format 1.0 is wrong. There are difficulties with 3.0 native (for example, that it forbids non-native versions) so 1.0 must continue to be used so that it continues to exist. I also don't agree that missing source format is a problem. The semantics are well defined. P: dgit source: package-uses-old-debhelper-compat-version 9 W: dgit source: unnecessary-testsuite-autopkgtest-field I like to keep things backwards compatible for a much longer time than most people. jessie is currently oldoldstable and has dh 9. P: dgit source: no-dep5-copyright I don't have effort for this. I think it is largely busywork but I would accept a patch. I: dgit: package-contains-empty-directory usr/share/man/man5/ Avoiding this is awkward. W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-mirror-rsync W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-admin-debian W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-policy-debian W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-policy-trusting W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-server W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-ssh-dispatch In principle manpages for some of all of these would be good. But the usefuless of these programs is largely limited to people whose requirements are extremely similar to Debian's. Most people can just use a normal git server. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: update Vcs-Git to end in .gitIan Jackson2019-09-08
| | | | | | | | | | In https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888809 Paul Wise writes Salsa redirects git to URLs ending in ".git/" and redirects browsers to the URL not ending in ".git/" or ".git". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: Drop redundant Priority fieldIan Jackson2019-09-08
| | | | | | Found by lintian. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Extend extended description.Ian Jackson2019-09-08
| | | | | | | Mentioning what the competition is may help both discoverability and useability. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Fix a typo (found by lintian)Ian Jackson2019-09-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: Bump Standards-VersionIan Jackson2019-09-08
| | | | | | | | | | | | | | | | | I have been through the upgrading checklist. I came across two things which were mentioned but which I haven't implemented: * nodoc build option. It's not clear to me whether this is superseded by the nodocs build profile. If we wanted to bootstrap using dgit, the build profile would probably be better. * using ${perl:Depends}. I looked into this briefly and dh_perl doesn't seem to DTRT right now: it doesn't spot any of the modules we use. I'm not sure why and have decided to punt on this for now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: Change priority of dgit-infrastruture to extraIan Jackson2019-09-08
| | | | | | Pursuant to policy upgrading checklist. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,debrebase}(7): Use git fetch --tags upstreamSean Whitton2019-09-08
| | | | | | | | | We recommend using a remote called 'upstream' and so we can recommend a command which will be faster and less likely to error out. Closes: #939679 Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: start 9.9Ian Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.8debian/9.8archive/debian/9.8Ian Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes since 9.7Ian Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-09-06
|
* test suite: Check that archive skew machinery reports warningIan Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Check that archive skew machinery succeedsIan Jackson2019-09-06
| | | | | | | | This is actually the point of this test case. perling $tmp/aq/package... is a bit of a bodge, but fine. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Once again cope with archive skewIan Jackson2019-09-06
| | | | | | | | | | | | | | | Since our http rearrangements, we have lost the ability to try multiple dsc versions which means we cope badly with archive skew. This was an editing error: in 7821907696db dgit: Abolish url_get in favour of url_fetch we omitted to notice that url_get implicitly does what url_fetch needs Ok404 to do. So we didn't add the Ok404 parameter. Fix this by adding it now. Closes: #935874 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: clone-skew: Test for accessing mirror via httpIan Jackson2019-09-06
| | | | | | | | | | This test is misnamed right now, but really we are going to make it do something interesting. Right now it just sets everything up to access the mirror via http rather than file://. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: t-archive: Honour t_archive_ln_sIan Jackson2019-09-06
| | | | | | | | This will let us arrange to use cp instead. No functional change for existing callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: curl: pass CURLOPT_FOLLOWLOCATIONIan Jackson2019-09-06
| | | | | | | This was accidentally dropped in the 9.6 http changes. Closes: #939564 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,debrebase}(7): Use git fetch --all --tagsSean Whitton2019-09-05
| | | | | | | | | | | | | | | `git remote update` doesn't fetch tags unless remote branches include the commits at which those tags point. Thus, if upstream pushes their release tag but fails to push their master branch, `git remote update` will not fetch the release tag. I've been in this situation more than once when following the workflows detailed in these manpages, so let's just recommend a command which will definitely try to fetch the latest release tag. Closes: #939504 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test already-tagged checkIan Jackson2019-09-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fail early when the archive/ tag already exists.Ian Jackson2019-09-05
| | | | | | | | | Suggest using a new version number. We need a new --force option to override this check. Closes: #935802 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add --force-reusing-version to many testsIan Jackson2019-09-05
| | | | | | | This is going to be needed in a moment. Unknown --force options are harmless and just generate warnings, so we do this in advance. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Another semantic linefeedIan Jackson2019-09-05
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Warn when we see what look like our options passed too lateIan Jackson2019-09-05
| | | | | Closes: #934807 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Use distro-info-data to resolve unknown suites to distrosIan Jackson2019-09-05
| | | | | Closes: #931212 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Some semantic linefeedsIan Jackson2019-09-05
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Use $tarball_f_ext_re for test_source_only_changesIan Jackson2019-09-05
| | | | | | | The old ad-hoc regexp doesn't match .tar.gz.{asc,sig}. Closes: #939280 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit: Break out $tarball_f_ext_re.Ian Jackson2019-09-05
| | | | | | | | We are going to reuse this. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): Tiny typo fixIan Jackson2019-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 9.8Ian Jackson2019-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.7debian/9.7archive/debian/9.7Ian Jackson2019-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document chages since 9.6Ian Jackson2019-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-08-11
|
* dgit: vcs-git handling: Strip [...] a la Haskell TeamIan Jackson2019-08-11
| | | | | | | | | | The final syntax of this is not yet agreed but this regexp ought to do the right thing in all reasonable cases. (Ie, no [ ] inside the [ ].) See also #932696 against policy, which is discussing the spec. Closes: #932699 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: update-vcs-git: Use vcs_git_url_of_ctrlIan Jackson2019-08-11
| | | | | | So we strip -b fragments as we ought. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: update-vcs-git: Print a less confusing message if unchangedIan Jackson2019-08-11
| | | | | | | Previously, we would say it was "already configured" which is unspecific and sounds a bit like an error. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: update-vcs-git: Do not crash if url is unchangedIan Jackson2019-08-11
| | | | | | | Previously, we would pass an empty command array to runcmd, causing a mysterious-looking failure. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out vcs_git_url_of_ctrlIan Jackson2019-08-11
| | | | | | This should have been done before. No functional change so far. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fix on NFS (avoid leaking an open file in a directory to rm)Stéphane Glondu2019-08-11
| | | | | | | | | The file debian/source/format was open by "dgit fetch" but never closed, causing failure to remove the extracted tree on NFS. Closes: #933827 Signed-off-by: Stéphane Glondu <glondu@debian.org> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: alternating-dgit: New testIan Jackson2019-08-11
| | | | | | | | | | This tests alternating dgit and non-dgit uploads. These were broken by the bug #934126 (check_for_git always returns false), in the http rework, and not detected by the test suite (!) This test *does* break if check_for_git always returns false. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Use http git check for three existing testsIan Jackson2019-08-11
| | | | | | | | | | | | | | At the very least we want at least one test which fails when check_for_git is nobbled ad-hoc [1] to return 1. "clone-nogit" fits that bill (verified experimentally). Pick two other tests to enable this for, roughly arbitrarily. (Two tests which chain to clone-nogit are affected too.) Of course we also want a test which fails when check_for_git falsely returns 0. We don't have one right now. Coming up... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: WWW::Curl: Double check that $response_body was setIan Jackson2019-08-11
| | | | | | | We are making some assumptions about how WWW::Curl behaves. This confess, with appropriate tests, should catch any future problems. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: WWW::Curl Set $response_body to '' explicitlyIan Jackson2019-08-11
| | | | | | | | | | | | | | | check_for_git calls url_fetch with a WWW::Curl parameter CURLOPT_NOBODY which suppresses saving the body. The result is that CURLOPT_WRITEDATA does not update $response_body. Then, even on success, url_fetch returns undef (which ought to mean 404). Strictly this is a bit sneaky of check_for_git. But, rather than trying to make this interface more formal, just make url_fetch set $response_body to ''. It does return this except in the success case, so the error cases are still handled right. Closes: #934126 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: examplegit: Call t-select-packageIan Jackson2019-08-11
| | | | | | | | | | This can save our importers from havig to t-select-package themselves. Drop the now-redundant call from the one importer that had it. Various of the importers call t-archive-* or t-git-* that also call t-select-package, but this is not a problem. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Break out t-non-dgit-uploadIan Jackson2019-08-11
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: http-git-check: New provisionIan Jackson2019-08-11
| | | | | | | | | Importing this makes us use a local http server for the git check. It's a setup so that it can imply the http-git-check dependency. Right now nothing imports this so no functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Honour new DGIT_TEST_KEEP_MUSTCLEANIan Jackson2019-08-11
| | | | | | | | | | | FTR, using this typically results in runes like DGIT_TEST_KEEP_MUSTCLEAN=y tests/using-intree tests/tests/ftpmasterapi-http 2>&1 | tee tests/tmp/log hanging instead of exiting, because the http server is still running and its stderr is still going to tee. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Rename http-static-server from ftpmasterapi-Ian Jackson2019-08-11
| | | | | | | | We are going to use this for other things too. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* http[s] tests: Add http test caseIan Jackson2019-08-11
| | | | | | Maybe we will turn this into a TLS test case in due course. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* http[s] tests: Fix stdout handling in ftpmaster test serverIan Jackson2019-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>