dgit: Introduce upstreamversion

And many call sites.  No functional change.

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

Support dgit --delayed= push

(with a warning in the manpage about possible skew).

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

dgit clone: Set timestamps in cloned tree to a single unified time.

This makes it less likely that the user will trip over any
timestamp-dependent FTBFS bugs (eg #842452).

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

Test suite: Test --dgit-view-save everywhere

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

New option --dgit-view-save= for split view quilt modes.

In particular, means that the output of a split view quilt-fixup is
left somewhere useful.

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

Test suite: Make t-ref-same* errors better by tracking and printing names

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

Test suite: Make t-refs-same* not wrongly ignore some nonexistent refs

Previously, t_ref_val="" was meant to mean "no refs specified yet" but
could also arise from "ref was specified but did not exist".

Distinguish these two cases, by using t_ref_val="" to mean only the
latter.  "No refs specified yet" is represented as t_ref_val unset.

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

Test suite: inarchivecopy: Fix tag-vs-remote checking

This was entirely broken, and only works because (a) $vtag^1 does not
exist, and (b) this is erroneously not spotted by t-ref-same-*.

Instead check that the suite branch has the tag (of the package which
has been moved into that suite) as a direct ancestor.

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

Test suite: Provide t-has-parent

No callers yet.

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

Test suite: Document args to t-has-ancestor

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

Test suite: Explicitly configure user.name and user.email

So that tests work when environment doesn't have
defaults.

Closes:#842279 (I hope).

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

import-dsc: Actually print signature warning without --require-valid

If --require-valid-signature was not set, we would not print the
warning if there was one.  That is quite wrong.

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

import-dsc: Document --require-valid-signature

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

Test suite: import-dsc: Test --require-valid-signature

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

import-dsc: Support --require-valid-signature

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

import-dsc: Check the signature

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

import-dsc: Document new ff checks

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

Test suite: import-dsc: New test

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

import-dsc: Introduce ff checking

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

import-dsc: Introduce $newhash (nfc)

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

import-dsc: Introduce $info (nfc)

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

import-dsc: Refuse to update a checked-out branch

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

import dsc: Documentation

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

import dsc: Actually permit --force-import-dsc-with-dgit-field

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

import-dsc: New feature

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

Properly look for .origs etc. in .., fetching them less often.

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

.dsc and file handling: Add some debugging output

No other change.

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

dgit: Break out parse_dscdata.

No functional change.

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

Provide --force-changes-origs-exactly

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

Test suite: orig-include-exclude: Test orig tarball hash mismatch

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

Test suite: orig-include-exclude-chkquery: New test

Check that we make the right file_in_archive ftpmaster API queries.

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

Test suite: lib-orig-include-exclude: Prepare for more reuse

Support a suite argument to test-push-1 and dgit argument arguments to
test-push-2.  cd back to $tmp at the end.

No overall functional change.

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

dgit-maint-gbp(7): Don't try to use `dgit pull`

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

dgit-sponsorship(7): Suggest --dgit-view-save

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

dgit-nmu-simple(7): Mention --delayed

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

dgit-*(7): Sort out Makefile, .gitignore and changelog

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

dgit-sponsorship(7): About deleting tag

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

dgit-maint-gbp(7): Note that patches-unapplied

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

dgit-sponsorship(7): Add import-dsc for NEW package

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

dgit-maint-gbp(7): Mention --overwrite

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

dgit-sponsorship(7): Mention gbp-clone

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

dgit-maint-gbp(7): New manpage

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

dgit-user(7): Use `apt install ./foo.deb`

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

dgit-user(7): Add "... without a .pc directory"

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

dgit-user(7): Explain "binary package"

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

dgit-nmu-simple(7): Cannot yet use DELAYED

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

local-pod-man: Wrapper script to make previewing pod manpages easy

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

dgit-nmu-simple(7): Fix missing quotes

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

dgit-nmu-simple(7): Sample `dch` commands

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

dgit-nmu-simple(7): Maintainer's *git* workflow

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

dgit-sponsorship(7): Demote to subsection

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

dgit-sponsorship(7): Correct sponsee/sponsor

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

dgit-sponsorship(7): Mention RFS procedure

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

dgit-sponsorship(7): "sample dgit push"

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

dgit-sponsorship(7): Suggest pristine-tar(1)

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

dgit-sponsorship.7 (wip)

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

dgit-user(7), dgit-nmu-simple(7): Much work

These are in reasonable shape now.

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

dgit-user(7): More work in progress

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

dgit-user(7): work in progress

Used one of the existing tutorials as a template, so currently
contains many lies (including the AUTHOR).

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

Test suite: orig-include-exclude: Move bulk into a lib-*

We're going to want to re-use it as-is.  Well, modulo the introduction
of $test_push_2_hook.

No functional change.

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

Test suite: orig-include-exclude: Refactor: introduce test-push-[12]

No functional change (diffed two test logs to check).

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

Test suite: orig-include-exclude: Tests orig auto-inclusion/exclusion

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

Test suite: t-archive-process-incoming: Process everything

The previous rune wouldn't process any new .origs.  And in fact there
is no good reason to restrict this.

certainly not right now, because right now we are going to want to
process whatever is in incoming so that the orig-include-exclude test
can easily see what dgit push uploaded.

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

Automatically calculate which .origs are required

* Spot if any of our .origs have different hashes to the archive's
* Update the .changes to have the set of .origs that the archive doesn't

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

Test suite: Switch by default archive access method to dummycatapi

Now dgit can, during the test suite, make file_in_archive queries,
without exploding.

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

dummyapicat: New archive query method

Like ftpmasterapi but knows that actually behind the scenes it's just
mostly cat.  Ths is relevant because file_in_archive_dummycatapi has
to be different.

(This is because the test suite can't sensibly predict what queries
dgit might make, because the relevant bits of the test suite don't
actually really know what .origs might be supposed to exist.)

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

Some archive queries: Remove prototypes

That makes these easier to reuse for another method.  No functional
change.

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

dopush: Break out $changes variable

No functional change.

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

dopush: Move $upstreamversion setting out to give it wider scope

No functional change yet.

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

@files_csum_info_fields: Provide ftpmaster api database field name

No functional change as nothing looks here yet.

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

archive_query: Provide file_in_archive methods

No functional change as no callers yet.

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

archive_query: Support further arguments to methods

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

api query: Provide ability to tolerate 404

This is useful for backward-compatibility with earlier ftpmaster api
versions.

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

Test suite: Test --new in split brain mode

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

Split brain mode: Fix --new.  Closes:#842354.

Test $archive_hash for undef early enough.

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

changelog: start 2.9~

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

changelog: Finalise 2.8

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

build modes handling: Check for stray .changes on all split brain build entries

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

build changes handling: Break out midbuild_checkchanges

No functional change.

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

Test suite: build-mode-*: Check that right .changes comes out.

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

build changes handling: Run mergechanges when needed in non-sbuild build modes

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

build changes handling: Introduce postbuild_mergechanges

Affects only the `sbuild' subcommand.

Mostly code motion.

Other changes include:
 * Provide in_parent, and use it.
 * "sbuild" changed to "build" in the msg_if_onlyone failure message
 * Unapply patches before merging changelogs
 * Reorganise so that it is possible to use this code when there
   is only one output changes file.

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

Test suite: bm-*: turn bm-report-source into bm-report-test

No overall functional change.

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

absurd git-apply fallback: defend against debian/patches/series being an unusual object, in case dpkg-source doesn't.

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

changelog: Start 2.8~

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

changelog: Finalise 2.7

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

Test suite: Provide absurd-gitapply test

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

Import: Allow --force to enable/disable

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

Ignore unknown force options (with a warning)

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

Provide --force-dsc-changes-mismatch

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

Provide --force-unsupported-source-format

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

Import: Docuemnt absurdity in changelog

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

Import: Use absurd `git apply' emulation if gbp pq import fails

gbp import can fail due to git apply not understanding patches.
This is #841867 (against dgit).

The underlying problem is #841866 (in gbp pq) which exposes things
like #841865 and #829067 (in git).  I imagine there are other lurking
incompatibilities between git-apply and dpkg-source.

We could in principle reimplement the gbp patch metadata extraction.
But that would be quite tiresome and have its own compatibility
problems.

The real problem is just `git apply'.  (Indeed gbp already tries git
apply without, and then with, a whitespace fix option.)  We work
around the trouble by providing our own implementation of `git apply'.

Specifically:

We try to do things the sane way (just running gbp pq import) first.
If that works, great.  If it doesn't, we put /usr/share/dgit/absurd on
the PATH.  That contains only a sh script called `git'.  This sh
script figures out whether the caller is trying to invoke `git apply'.
If not, it runs the real git.

If the caller wanted git-apply, the absurd git script emulates it
using dpkg-source --before-build.  Conveniently, we know that the
series file will not be touched by patches.  So we can write just the
patch we care about into the series file, and run --before-build,
which applies just that one patch.

The results are committed (minus the .pc), and for the next patch,
dpkg-source sees again a tree with simply a single patch to apply.

We try ordinary gbp pq first because our absurd approach is very slow
on a big tree.  Also we would like to maximise our chances of the
import working.  If git and/or gbp ever work better by themselves, all
of this craziness will simply not happen.

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

Build system substitutions, for absurdities

* Introduce absurddir, which is where the absurdities will go
* Substitute the absurddir into the dgit script during make all
* Install the substituted scripts rather than the originals in make install
* Provide a default in dgit, based on $0
* Clean the substitutions up in make clean

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

Dgit.pm: Break out failedcmd_waitstatus

No functional change.

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

Provide --force-unrepresentable.

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

dgit: --force-*: Provide framework

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

dgit(1): Some more info about --deliberately.

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

dgit(1): Reorder the options, moving more important ones earlier.

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

changelog: start 2.7~

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