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>

dgit: push_mktags: Provide $format

No functional change.

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

dgit: Break out format_quiltmode_splitting

No functional change.

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

dgit: push_mktags: Refactor introducing @dtxinfo

No functional change.

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

dgit: push_mktags: Rename variable $dtxinfo

No functional change

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

changelog: Start 9.1

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

changelog: finalise 9.0

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

changelog: Expand on explanation of #930922

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

changelog: Tidy documentation of 9.0

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

changelog: Working on 9.0, run gbp-dch

Run
  gbp dch --since=dgit/dgit/sid --ignore-branch
and edit the results to be in the 9.0~ stanza.

Needs a lot of tidying before release.

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

changelog: start 9.0

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

changelog: pseudo-finalise 8.6~

We are going to add a new stanza for 9.0 but we aren't allowed
unfinalised entries in the middle of the changelog.  So finalise this
one with UNRELEASED.

When 8.6 actually goes out we will merge again and this will all be
more regular.

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

Merge branch 'buster'

changelog: Document the change so far

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

changelog: Retarget at buster

This is now the stable branch.

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

test suite: debpolicy-taintrm: Drop some xxx's

Testing without t-policy-periodic is probably more rigorous (and we
have other tests that do run it).  We don't want to duplicate this
test, as its value is probably not that great compared to its runtime.

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

test suite: debpolicy-taintrm: New test

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

dgit-repos-policy-debian: Add a tiny bit of debugging output

No other change.

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

dgit-maint-{merge,debrebase}(7): Using untagged upstream commits

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

dgit-maint-debrebase(7): Minor wording change apropos of #930956

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

dgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filter

This is better than just --stat for finding new and deleted files in a
new upstream release, which may need accounting for in d/copyright.

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

git-debrebase(1): typo fix

[ S-o-b added after checking with ntyni on irc -iwj ]

Signed-off-by: Niko Tyni <ntyni@debian.org>
Closes: #930215
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git-debrebase: fix convert-from-dgit-view argv handling

[ S-o-b added after checking with ntyni on irc -iwj ]

Signed-off-by: Niko Tyni <ntyni@debian.org>
Closes: #930214
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit(1): baredebian+git: Document this alias

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

test suite: baredebian-plusgit: New test for baredebian+git

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