Quilt output: Normalise trailing newlines in commit message

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

Quilt output: Include Date header

Copy this from the commit's author date.

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

Quilt output: Produce output like git-format-patch

Do not .-convert the message and stuff it in Description.

Instead, generate a normal-looking patch with From and Subject.

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

README.dsc-import: Ship to /usr/share/doc

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

README.dsc-import: Document actually-imported approach

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

.gitignore: Add debhelper-build-stamp

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

NOTES: Remove obsolete file

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

gbp options: done from TODO.BRANCH

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

gbp options: Document

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

Manpage: Embolden some command option strings

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

gbp options: Honour --gbp-pq instead of --gbp

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

gbp options: Provide --gbp-build

And, provide the sub opts_opt_multi_cmd to help with options of this
kind.

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

gbp options: Introduce gbp_pq function (nfc)

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

New import: Tidy up output from gbp pq

gbp pq import can print some warnings if it doesn't like the patches
much.  There is no point showing these warnings to the user of `dgit
clone' or `dgit fetch'.

As for the warnings in split brain mode, we will leave those, and
leave them with colour enabled.

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

Test suite: import-nonnative: Enhanced and finished

Use t-git-next-date.  (Our GIT_AUTHOR_DATE settings were wrong and
therefore ineffective.)

Add a 1.0 with diff test.  Add some comments about package format.

Now the test is finished.

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

New import: Set GIT_COMMITTER_* and GIT_AUTHOR_*

gbp pq import generates commits which are affected by these (COMMITTER
always and AUTHOR sometimes).  But we need imports to be stable.

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

Split brain: Set GIT_AUTHOR_* too

Sometimes the patches don't have authorship information, in which case
using the caller's is wrong.

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

Split brain: .gitignore patch: Slightly better commit message

Don't sort-of-imply that the dgit version is the package version.

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

New import: Add dependency on git-buildpackage

Now we may run gbp pq import even if user is not using gbp.

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

Test suite: import-native: New test

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

Test suite: Make t-archive-none idempotent

No overall functional change just yet, but it means we can wipe our
test archives.

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

Test suite: Fix two test cases (git-foo => git foo)

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

dgit: New fetch algorithm: Fix a message

This should have been debug output all along.

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

New import: Get rid of some pointless output

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

New import: Import: Add a lot of debugging

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

Test suite: import-quilt: Initial version of new test case

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

Import: orig files: cope with signatures

Fix up .orig detection to handle .asc's (and other signatures) of
.orig components the same way as their tarballs.

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

Import: orig files: Fix .orig-comp pattern match

Fix up .orig detection to correctly allow exactly the right .orig-comp
components accorging to dpkg-source(1).

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

TODO.BRANCH: Consequences of new import

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

New import: Entirely new import algorithm

See README.dsc-import (which needs some updating).

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

New import: make_commit_text: Some more debug

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

New import: Introduce make_commit_text (nfc)

No callers yet.

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

Test suite: stunt parsechangelog: fallback

Fall back to system implementation if command line options are
requested that we don't understand.  This is a bit fiddly - we need to
strip the stunt entry out of PATH and also out of PERLLIB.

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

New import: Print synthesised git commit message a bit earlier

No significant functional change.

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

Fix up .orig detection to be less trustful of (ambiguous) filenames.

We cannot simply match the filenaem because `foo_1.0.orig.tar.gz'
might be the `.orig.tar.gz' of foo version 1.0, or the `.tar.gz' of
foo version 1.0.orig.

We need either to consider the whole .dsc (this works since the
formats with no `.orig' or `.debian' or whatever are precisely ones
where there is only one file anyway), or know the version number.

Replace is_orig_file with two functions, one for each situation.

While we're here, do not barf if we find uncompressed tarballs.  (We
don't expect to find any but it would be nice if they worked...)

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

TODO.BRANCH: a todo item

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

New import: Slightly better message in mktree_in_ud_from_only_subdir

This is going to be processing .dsc's tarballs directly, so we need
slightly better error reporting.

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

New import: mktree_in_ud_from_only_subdir: New $raw parameter (nfc)

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

Fix two calls to chdir without proper error checking.

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

Do not fail to do some important quilt processing in some --quilt modes.

Make `madformat' mean precisely `is 3.0 (quilt)' and change the two
call sites which wanted to check the quilt mode too.

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

Import: Consolidate emails into coherent plan

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

Import: Copy plan from emails

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

Test suite: quilt-gbp: Test that we crash if archive doesn't do "maint" tags

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

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>