tag2upload: Actually recognise and honour --quilt in tag

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 junk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: Don't crash on --quilt=baredebian

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 reflog

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'

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-test

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.3

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Finalise 9.2 (no source changes)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: start 9.2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: finalise 9.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Minor adjustment to git-debpush discussion

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Add a couple of missing entries

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: Remove comment saying it's a prototype

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 section

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

git-debpush: Don't pretend to support --baredebian+tarball

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>

changelog: Update

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

git-debpush(1): Fix POD formatting

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

test suite: unset CDPATH

This can cause tests to pass which should fail (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Test git-debpush --upstream=

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debpush: Defend against git-deborig #931509

Without this, when git-deborig fails and #931509 isn't fixed,
git-debpush will silently exit with a nonzero exit status which is
very unfriendly.

With this change it does something like this:
  git-debpush: git-deborig failed; maybe try git-debpush --upstream=TAG
  fatal: Invalid object name 'refs/tags/couldn't find any of the following tags'.
It then exits status 127.  This is obviously daft, but making this
any better is even more complex.

When git-deborig is fixed it will do this:
  couldn't find any of the following tags: 1.0, v1.0, upstream/1.0
  tell me a tag or branch head to make an orig.tar from: git deborig --just-print '--version=1.0-1' COMMITTISH
  git-debpush: git-deborig failed; maybe try git-debpush --upstream=TAG
which is still not brilliant but I guess it will do.

The downside, if it is one, is that we lose git-deborig's original
exit status.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>

test suite: tagupl: Drop an unused variable

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debpush: Support --upstream=TAG (and document it)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debpush: Defend against unexpected git-deborig output

If git-deborig prints something other than a tag name, for example an
error message (see #931509), this approach will bomb out, roughly
appropriately.

This will also become useful when we make upstream_tag overrideable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>

git-debpush: Change comment heading

IMO "Principles of Operation" would be a comprehensive reference
detailing the model and functionality.  I think "Design Principles"
is the conventional name for semi-self-imposed choices/constraints.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>

test suite: t-tagupl-test: Check that salsa master was pushed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl-native: Drop obsolete todo comment

We do now test all these, in tests/tests/tagupl.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: t-tagupl-test: Use "salsa" as the source

This checks that push pushed the tag(s) there.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: t-tagupl-run-drs: New source parameter

Change all callers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl*: Drop use of --no-push

Now we do actually push.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: t-tagupl-setting: Provide a "salsa" remote

This will give git-debpush somewhere to push to.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl*: Run t-tagupl-settings in $p

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debpush: Fixes to help with pushing native packages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Entry for new "git-push-to-upload" workflow tools

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

dgit-repos-server: tag2upload: Clarify key situation comments

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Check Source mismatch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Test changelog version

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Check changelog info

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Update version when needed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Test lack of signature

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Test signature verification fail.

This test case is broken because it doesn't call t-tagupl-run-drs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: raw-mangled: Use 1.0-2 tagname in raw-mangled

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: raw-mangled: Fix mangled tagger test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: raw-mangled: Break out

No functional change.

This test case is broken because it doesn't call t-tagupl-run-drs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: A few more error case tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Better message from upstream mismatch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Check the upstream tag syntax only once

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Verify the tag slightly earlier

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: A few more error case tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Improve a message

Could be multiple distro=, in which case any matching is OK.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Drop an obsolete comment

The usage comment says this script should be retried.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Test an email: version mismatch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Improve a reject message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: log when we fail and email

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Use a different strategy to avoid fsck fail

This leaves us with a $p directory which is often convenient

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Test a really broken tag

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Break out and soup up log moving

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Test some wrong tag names

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Break out next-mangle

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: test one bad tag

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl-*: Break out t-tagupl-run-drs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Drop a debug $_ from quit message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Use a bpd and clean up origs

This prevents us keeping forever the junk from uploads, and it
prevents us reusing it too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl-native: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: tag2upload: Cope with native packages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debpush: Numerous improvements

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

git-debpush: Tolerate not specifying a quilt mode if not needed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: Break out t-tagupl-*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Drop a now-irrelevant chunk of commented code

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: Use git-debpush

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debpush: new binary package

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

git-debpush(1): new manpage

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

dgit(1): Fix reference in description of --quilt=auto

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

d/copyright: Update copyright years

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

debian/rules: Break out specpkg_install_common

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: Provide DGIT_DEBPUSH_TEST

No user yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debpush: new script

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Do not translate tag subject lines

These are parsed by dgit-repos-server.
Translating them breaks things.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: tagupl: New test case for new dgit-repos-server mode

Currently we hand-synthesise a suitable tag.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: New prototype tag2upload mode for git-debpush

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: Provide a stunt dgit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: Break out t-chain-test-somehow

This will be used for when we want to source tests/lib from
some program run by a test.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test site: Provide a stunt sendmail

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: drs-git-ext: Honour DGIT_DRS_MODE

This is a bit of a kludge, but it will do for present purposes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: parsetag_general: Switch to $distrofn

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: parsetag_general: Abolish $mainfn, use readtag

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: Break out readtag

No functional change other than to debug output.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: parsetag_general: New argument $need_distro

No functional change with the existing call site.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: Break apart parsetag()

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: Prepare for modes which take arguments

Currently none do.  Both the existing mode_ subroutines check @ARGV,
so this has no overall change other than to error messages.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-repos-server: Break out basic_tag_checks

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Include dgit tag metadata in maintainer view tag too

This is for the use of git-debpush and other tools which want to
figure out the quilt mode from the git history.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: tags: Add missing blank lines to messages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Move tag metadata calculation earlier

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Allow -p with various push modes

This checks the supplied package name against the changelog.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Dgit.pm: Move $suite_re from dgit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Include quilt mode in archive/ tag in split view

After this, a program examining this tag can see one of the following
possibilities:

"split --quilt=<splitting>"
   splitting quilt view, `3.0 (quilt)'

"split --quilt=<nonsplitting>"
   `3.0 (quilt)', mostly-dgit-compatible branch, but split view
   (bureaucracy commits not on maintainer branch)

"no-split --quilt=<nonsplitting>"
   `3.0 (quilt)', maintainer uses dgit branch

"split" / "no-split"
   non-`3.0 (quilt)'

No "split" or "no-split"
   generated by old versions of dgit, quilt transformation
   information not captured in machine-readable form

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: rpush protocol version 6: Include splitbrain param

And, in the push responder, check that we agree.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: rpush protocol: Actually select version 5 !

These must be most-preferred first, ie in reverse order.

Change the comment, to mention this.  The information about protocol
changes is in the detailed protocol description.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: determine_whether_split_brain: Make it take $format

Rather than returning it.  Adjust the two call sites.
No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: rpush: Move push_parse_dsc earlier

We are going to want this information sooner.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>