Dgit: forkcheck_*: break out from setup_sigwarn

Other places are going to want this too, notably END blocks.

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

changelog: start 3.2~

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

changelog: finalise 3.1

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

test suite: Arrange not to overwrite .save-env on t-chain-test

We want .save-env to be the env on entry to the original test, not
on execution of t-chain-test with a modified environment.

Without this the effects of t-defdistro might leak into the execution
of tests/setup/examplegit.  This is no good because
tests/setup/examplegit relies in the -dtest-dummy which is our usual
dgit runes.  (Or to put it another way, examplegit uses many suites
which are not (yet) set up properly by t-defdistro.)

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

dgit: buile_prep_early: Call notpushing() after getting $isuite

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

dgit: dsc download handling: save as ,fetch if need be

* Pass \$refetched to complete_file_from_dsc, so that we refetch files
  whose hashes are wrong.

* When saving files we refetched, save them as F,fetch if saving them
  as F gives EEXIST.  So we can save refetched files.

* When looking for files to reuse, look for F,fetch first.

We do this only here in generate_commits_from_dsc, not in
ensure_we_have_orig.  This is because, in practice, this all won't be
very effective for origs which need to be referred to by various
.dscs.

The main use case is when the user did a build without changing the
version number.  This would otherwise break fetch: Closes:#850824.

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

dgit: complete_file_from_dsc: Introduce $refetched

Make have a option which, if set, causes hash mismatches to result in
a refetch rather than a crash.

No functional change because no call sites pass it.

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

dgit: complete_file_from_dsc: Reorganise $fetchhash

No functional change.

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

dgit: complete_file_from_dsc: Introduce $checkhash

No functional change.

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

dgit: generate_commits_from_dsc: Introduce $upper_f

No functional change.

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

changelog: Fix entry referring twice to refs/dgit-fetch/DISTRO

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

dgit: After downloading .debian.* files, save them in `..', too

Ie do this not just for .origs.  We don't want the user needlessly
re-downloading them on each fetch.

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

test suite: defdistro-import-dsc: New test

Add test for import-dsc with default distro.  (Detects #850781.)

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

dgit: import-dsc: Add missing call to notpushing().

Avoids crashing with undefined $isuite.  Closes:#850781.

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

dgit: Do not nedlessly re-fetch the rewrite map.

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

changelog: start 3.1

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

changelog: finalise 3.0

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

test suite: defdistro-mirror: Add missing dependency

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

test suite: defdistro-rpush: Remove workaround for missing isuite param

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

dgit: rpush: Use $isuite for $isuite, not $csuite

Send isuite as a parameter, and use it if it's provided, instead of
csuite.  This means config lookups like
    dgit-distro.SUITE.distro
only need the user-provided suite name (eg `unstable'), and don't need
to be duplicated for the canonical name (eg `sid').

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

test suite: Test that default distro works

Ie check that dgit-distro.SUITE.distro works

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

test suite: Provide t-defdistro (for use with t-alt-test)

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

dgit: $isuite handling: Defer calls to access_* until first `want'

pushing, rpush_handle_protovsn_bothends, and quiltmode, all depend on
access_*.  For that we need $isuite, but we only get that (in the form
of $csuite) from the build host.

We can move all of these calls into i_resp_want, which is called the
first time the build host actually wants something from us.

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

dgit: $isuite fixes: defer pushing and rpush_handle_protovsn_bothends in rpush

We mustn't call pushing until we have parsed the arguments enough to
find $isuite.  So remove the call to pushing from
cmd_remote_push_build_host.  Now we rely on cmd_push's call to
pushing, which it does after the argument parsing.

We then need to move rpush_handle_protovsn_bothends (which implicitly
calls accesss_*) too, until we have got $isuite and called pushing().
We can move that into dopush.

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

dgit: rpush: suppress changelog tag format check

The changelog might be received (and therefore parsed) before we have
been told the suite.  So we can't check the tag format because we
cannot know the distro yet.

Simply suppress this early check.  If the tag format is wrong, we will
discover this later.

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

dgit: Option parsing: Move pushing call in push

Otherwise $isuite might not be set when we call access_something.

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

dgit: rpush: Provide $we_are_initiator

No functional change yet.

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

changelog: Tidy a bit

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

changelog: Mention #850519 re docs updates

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

changelog: Document dgit(1) changes.

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

dgit(1): Fix --force-import-dsc-with-dgit-field

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

dgit(1): Clarify --no-chase-dsc-distro

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

dgit(1): --overwrite: say in title that it's optional

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

dgit(1): Remove stray sentence.

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

dgit(1): Remove comment about retries

Error messages now tell the user the situation.

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

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>