dgit(1): Mention need for dgit sbuild -A

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

dgit(7): Move autotools deletion para up

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

dgit(7): Updated `trouble' section to suggest deletion

Suggest having dpkg-source delete the autotools output (with a patch
if necessary).

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

dgit: When generating orig+debian/patches view, copy debian/ from HEAD.

This makes less noise in diffs.  Closes:#850095.

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

fetch and pull ignore the changelog suite when it is UNRELEASED.

Closes:#848646.

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

Honour dgit-distro.*.default-suite and dgit.default.default-suite.

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

dgit-maint-merge(7): Use debian/source/patch-header

Closes:849120

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

Provide `dgit print-dgit-repos-server-source-url'.

Re:#850521.

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

dgit: clone-dgit-repos-server: Set $access_forpush

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

dgit-sponsorship(7): Use --no-dep14tag

While this complicates the sponsor's workflow a little, it simplifies
the sponsee's workflow: they don't have to decide whether to delete
DEP-14 tags that other guides have told them to create.

Closes:#849105.

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

dgit(7): Document new Dgit syntax

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

dgit(1): Document new config options

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

git fetching: git_lrfetch_sane: Tidy up old suite-based refs

We should look for these and delete them, when we have the chance,
because otherwise nothing ever would.

For now we just use $csuite if we have it, and otherwise do nothing.

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

changelog: Document import Dgit field parsing fix

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

changelog: Document nominal distro syntax restriction

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

changelog: Document lrfetchrefs change

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

test suite: t-tstunt: When looking for real thing, strip stunt from PATH

Otherwise if we run this again in a fresh environment, the wrapper may
be on PATH even though DGIT_TEST_REAL_<FOO> is not set.

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

test suite: downstream-gitless: Add missing dependency on reprepro

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

test suite: gnupg: Do not reset DGIT_TEST_REAL_GPG_AGENT

Otherwise it might end up pointing to the wrapper, if we run the setup
twice for some reason (for example, in an adt run).

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

test suite: Test --no-chase-dsc-distro

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

test suite: Mark the start of t-ok

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

dgit(1): Document --[no]-chase-dsc-distro

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

test suite: protocol-compat: Even more solid checks

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

test suite: protocol-compat: Soup it up a lot

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

dgit: Dgit parsing: tolerate newlines etc. not just one space

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

test suite: protocol-compat: Do not tolerate debian lookups

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

dgit: Dgit parsing: honour dgit.default.old-dsc-distro

test suite: protocol-compat: New test (wip)

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

test suite: Support varying debian alias

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

test suite: downstream-gitless: Run t-ok

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

test suite: Fail tests if we look up any debian config

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

dsc import: Do not look anything up in default distro

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

test suite: import-dsc: Fix and uncomment missing object test

As promised in
   test suite: import-dsc: Comment out missing object test for now
we can now fix and re-enable this test.

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

dgit: Dgit handling: Honour --no-chase-dsc-distro

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

dgit: config handling: better debugging

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

dgit: conflg handling: Undocumented --config-lookup-explode= feature.

For testing.

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

dgit: Support distro aliases

We are going to use this to spot when we accidentally look up "debian"
information in the test suite.

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

test suite: downstream-gitless: Test import-dsc

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

dsc import: Call resolve_dsc_field_commit

No functional change

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

test suite: import-dsc: Comment out missing object test for now

We are about to teach dgit how to fetch this object, so this will
unexpected pass.  Later we will provide a way to turn off that
behaviour, and uncomment this again.

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

dsc import: Reorganise to make room for resolve_dsc_field_commit

No functional change

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

dsc import: Assign $package earlier

No functional change

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

test suite: downtream-gitless: Add some rewriting

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

test suite: New test downstream-gitless (wip)

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

test suite: lib-reprepro: Introduce t-reprepro-includedsc

No functional change.

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

dgit; dsc Dgit field handling: Properly resolve the commit in the dsc

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

git fetching: git_lrfetch_sane: Support multiple calls

We want to be able to fetch from some other distro, or a bit more from
the same one.

No functional change since no callers pass trueish $supplementary.

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

git fetching: git_lrfetch_sane: Introduce my $url

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

git fetching: Tidy up a redundant list in git_lrfetch_sane

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

git fetching: Do not crash if nothing we wanted to fetch exists

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

dgit: Improve -DDDD config debugging

Print default values too, when they are looked up and used.

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

git fetching: Fix debugging output after function rename

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

dgit: config debugging: do not print ARRAY(0x...)

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

Dgit.pm: git_cat_file: clarify scalar context semantics

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

git fetching: Use basedistro for lrfetchrefs

These do not need to vary with the suite, because the refs are named,
within this namespace, after the corresponding refs on the server.

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

git fetching: Move lrfetch* down in the file

Code motion only.

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

git fetching: Break out git_lrfetch_sane

No functional change.

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

dgit: dsc Dgit field handling: Break out resolve_dsc_field_commit

No functional change.

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

dgit: dsc Dgit field handling: Parse additional data

So far we don't do much with it, so this akes no change except to
messages.

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

dgit: Dgit parsing: Move @ourdscfield loop into parse_dsc_field

This gives it the $dsc.  Also it means that import-dsc will understand
very old .dscs with Vcs-Dgit-Master.

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

dgit: Enforce a syntax for nominal distros

These appear in various interchange output like tags.  They should be
sane.  They're going to appear in Dgit: too where people will need to
use them.

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

dgit: Dgit parsing: Refactor into parse_dsc_field

No functional change other than changes to messages.

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

Protocol change: Add distro info to Dgit field

Downstream clients may need this to get the relevant git commits.
Worse, with the new rewrite functionality, they may get the _wrong_
commits because they may not be rewritten.

For now we implement the publication side.  The reader side is
theoretically straightforward, but probably not so simple in reality,
and certainly fiddly to test.

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

dgit: Option parsing: Move notpushing call in fetch/pull

We should use the calculated $idistro and $isuite

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

dgit: Option parsing: combine parseopts_late_defaults and finalise_opts_opts

No functional change.

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

dgit: Option parsing: Move parseopts_late_defaults textually

No functional change.

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

dgit: Option parsing: Fix distro/suite reference bugs

By moving parseopts_late_defaults call.

This is conceptually the same as finalise_late_opts, so do it there.
We have to add a missing call to build_prep_early, as otherwise we
call massage_dbp_args too soon.

Also move a nopushing() call until after $isuite is set

All of this means that we now honour $isuite (and sometimes $idistro)
much better.

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

dgit: Option parsing: Make function parseopts_late_defaults

No functional change.

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

dgit: Option parsing: Provide call to build_prep_early in build_source

This means $isuite is set a bit earlier, etc.

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

dgit: Option parsing: quilt-fixup: Use build_prep_early

This means $isuite is set early enough.

As a side-effect, we correctly reject -p.

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

test suite: Allow overriding of -dtest-dummy dgit argument

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

test suite: lib-reprepro: Allow configuring for another distro

We can now make a second `distro' this way, with some additional
optional arguments.

No functional change for existing call sites.

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

test suite: lib-reprepro: Add a couple of comments

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

test suite: Refactor lib-reprepro

* Break out t-reprepro-cfg.
* Introduce the variables `mir' and `etcapt' to many functions.

No functional change.

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

test suite: Add t-stunt-parsechangelog to a few tests which were missing it.

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

test suite: Parse Dgit: field properly (look for initial \w+ only)

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

dgit: import-dsc: Parse `Dgit:' field properly, using only \w+

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

test suite: gbp-orig: Add a missing -m

Without this, it would run an editor if stdout was a tty (!)

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

dgit-badcommit-fixup: Do not investigate symrefs

Closes:#850547.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit-badcommit-fixup:
* Do not investigate symrefs.  Closes:#850547.

test suite: lib-orig-include-exclude Strip block count out of find -ls

This is unstable!  I have just seen it vary spontaneously in the
middle of a test run, resulting in this:

 ++ diff -u ../before ../after
 --- ../before   2017-01-08 21:39:48.176033763 +0000
 +++ ../after    2017-01-08 21:39:48.208033833 +0000
 @@ -1,2 +1,2 @@
 -   208380      4 -rw-rw-r--   9 ian      ian           236 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig-docs.tar.gz
 -   208381      4 -rw-rw-r--   8 ian      ian           373 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig.tar.gz
 +   208380      4 -rw-rw-r--  10 ian      ian           236 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig-docs.tar.gz
 +   208381      4 -rw-rw-r--   9 ian      ian           373 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig.tar.gz
 + test 1 = 0
 + t-report-failure

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

test suite: lib-orig-include-exclude: Introduce origs_findls

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

Arrange to pass --debug-quick-random to gpg-agent.

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

badcommit-rewrite: Fix operation using installed version of fixup.

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

test suite: Generalise DGIT_TEST_REAL_<FOO> handling

No overall functional change.

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

test suite: tests/run-all: Use a bit more cpu

Make allowance for tests that do a bit of downloading or whatever.

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

changelog: start 2.17~ (again)

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

changelog: finalise 2.16.2

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

dgit-badcommit-fixup; In --check mode, exit status 2 if things are not fine

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

dgit-badcommit-fixup: Fix crash when running for 2nd time in bare repo.

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

changelog: start 2.17~ (again)

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

changelog: finalise 2.16.1

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

dgit-badcommit-fixup: New mode --check which is readonly.

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

changelog: start 2.17~

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

changelog: finalise 2.16

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

dgit-badcommit-fixup: Put our version in our rewrite map commit message

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

dgit-badcommit-fixup: Skip our own output refs

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

dgit-badcommit-fixup: Instructions comment

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

Shell bug: avoid local=$(....) as it defeats set -e

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

test suite: badcommit-rewrite: Check HEAD manipulation is right

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

dgit-badcommit-fixup: Do not detach HEAD - this is not needed

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