i18n: i18n-diff-auditor: bugfixes

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

i18n: i18n-diff-auditor: Handle some ( __ etc., without +(

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

i18n: i18n-diff-auditor: fix `on was non-string' message

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

i18n: i18n-diff-auditor: handle "..." strings as arguments to f_

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

i18n: i18n-diff-auditor: fix bra and ket regexps

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

i18n: i18n-diff-auditor: ignore space in old "-string only in brackets

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

i18n: i18n-diff-auditor: add two simple cases

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

i18n: i18n-diff-auditor: recognise tail concatenation

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

i18n: i18n-diff-auditor: tiny debug improvement

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

i18n: i18n-diff-auditor: fix striang (de)concatenation

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

i18n: i18n-diff-auditor: understand i_

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

i18n: i18n-diff-auditor: introduce is_trans (nfc)

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

i18n: i18n-diff-auditor: remove a stray print

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

i18n: i18n-diff-auditor: improve debug output

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

i18n: i18n-diff-auditor: fixes and minor improvements

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

i18n: i18n-diff-auditor: fix multi-arg handling

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

i18n: i18n-diff-auditor: more debug

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

i18n: i18n-diff-auditor: fix debug

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

i18n: i18n-diff-auditor: New script for checking i18n work

(copied from "play" repo, 67fc89a905d3f922ffb3e33172cd8b8343945b1c)

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

i18n: Provide i_ (identity function, tags for translation)

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

test suite: t-expect-fail: Set LANGUAGE too

The user may have this in their environment, in which case we must
squash it too.

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

test suite: i18n-messages: Test message translation

We test just one of the messages I provided for en_US.UTF-8.
That's probably sufficient.

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

test suite: New restriction x-dgit-out-of-tree-only

This is filtered out of debian/tests/control, but honoured in-tree.

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

tests suite; t-expect-fail: Honour expect_fail_lcmessages

No users yet so NFC.

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

i18n: Call po/Makefile directly from debian/rules

This makefile likes to dirty things quite a bit, since that's how
gettext seems to like to work.  In our call from debian/rules, we
avoid that.

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

118n: Translate one message as a sample

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

i18n: Start en_US.po

This is going to be our test/demo translation.
Generated using
  make -C po en_US.po
and then editing these header fields by hand
  PO-Revision-Date
  Last-Translator
  Language-Team

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

i18n: Generate initial messages.pot

`make -C po'

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

i18n: sub prototypes for __ and f_

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

i18n: Rename ___ to f_

I have decided that's a better name.  Not _f because, unlike
printf (where f is done first, and then print), here the _ is done
first and then f.

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

i18n: Machinery in po/

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

i18n: Flag a handful of messages for translation

This is just useful for testing the forthcoming machinery, so far.

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

i18n: Source-level framework: call setlocale, provide __ and ___

This is the general plumbing for looking up translated messages - the
consumer-side.  No actual messages are flagged for translation yet.

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

i18n: Copy po/Makefile and remove-potcdate.plfrom debconf

These are from debconf.git a326240dd50487732d8546858994d48b45bf0b20.

There doesn't seem to be a common library for this kind of thing.  I'm
going to take debconf as a good example and nick the code.

Copyright: the debian/copyright file of debconf says it's
BSD-2-clause.  So add that, and copyright notices based on "git log"
(which does seem comprehensive).

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

changelog: start 6.13

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

changelog: Finalise 6.12

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

test suite: t-check-only-bpd: Check $tmp/.. not ..

The test might call t-ok in $p, say, or in $tmp.

The effect of this bug was that in tests where t-ok was called in
$tmp, it looked in $tmp/.. which might contain anything, rather than
$tmp as intended.  That means the test was not effective.

Also it causes a spurious failure of t-import-nonnative in the Ubuntu
CI infrastructure, where $AUTOPKGTEST_TMP/../autopkgtest-satdep.deb
happens to exist.

Reported-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: start 6.12

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

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>