changelog: Documentation changes and finalise 6.11

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

dgit-maint-debrebase(7): Formatting & wording tweaks

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

dgit-maint-debrebase(7): Avoid some uses of =item

Commands for the user to type into their shell should have empty lines
above and below them; this ensures that.  Admittedly while making the
POD source harder to read.

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

dgit-maint-debrebase(7): demote "Inspecting the history"

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

Drop obsolete local-pod-man script, now replaced by make %.view

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

Makefile: Adjust scope of dgit(7) pod rule

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

changelog: start 6.11

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

changelog: finalise 6.10

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

changelog: Tidy up, preparatory to release

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

changelog: Run gbp-dch

Needs tidying up.

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

dgit: Pass --no-source to sbuild (always)

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

test suite: Test dgit build --build=

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

dgit: build-*: Cope with new-style --build= specifications

Previously, we would generally bomb out.

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

test suite: build-modes-*: Provide stunt dpkg-deb to pass -Znone

This speeds it up from about 105 seconds to about 90, on my laptop.

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

test suite: tstunt debchange: Use exec

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

test suite: Test dgit build with bpd

It's not expected to work.

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

dgit: build: Squash $buildproductsdir

Things malfunction, because some things end up in .. and some in bpd.
Overriding this at least makes `dgit build' produce correct results,
albeit in the wrong place.

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

test suite: break out build-modes-source

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

test suite: build-products-dir: Check nothing in ../

If bpd was set then .. shouldn't have this kind of junk in it.

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

test suite: sbuild-gitish: Do not use build-products-dir

The runes in the manpage assume it's not set, and we run sbuild
directly anyway.  We are about to check that nothing ends up in ..
which is not true for this test.

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

gdr-fresh: Honour $bpd

Nothing depends on this right now, but I don't want to leave this
latent bug.

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

test suite: run-all: Understand `:' specially

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

test suite: run-all: Move setting of TESTSCRIPTS

NFC

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

test suite: run-all: Honour DGIT_TESTS_TMPDIR

If this variable is set, tests/tmp will be made a symlink to a real
subdirectory under $DGIT_TESTS_TMPDIR.  The real subdirectory will be
removed and recreated as tests/tmp would otherwise be.

I set it to
  /run/user/`id -u`/dgit-tests-tmp

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

test suite: run-all: Without --progressive, rm and recreate tests/tmp

This arranges to rerun tests/setup/ scripts, which wouldn't otherwise
happen; that is IMO a bug.

While we are here, introduce $tmpdir.

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

test suite: Work if $tmp is on a different filesystem.

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

test suite: gdr-makepatches7: use t-make-orig

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

test suite: gdr-fresh: use t-make-orig

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

git-debrebase: t-make-orig: Pass -1 to gzip

This makes everything faster.

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

test suite: lib-gdr: Factor out t-make-orig

NFC, overall.

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

dgit-maint-debrebase(7): Add runes for inspecting history

I'm not sure if this is the right place but I wanted to publish this
information sooner rather than later.

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

test suite: gdr-new-upstream: Test updating existing clog entry

This is the test case for #905888.

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

git-debrebase: Use debchange for new-upstream changelog entry

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

test suite: Update date to one with nontrivial DST in Europe/London

This may make more things fail for me if they have timezone bugs.

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

test suite: debchange: Work around faketime TZ bug

faketime's CLI does not permit correct unparsing of times in arbitrary
timezones.  So we must save and restore TZ.

See #907264.

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

test suite: debchange: Freeze time

Use faketime's advanced format.  Otherwise if debchange takes too
long, the timestamp generated by debchange is not what we expected.

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

test suite: dch: Always use tstunt/debchange

We are going to make this more sophisticated, so use it everywhere to
avoid duplication.

We need to soup up tstunt/debchange so that it does not depend on
DGIT_TEST_REAL_DEBCHANGE.  If it hasn't been put on the PATH by
t-tstunt, that isn't set, and we can just run debchange from PATH.

This makes faketime a test dependency for all the tests which don't
have NO-DEFAULT.

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

test suite: gdr-new-upstream: Break out clog-check-[12]

NFC

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

test suite: gdr-new-upstream: Use new branch rather than reset

This makes it slightly easier to see what's going on, and to extend
the test.

No overall functional change.

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

test suite: gdr-newupstream: Add more dividers

NFC

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

git-debrebase: Prepare for calling debchange

* Add it to the .deb dependencies
* Add tstunt/debchange to the gdr tests

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

test suite: Provide tstunt/debchange

This uses faketime to get the date right, like t-dch does.
It has to be requested with t-tstunt debchange, which nothing does
yet, so NFC.

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

test suite: gdr-new-upstream: Check changelog is exactly right

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

git-debrebase: gdr-merge-conflicts: Call git merge --no-edit

The default seems different in my sid chroot.

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

test suite: test-list-uptodate: Drop imports and dependencies

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

test suite: gdr-fresh: Drop use of git-deborig and fix dependencies

b765388a4cea
  "test suite: Test dgit calling git-debrebase on new debianisation"
failed to update the test dependencies, and does not work in a formal
autopkgtest run because dgit is not installed.

Additionally, Because scripts in devscripts have their own individual
dependencies, and the dependencies for git-deborig differ between
stretch and sid, It is not reasonably possible to write a dependency
which allows git-deborig to work.  This is another reason why this
test does not work in a formal run (this time, failing only on
sid/buster).

So, drop use of git-deborig, and the resulting dependency on
devscripts.  (dgit and git-debrebase pull in devscripts anyway, so
that is academic.)

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

git-debrebase(5): Document new understanding of debrebase-last

Bug #907208 shows that the previous statement wasn't true.

debrebase-last is still marginally useful: we use it for deciding what
hints to print in some error messages; detecting and rejecting
attempts to convert already-converted branches; and in
`git-debrebase status'.

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

dgit: branch_is_gdr: Add a cautionary comment

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

test suite: Test dgit calling git-debrebase on new debianisation

Now all the cases in dgit's branch_is_gdr history walker are tested:

  DGIT_TEST_DEBUG=-DD tests/using-intree tests/run-all
  cat tests/tmp/*.log |perl -ne 'next unless s/^branch_is_gdr  \w+ //; print' |sort -u |less

Produces the same list as:

  git-grep 'branch_is_gdr  ' | perl -pe 's/^^dgit:\s+//' |sort |less

(With the list of gdr commit annotations the same as in the source.)

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

git-debrebse: merge handling: Handle absence of patches via $any

This saves testing for $seriesfile existence and makes the code
slightly less tangled.

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

git-debrebase: make-patches: Handle case when there are no patches

Previously, we would bomb out.

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

git-debrebase: keycommits: Fix doc comment

There's no $dgitimport; that's $trouble.

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

git-debrebase: convert-to-gbp: Handle no-patches case better

In this case it's very like git-debrebase forget-was-debrebase.

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

git-debrebase: convert-to-gbp: Actually start from breakwater

Contrary to the documentation, this operation would start from HEAD.
It should rewind to the breakwater.

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

git-debrebase: make_patches_staged: Return flag, are there any patches?

All callers currently ignore the return value, so NFC.

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

git-debrebase: gbp_pq_export: Return flag, are there any patches?

All callers currently ignore the return value, so NFC.

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

dgit: branch_is_gdr: Put gdr commit annotations in alphabetical order

This makes it slightly easier to see our test coverage.

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

test suite: Separate t-gdr-gbp-import-core from -with-queue

NFC

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

test suite: Test dgit branch_is_gdr walker on a merge resolution

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

test suite: Test dgit detection of fresh branch for gdr make-patches

This tests that #907208 is fixed.

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

test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches

Now dgit runs git-debrebase make-patches, with the result that the
patch commit in this conflict will be made by gdr.

This is what we want, so now that we have it, insist on it.

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

test suite: Honour DGIT_TEST_RUN_PFX env var

One might set this to `eatmydata', for example.

(It's not a good idea to wrap run-all or the Makefile in eatmydata,
because you actually want the stamp files etc. at least.)

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

dgit: Replace branch_is_gdr with a history walker

The debrebase-last approach is fundamentally wrong, because, for
example, cloning a stitched laundered gdr branch from a git server
does not establish debrebase-last, so dgit would make patches
itself (slowly).

So, instead, use git-debrebase make-patches in situations where it
will succeed.  We could just run it but that's slower, and it is a bit
awkward because we have to consider whether gdr is installed.  So
provide our own implementation.  It can be simpler because it only has
to handle the easy cases;

On testing of the new algorithm: we want to be confident that this
doesn't misfire; otherwise dgit users could be inconvenienced.  And we
want it to work for gdr users of course.

We can analyse the test coverage of the logic in branch_is_gdr
by running the whole test suite and then comparing this:

  cat tests/tmp/*.log |perl -ne 'next unless s/^branch_is_gdr  \w+ //; print' |sort -u |less

with this:

  git-grep 'branch_is_gdr  ' | perl -pe 's/^^dgit:\s+//' |sort |less

Noting that we should ideally have one each of all the gdr kinds we
try to recognise.  Currently that shows that we are missing only:

  gdr merged-breakwater
  unmarked BreakwaterStart YES

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

test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches

We are about to extend the set of situations where dgit runs
git-debrebase make-patches, with the result that the patch commit in
this conflict will be made by gdr.

This is good, so allow it.

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

dgit: Introduce get_tree_of_commit

NFC

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

git-debrebase: Do not abandon quilt fixup at gdr split commits

One of these might well be in the delta queue somehow.

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

git-debrebase: Make all commit annotations have a COMMIT-TYPE

Omitting this sometimes turns out to have a mistake.  We are going to
want to distinguish at least split from other commits.  Add a
COMMIT-TYPE to the others as future-proofing.

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

test suite: lib-gdr: Check that we made patches with gdr

Conveniently, the places where we don't want this, and are
deliberately looking for dgit-self-made patches, are gdr-makepatches7
and mix-it in gdr-subcommands; there, we don't push, so don't end up
checking t-gdr-made-patches.

We also add this check to the appropriate place in gdr-subcommands.

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

test-suite: lib-gdr: Be more defensive about unexpected states/args

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

git-debrebase(5): Warn against renaming branch while unstitched

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

git-debrebase: Do not try split brain gdr make-patches

Print a helpful error message instead.

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

git-debrebase: test suite: gdr-subcommands: test forget

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

git-debrebase: forget-was-ever-debrebase: New subcommand

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

test suite: gdr-import-nostitch: Test -fseries-comments

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

git-debrebase: convert-from-*: snag on discarding comments in series

series files can contain #-comments.  The conversion process will
throw them away, so complain about that.

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

test suite: Make example_1.1 contain a patch with Name and Topic

This triggers #907202 and #907206.

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

git-debrebase: classify: Do not misclassify patches in subdirs

The old get_differs algorithm would recurse in debian/patches.
The new one failed to do that.  Fix that.

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

git-debrebase: trees_diff_walk: Support recursion

No-one specifies this yet, so NFC.

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

git-debrebase: Fix get_tree's memoisation wrt $recurse

$recurse needs to be part of the key to the memo hash!

Luckily, there is only one caller which calls with $recurse==1,
check_series_has_all_patches.  It ends up mishandles this situation by
complaining about the directory names, as if they were unused patches.

And after that no-one needs to call get_tree.

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

git-debrebase: trees_diff_walk: Refactor $all to \%opts

No callers pass this so NFC.

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

changelog: start 6.10

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

changelog: fianlise 6.9

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

dgit: Remove unsubstituted $changesfile from message

Closes:#906787.

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

changelog: Document docs changes

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

dgit-maint-debrebase(7): Add crossreference to "ILLEGAL OPERATIONS"

There are three items under "ILLEGAL OPERATIONS":

1. We already refer to "OTHER MERGES".

2. This commit adds a crossreference to the second item.

3. The information under "Editing debian/patches" is already basically
   included in dgit-maint-debrebase(7).

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

dgit-maint-debrebase(7): Rewrite "Converting an existing package"

Closes:#905573

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

test suite: Update debian/tests/control following dependency fix.

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

dgit: do not crash on push of a new gdr package.  Closes:#906784.

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

changelog: start 6.9

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

test suite: Fix dependencies of new gdr-merge-conflicts test.

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

changelog: start 6.8

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

changelog: Finalise 6.7

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

changelog: Reorganise and tidy up the current entry

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

dgit: quilt fixup: Maybe mention gitattributes

These are a potential cause of quilt linearisation failure.

Closes:#906199.

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

dgit(1), dgit(7): Document that we do not suppress export attributes

Ie, ones which affect git-archive.  This is related to #906199.

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

dgit: quilt fixup errors: Refactor and reword very slightly

Make this two calls to push so we can put things in between.
Also remove `to specify'; now the message fits in 80 columns.

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

dgit: quilt fixup: Do not suggest quilt modes if we see gdr

If `stopped at' is a git-debrebase commit, then a non-default quilt
mode is probably not the answer.

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

dgit: quilt fiuxp: linearisation failure: Add a blank line

The `stopped at' commit report can be long, if there are several, or
complicated, commits.  Add a blank line.

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

dgit: quilt fixup: @failsuggestion: Include a machine-readable reason

Each entry is now an arrayref.  This will let quilt_fiuxp filter them
later.

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

dgit(7): Mention bad origs as possible cause of quilt fixup failure

And document our error message changes.

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