summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: finalise 9.5debian/9.5archive/debian/9.5Sean Whitton2019-07-22
|
* changelog: Bug close syntax fixSean Whitton2019-07-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: Minor fixesIan Jackson2019-07-22
| | | | | | Mention two omitted bug Closes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention Vcs-Git changeIan Jackson2019-07-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: UpdateSean Whitton2019-07-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: Check for a detached head when pushing HEADSean Whitton2019-07-22
| | | | | | | See discussion in #932612. Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: Check for unstitched git-debrebase branchSean Whitton2019-07-22
| | | | | | Closes: #932612 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* debian/control: Name salsa as our Vcs-*Ian Jackson2019-07-22
| | | | | | That is mostly what we are using now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Wrap a line and mention HACKING.Ian Jackson2019-07-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: UpdateSean Whitton2019-07-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: Check that patches are (un)applicableSean Whitton2019-07-22
| | | | | | Closes: #932477 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: check_treesame: Show diffstat when there is a diffSean Whitton2019-07-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: check_treesame: Also pass --quiet to 'git diff'Sean Whitton2019-07-22
| | | | | | | Otherwise, when using git-debpush in a terminal, the user will get a pile of unwanted diff output each time check_treesame is called. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* HACKING: First cutIan Jackson2019-07-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debpush: Do not spuriously print -sn/-skIan Jackson2019-07-22
| | | | | | | | When looking for -sn or -sk in debian/source/options, we need to not print it to stdout even if grep finds it. So use -q. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Acked-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush: use -m rather than -F- <<EOFIan Jackson2019-07-22
| | | | | | | | | | | | | | This means that a run with set -x shows the tag data that is being signed. The user can even then try it again. It will make it easier to do some kind of dry run, too, if we want to. We are really not in danger of hitting a command line length limit. (It also involves fewer syscalls, less use of /tmp etc., although that is really irrelevant here.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Acked-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit clone: No longer create an "origin" remoteIan Jackson2019-07-22
| | | | | | | | | | | | | | | | | | | | | This was a normal git remote pointing to the dgit git server. This is not really sensible because 1. it can't simply be pushed to 2. sometimes (if the package was never pushed with dgit) it doesn't even exist 3. it may be out of date with respect to the archive The effect of 2 is that it can break `git remote update'. This "git remote add" was introduced in 2013 in 39c6c123ab730d42ec7c9ed01c30e0175c7691e7 fix branch usage and was first included in 0.2. There doesn't seem to be any evidence of me having deeply considered the merits of this at the time. Closes: #932694 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Rename debian/3-1 tag to test-dummy/ in a test gitIan Jackson2019-07-22
| | | | | | | | | | Our distro is test-dummy. We are going to stop randomly fetching tags from the dgit git server, so the debian/ one would be omitted. Replace the tag with a fresh equivalent one and change the one use site. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-playtree-setup: Rename from git-playtree-createIan Jackson2019-07-21
| | | | | | | The name is from when I thought it would actually mkdir. But it doesn't. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-playtree-create: Fix with tests/using-intreeIan Jackson2019-07-21
| | | | | Reported-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* copyright: credit Genome Research LimitedMatthew Vernon2019-07-21
| | | | | | | | | I work for the Wellcome Sanger Institute, but am employed by Genome Research Limited, so it is they who should be credited in Copyright notices. Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk> Closes: #932630
* git-debrebase(1): Make this manpage a less intimidating entry pointSean Whitton2019-07-21
| | | | | | | | | | | | | | | | | | | | | - Nicer short description right in the first section. - Don't use the term 'delta queue' until it's needed. - Don't talk about other manpages so early. - Cater for people who type `man git-debrebase` looking for a barebones tutorial, not (just) a command line reference. - That tutorial should minimise references to dgit, especially since users might want to use git-debpush to upload. Thanks to Sam Hartman for the user feedback which prompted this and Ian Jackson for feedback on the content of "QUICK REFERENCE". Closes: #926656 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Abolish now-unused $t_local_git_cfg playtree_setup argIan Jackson2019-07-21
| | | | | | | | | | | This was there so that dgit's -c options would be honoured here. But now, we get this information via @git, which dgit adds -c options to, which we pass to git-playtree-create by invoking it via git. So this is no longer used and can be abolished. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-playtree-setup: Provide to git-debpushIan Jackson2019-07-21
| | | | | | | | Not used yet, so no overall functional change to the script. The .deb has a new file. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-playtree-setup: Rewrite in shell and call it from PerlIan Jackson2019-07-21
| | | | | | | | | | We want this because git-debpush is going to want this functionality but doesn't want to include (or have a copy of) Dgit.pm. The installation arrangements are rather ugly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* Dgit.pm: Provide @gitIan Jackson2019-07-21
| | | | | | | | | This clears the way for some parts of Dgit.pm to honour dgit's git invocation conventions. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-07-21
|
* git-debpush: Check upstream source is identical in the upstream tagSean Whitton2019-07-20
| | | | | | Closes: #932476 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-pbo(7): Add to .gitignoreIan Jackson2019-07-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-bpo(7): new manpageSean Whitton2019-07-20
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Closes: #857490
* git-debrebase(*): Fix references to dgit-maint-debrebase(7)Sean Whitton2019-07-20
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Closes: #932536
* git-debpush: Support forcing individual checksSean Whitton2019-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While using git-debpush interactively, if the user sees that checks have failed which they know to be safe to override, they typically just use --force or -f. However, it is useful for scripts to be able to skip single checks, and if the user knows that a check will fail in advance of running git-debpush, it is convenient to be able to specify that but still see whether other checks fail, where those failures were unexpected. This can avoid the user having to run git-debpush more than once. The list of any checks which failed but were overridden is not stored in the generated tag. git-debpush's checks are for the convenience of the local user only, and the list of failed but overridden checks is not considered to be metadata for the upload. Not recording failed but overridden checks in the git tag keeps git-debpush's checking independent of its wrapping of git-tag and git-push, which makes git-debpush simpler and easier to understand. The complexity is on the server side, in tag2upload. git-debpush(1): We want the list of checks that can be overridden to be at the bottom of the list of options because most users will not need to look at it. We also want the description of --force|-f to be adjacent to the description of --force=<check>. So move the description of --force|-f to the end of the list of options. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Closes: #932459
* git-debpush: SubheadersSean Whitton2019-07-20
| | | | | | No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debpush(1): Correct description of --forceSean Whitton2019-07-20
| | | | | | Checks are still performed, but turned from errors into warnings. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: start 9.5Ian Jackson2019-07-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* 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>