summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: finalise 9.4debian/9.4archive/debian/9.4Ian Jackson2019-07-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Update copyright notices in many filesIan Jackson2019-07-20
| | | | | | Mostly, adding 2019. Also adding some missing credits to Sean Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/copyright: Add some missing credtisIan Jackson2019-07-20
| | | | | | | | | | | Frans Spiesschaert (.nl translation) Matthew Vernon / Sanger Institute Paul Hardy Information obtained by hand from git. This should have been done much earlier. If only we had some tool for this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: read-only access to the Ubuntu Cloud Archive (Closes: #932322)Matthew Vernon2019-07-20
| | | | | | | | | | | | | This adds -d ubuntucloud for the Ubuntu Cloud Archive (see https://wiki.ubuntu.com/OpenStack/CloudArchive for details thereof). Access is by the aptget: query mechanism, suites are spelled like bionic-updates:train or bionic-proposed:train, additionally the shorthand bionic:train for bionic-updates:train is allowed. Closes: #932322 Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: move suite name check to after suite rmapMatthew Vernon2019-07-19
| | | | | | | | | | The Ubuntu Cloud Archive has Codenames of the form bionic-updates/train (the / in which suitere doesn't match); this can be corrected by suite rmap, so apply that before doing the suitere sanity check. Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tag-to-upload tests: Tolerate a changed git messageIan Jackson2019-07-19
| | | | | | | | | | | git changed Couldn't find remote ref to couldn't find remote ref and this broke our test case. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Closes: #932475
* test suite: tag-to-upload tests: Make message checks regexpsIan Jackson2019-07-19
| | | | | | | No functional change yet. All the existing message strings are already equivalently valid when interpreted by egrep. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tag-to-upload tests: Set LC_MESSAGES in with-mangledIan Jackson2019-07-19
| | | | | | | | | t-expect-fail would do this but we aren't using it here, so we need to do it explicitly. This will avoid the tests failing in some locales. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 9.4Ian Jackson2019-07-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalis 9.3debian/9.3archive/debian/9.3Ian Jackson2019-07-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes for tagupl-gbpIan Jackson2019-07-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tagupl-gbp: New testIan Jackson2019-07-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: t-debpolicy: mkdir -p the git repoIan Jackson2019-07-18
| | | | | | | This makes t-debpolicy compatible with (eg) setup imports that already made a $tmp/git. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: splitbrain: "bad b/p" prints more infoIan Jackson2019-07-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: setup/gbp: Make the result the master branchIan Jackson2019-07-18
| | | | | | | | This means we can drop --git-ignore-branch from gbp-orig. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: break out tests/setup/gbpIan Jackson2019-07-18
| | | | | | | | This creates a fairly usual set of gbp style git branches/tags. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: t-gbp-example-prep: Drop t-tstunt-parsechangelogIan Jackson2019-07-18
| | | | | | | And hoist it into all callers. In fact there is only one caller that doesn't have it already. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document dgit(1) archive-query docIan Jackson2019-07-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1) document the presence of the aptget archive-query methodMatthew Vernon2019-07-17
| | | | | | | | | This is already used for debian-security, and might be useful for other archives that like madison or similar (e.g. the Ubuntu Cloud Archive). Closes: #932321 Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
* git-debpush: refactor to avoid more than one push commandSean Whitton2019-07-17
| | | | | | No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: update for tag-to-upload server-side fixesIan Jackson2019-07-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: update for git-debpush improvementsSean Whitton2019-07-17
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: check that upstream tag is ancestor of $branchSean Whitton2019-07-17
| | | | | | Closes: #932096 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: gather some information earlierSean Whitton2019-07-17
| | | | | | | | For use by sanity checks. Pure code motion. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: cope with spaces in user-supplied upstream tagSean Whitton2019-07-17
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: check for target suite change since last uploadSean Whitton2019-07-17
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: check for pushing the dgit view to the maintainer viewSean Whitton2019-07-17
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: factor out find_last_tag()Sean Whitton2019-07-17
| | | | | | | | Also determine the last debian/ tag earlier, for use by sanity checks. No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: introduce and call fail_checkSean Whitton2019-07-17
| | | | | | | | | | | | | | Without this, passing --force to override an earlier sanity check might cause the user to miss the output of a later sanity check, which would never get run. We don't want to have multiple forcing options to override different sanity checks, as that is too much complexity for a script like this. So always run all checks, and error out afterwards if at least one of them failed. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: tagupl-baredebian: New testIan Jackson2019-07-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: baredebian: Break up baredebian-test-coreIan Jackson2019-07-17
| | | | | | | For a baredebian tag-to-upload test, we're going to want to replace the push. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: printcmd: Print in one goIan Jackson2019-07-17
| | | | | | | | | | | | | | | | | | | | | | | Sometimes this message is used to report failure of `git fetch' etc. But when such operations fail, they may interleave output from the remote git, which typically prints fatal: The remote end hung up unexpectedly (referring to the local end as the `remote' end, from its point of view), after the the local end printed its message and failed. This sets up a race between Dgit.pm's printcmd and the message from the remote. If we're really unlucky, the remote's message interrupts the output from printcmd. We can avoid the within-line interleaving - at least, the interruption of our message - by printing the whole message in one go, so do that. (Strictly, the approach we use here only ensures that the message appears in a single write(2) call if it fits in the stdio buffer.) One of our test cases (tagupl) depends on this message not being split and has a small chance of failing without this fix. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: baredebian: Move the quilt fixup forwardIan Jackson2019-07-17
| | | | | | | | | We are going to split this function up so that our caller can do the push via tag-to-upload. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tag2upload: baredebian: Pass dgit refs/tags/, not the commit hashIan Jackson2019-07-17
| | | | | | | | | This will enable git to report the upstream tag in its messages. The tag name is safe to pass here since dgit only uses its referent, unless it is nice enough to print. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: resolve_upstream_version: Report tag, where sensibleIan Jackson2019-07-17
| | | | | | | | | | | | | This affect what is show in commit messages (including the parseable parts) made by dgit and git-debrebase. Now they prefer to refer to the tag name if the caller specified refs/tags/ and the tag name is a nice one. This is not expected to make much difference for human callers (who will probably not explicitly qualify their tag refs). But it will make a difference for scripts. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tag2upload: Actually recognise and honour --quilt in tagIan Jackson2019-07-17
| | | | | | | | | Non-default quilt modes were completely broken before. We only didn't notice because the existing tests worked with the default. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-repos-server: parsetag: Print a bit more debug about junkIan Jackson2019-07-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-repos-server: Don't crash on --quilt=baredebianIan Jackson2019-07-17
| | | | | | | The die needs to be qualified. This little bit of fcode has never worked. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: reflog_cache_insert: Use ensurepath for the reflogIan Jackson2019-07-17
| | | | | | Otherwise quilt fixup can fail in a too-fresh git tree. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Provide `ensurepath'Ian Jackson2019-07-17
| | | | | | | | | | Like `ensuredir' but also a bit like a more controlled `mkdir -p'. We use make_path from File::Path. It dies on failure. No caller yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tagupl-*: Move t-pushed-good out of t-tagupl-testIan Jackson2019-07-17
| | | | | | | | We are going to want to do this separately in some cases. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 9.3Ian Jackson2019-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 9.2 (no source changes)debian/9.2archive/debian/9.2Ian Jackson2019-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 9.2Ian Jackson2019-07-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.1debian/9.1archive/debian/9.1Ian Jackson2019-07-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Minor adjustment to git-debpush discussionIan Jackson2019-07-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Add a couple of missing entriesIan Jackson2019-07-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-repos-server: Remove comment saying it's a prototypeIan Jackson2019-07-07
| | | | | | | We have done everything to make it safe to use. Obviously it still needs some web service queue thing around it to invoke it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debpush(1): Tweak AUTHOR sectionSean Whitton2019-07-07
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: Don't pretend to support --baredebian+tarballSean Whitton2019-07-07
| | | | | | | | | Instead of just deleting the option from the argument parser, accept it, but print a message explicitly stating that the *quilt mode* is not supported by this workflow (i.e. it's not just git-debpush passing the quilt mode on to tag2upload that we don't support). Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>