Split brain: Check that archive supports "maint", earlier

Otherwise the user will be disappointed shortly.

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

Test suite: Make t-newtag specify maint too

Since actually several tests which use t-newtag are quilty split brain
ones which technically require it, although nothing checks this right
now.

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

Test suite: Test --overwrite (without VERSION)

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

Overwrite: Document --overwrite option (without VERSION)

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

Overwrite: Support --overwrite without a version

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

dgit: getfield, parsechangelog: Fix two bugs in error reporting

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

Overwrite: Refer to $i_arch_v->[0] twice in plain_overwrite_pseudomerge

We are going to allow $overwrite_version to be "", in which case we
will have to use $i_arch_v->[0] instead.

Right now both are the same because if $overwrite_version is defined
(as it must be in plain_overwrite_pseudomerge),
pseudomerge_version_check will call infopair_cond_equal - so, no
functional change right now.

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

Pseudomerge: pseudomerge_make_commit: Lift up some message generation

Move the calculation of whether to put "--overwrite=" in the message
into the common code.

No functional change.

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

Overwrite: Fix messages referring to --overwrite-version

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

Test suite: Test --overwrite=VERSION

Overwrite: Document --overwrite=VERSION

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

Overwrite: Provide --overwrite=VERSION option

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

TODO.BRANCH: Check before doing split tag

Default config: Switch to new tag format only

There are probably not many users relying on the default config, so
push forward with it for the benefit of new users.

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

Ovewrite: Honour $overwrite_version in non-split-brain mode

Currently there is no commnad line option to set this, so there is no
way to exercise this functionality.

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

Pseudomerge: Break out pseudomerge_version_check and _make_commit

We are going to want to reuse these.  It's a bit tangled, but this
seems better than a single pseudomerge_make function with a bunch of
iffery.

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

Split brain: Better tag format filtering

The code only makes tag formats `old' and `new'.  Make it easier to
add a new tag format config item entry later.

No functional change with existing configurations.

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

dgit: infopair tag fetch: Support multiple tags

No functional change with existing callers.

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

dgit: Break out `infopair' functions

We are going to want to reuse these in a moment.

No functional change other than to debug output.

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

Split brain pseudomerge: Test $overwrite_version for definedness

Technically, `0' is a valid version number, but it is falsish.

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

Split brain: Only send rpush maint-view param if $maintviewhead

Fixes a bug where rpush would always make two tags even for a
non-`3.0 (quilt)' package.

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

TODO.BRANCH: Have quilt-splitbrains test now

Test suite: quilt-splitbrains: Comment

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

Test suite: quilt-splitbrains: Rename

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

Test suite: Test --quilt=unapplied and --quilt=dpm

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

Test suite: t-gbp-pushed-good: Refactor (nfc)

Provide various t-splitbrain-*.  These will be needed for tests of
--quilt=unapplied and --quilt=dpm.

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

dgit: Some extra error reports for wrong split brain mode

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

dgit: Allow --quilt=dpm

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

Test suite: Add two "echo ok."s

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

Test suite: oldnewtagalt: New test

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

Test suite: Add spelling test

Fail this test if the tree contains the misspelling of "pseudo".

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

Fix spelling of "pseudo"

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

dgit: Turn gc.auto off in our hidden working tree setups

This avoids potential accidents: git gc --auto might otherwise run and
do very undesirable things to the user's working tree.  (I haven't
been able to trigger such a situation deliberately and none has been
reported, luckily...)

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

Test suite: examplegit: Importers inherit majorv too

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

TODO.BRANCH: Add a todo list item

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

Test suite: Add t-tstunt-parsechangelog to a couple of tests

inarchivecopy and the quilt-gbp tests just use the `example' package.

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

TODO.BRANCH: Done drs-quilt-gbp (actually debpolicy-*)

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

Test suite: quilt-gbp-build-modes-sbuild: Split out

Now the other tests can run even if the sbuild chroot is not
available.

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

Test suite: quilt-gbp-build-modes: Lift bulk into lib-build-modes

To split the sbuild test out, we want this to be reusable.

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

TODO.BRANCH: Gardening (reorg only)

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

Test suite: drs-push-rejects: Test push of same version with different dgit

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

Test suite: drs-push-rejects: Break out re-prep (nfc)

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

TODO.BRANCH: Some things done

Split brain: Test suite: quilt-gbp: Test 2nd push (ie, test pseudomerge)

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

Split brain: Make pseudomerge

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

Split brain: Test suite: quilt-gbp: Check that DEP-14 tag was pushed

Test that we pushed the maintainer view as well as the dgit view.

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

Split brain: Always push the maintainer view tag

Our algorithm for calculating whether to do a pseudomerge to make the
dgit view fast forward from the archive contents depends on the
maintainer view tag (effectively, it uses it to go back from the
archive contents dgit view back to the corresponding maintainer view).

So we need to push it too.

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

Split brain: dgit-repos-server: Permit pushing maintainer tag too

Split brain is going to need the maintainer tag on the dgit server.
Allow clients to push the _both_ the DEP-14 and new dgit archive/ tag.

In this case dgit-repos-server can largely ignore the DEP-14 tag.

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

Split brain: Add some debug relating to tagwants

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

Dgit.pm: fail: Strip any trailing newline

This makes it sensible to call fail() with a here doc.

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

Test suite: debpolicy-quilt-gbp: New test

Check that drs and Debian policy permit split brain.

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

Changelog handling: Replace a call to parsechangelog with commit_getclogp

This is less code, and takes advantage of the memoisation.

No overall functional change.

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

Changelog handling: No not check out last push any more during raw import

We now get the changelog with mergeinfo_getclogp (which just fetches
the changelog blob).  This working tree is not used for anything else,
and is deleted at the end of the function.  So there is no need to
switch branches.

There should be no overall behavioural change.

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

Changelog handling: Use mergeinfo_getclogp during raw import

No overall functional change.

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

Changelog handling: Provide commit_getclogp (nfc)

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

Push reorg: Have FF check use dgit view, not HEAD

Quilt fixup may generate a dgit view, which is not HEAD, and it is the
dgit view which will actually be pushed to the archive, so it is that
that should be checked.

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

del_lrfetchrefs: Improve debug output a bit

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

Push reorg: Postpone FF check

We need to do this after the quilt fixup, because we are going to make
quilt fixup perhaps generate a pseudo-merge.

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

Test suite: run-all: Ensure tests/tmp/ exists

ca007b4d "Test suite: run-all: record output" introduced a regression:
if tests/tmp/ does not exist on entry, tests/run-all fails.

So create it first.

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

Push reorg: Introduce $archive_hash in dopush (nfc)

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

fetch_from_archive: Mention that git_fetch_us must be called first

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

dgit: changedir: use confess, to get a stack trace

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

fetch_from_archive: Return the hash (and update the comment)

All the call sites currently treat the return value as a boolean, and
the truthiness and falsishness of return values is unchanged, so there
is no overall functional change.

Also, clarify the head comment somewhat.

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

dgit: Add a couple of comments

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

Push reorg: Move ff check out of cmd_push into dpush (nfc)

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

TODO.BRANCH: add some desires

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

Test suite: quilt-gb-build-modes: Test --clean=dpkg-source too

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

Test suite: quilt-gb-build-modes: Fixes, passes now

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

Test suite: lib-build-modes: Remove a couple of hardcoded versions

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

Test suite: quilt-gbp-build-modes: New test, which does not pass yet

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

dgit: With sbuild, unapply patches in right dir

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

dgit: With gbp-build, provide gbp with patches-unapplied tree

We may still need to apply, and then unapply, the patches, so as to
clean the tree.  But gbp itself expects a patches-unapplied tree.

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

dgit: Make maybe_unapply_patches_again reset $patches_applied_dirtily

That makes it idempotent.

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

TODO.BRANCH: Some more todo items

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

TODO.BRANCH: TODO re fetch patterns

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

TODO.BRANCH: Add a new desire

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

Test suite: quilt-gbp: Provide and use t-gbp-pushed-good

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

Test suite: Break out t-incoming-dsc (nfc)

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

Test suite: Break out t-pushed-good-core (nfc)

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

Test suite: t-output: support expecting empty files

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

Split brain: Push correct view to dgit repos server

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

dgit: Test suite: quilt-gbp test: More

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

dgit: lrfetchrefs: Delete unneeded fetched refs, etc.

Fetch only the refs we (think we) are going to use, and delete the
lrfetchrefs (`refs/dgit-fetch/...') versions of those we give another
name to.

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

dgit: Implement `git-fetch --no-insane'

git-fetch has some very poor behaviours.  Implement a non-insane
version.

We are going to want to not fetch things we aren't going to use, and
this is necessary for that.

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

Test suite: tag-updates: Do not assert a that dgit-fetch/ ref exists

We don't actually want dgit to leave these lying around unless it has
to.  So don't insist on that.

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

Test suite: inarchivecopy: Is finished

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

Test suite: inarchivecopy: use t-sametree-parent

Otherwise different history between fetch and clone breaks the test.

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

Test suite: Provide t-sametree-parent

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

TODO.BRANCH: need to clean up lrfetchrefs

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

Test suite: inarchivecopy: More work

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

Test suite: inarchivecopy: More work

Select specifically 1.3 for first test, and do a clone

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

Test suite: inarchivecopy: New test (does not pass yet)

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

Test suite: provide for x-dgit-unfinished restriction

This will allow us to add tests which fail or are broken, without
causing the test suite as a whole to fail.  When the test is good, the
restrction should be removed.

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

dgit: Add a comment explaining import discard

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

dgit: Clarify some messages about archive/local skew

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

dgit: New fetch algorithm - try to tolerate in-archive copies

Big comment explains.

Amongst other things:
 * Introduce the mergeinfo concept
 * Abolish fetchspec in favour of lrfetchref
 * Synthesize a pseudo-merge linking the archive's .dsc with the dgit
   server's git branch, as appropriate.
 * Introduce mergeinfo_version.

I have tried to ensure that where the import done by previous versions
of dgit would be correct, the new import is the same.

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

Test suite: Remove refs/remotes/dgit/dgit/sid from pari-extra worktree

This, effectively, simulates a previous fetch of something.  Do this
in the actual tests instead: in this case, only necessary in
fetch-localgitonly.

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

Test suite: examplegit: make "new" branch be 2.x

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

Test suite: t-commit: honour $majorv for major version

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

Test suite: Honour t_dgit_xopts

No callers.  This may come in useful, though, at some point.

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