chiark / gitweb /
dgit.git
2 years agodgit(7): Document new Dgit syntax
Ian Jackson [Mon, 9 Jan 2017 01:33:50 +0000 (01:33 +0000)]
dgit(7): Document new Dgit syntax

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(1): Document new config options
Ian Jackson [Mon, 9 Jan 2017 00:28:39 +0000 (00:28 +0000)]
dgit(1): Document new config options

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: git_lrfetch_sane: Tidy up old suite-based refs
Ian Jackson [Mon, 9 Jan 2017 00:20:21 +0000 (00:20 +0000)]
git fetching: git_lrfetch_sane: Tidy up old suite-based refs

We should look for these and delete them, when we have the chance,
because otherwise nothing ever would.

For now we just use $csuite if we have it, and otherwise do nothing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Document import Dgit field parsing fix
Ian Jackson [Mon, 9 Jan 2017 00:13:38 +0000 (00:13 +0000)]
changelog: Document import Dgit field parsing fix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Document nominal distro syntax restriction
Ian Jackson [Mon, 9 Jan 2017 00:12:16 +0000 (00:12 +0000)]
changelog: Document nominal distro syntax restriction

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Document lrfetchrefs change
Ian Jackson [Mon, 9 Jan 2017 00:11:29 +0000 (00:11 +0000)]
changelog: Document lrfetchrefs change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: t-tstunt: When looking for real thing, strip stunt from PATH
Ian Jackson [Mon, 9 Jan 2017 12:22:42 +0000 (12:22 +0000)]
test suite: t-tstunt: When looking for real thing, strip stunt from PATH

Otherwise if we run this again in a fresh environment, the wrapper may
be on PATH even though DGIT_TEST_REAL_<FOO> is not set.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: downstream-gitless: Add missing dependency on reprepro
Ian Jackson [Mon, 9 Jan 2017 13:07:51 +0000 (13:07 +0000)]
test suite: downstream-gitless: Add missing dependency on reprepro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: gnupg: Do not reset DGIT_TEST_REAL_GPG_AGENT
Ian Jackson [Mon, 9 Jan 2017 12:15:46 +0000 (12:15 +0000)]
test suite: gnupg: Do not reset DGIT_TEST_REAL_GPG_AGENT

Otherwise it might end up pointing to the wrapper, if we run the setup
twice for some reason (for example, in an adt run).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Test --no-chase-dsc-distro
Ian Jackson [Mon, 9 Jan 2017 00:08:48 +0000 (00:08 +0000)]
test suite: Test --no-chase-dsc-distro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Mark the start of t-ok
Ian Jackson [Mon, 9 Jan 2017 00:08:38 +0000 (00:08 +0000)]
test suite: Mark the start of t-ok

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(1): Document --[no]-chase-dsc-distro
Ian Jackson [Mon, 9 Jan 2017 00:00:56 +0000 (00:00 +0000)]
dgit(1): Document --[no]-chase-dsc-distro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: protocol-compat: Even more solid checks
Ian Jackson [Sun, 8 Jan 2017 23:37:27 +0000 (23:37 +0000)]
test suite: protocol-compat: Even more solid checks

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: protocol-compat: Soup it up a lot
Ian Jackson [Sun, 8 Jan 2017 23:32:00 +0000 (23:32 +0000)]
test suite: protocol-compat: Soup it up a lot

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Dgit parsing: tolerate newlines etc. not just one space
Ian Jackson [Sun, 8 Jan 2017 23:31:42 +0000 (23:31 +0000)]
dgit: Dgit parsing: tolerate newlines etc. not just one space

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: protocol-compat: Do not tolerate debian lookups
Ian Jackson [Sun, 8 Jan 2017 23:20:53 +0000 (23:20 +0000)]
test suite: protocol-compat: Do not tolerate debian lookups

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Dgit parsing: honour dgit.default.old-dsc-distro
Ian Jackson [Sun, 8 Jan 2017 23:18:56 +0000 (23:18 +0000)]
dgit: Dgit parsing: honour dgit.default.old-dsc-distro

2 years agotest suite: protocol-compat: New test (wip)
Ian Jackson [Sun, 8 Jan 2017 23:20:11 +0000 (23:20 +0000)]
test suite: protocol-compat: New test (wip)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Support varying debian alias
Ian Jackson [Sun, 8 Jan 2017 23:15:46 +0000 (23:15 +0000)]
test suite: Support varying debian alias

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: downstream-gitless: Run t-ok
Ian Jackson [Sun, 8 Jan 2017 23:03:07 +0000 (23:03 +0000)]
test suite: downstream-gitless: Run t-ok

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Fail tests if we look up any debian config
Ian Jackson [Sun, 8 Jan 2017 11:41:20 +0000 (11:41 +0000)]
test suite: Fail tests if we look up any debian config

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodsc import: Do not look anything up in default distro
Ian Jackson [Sun, 8 Jan 2017 12:00:45 +0000 (12:00 +0000)]
dsc import: Do not look anything up in default distro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: import-dsc: Fix and uncomment missing object test
Ian Jackson [Mon, 9 Jan 2017 02:19:23 +0000 (02:19 +0000)]
test suite: import-dsc: Fix and uncomment missing object test

As promised in
   test suite: import-dsc: Comment out missing object test for now
we can now fix and re-enable this test.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Dgit handling: Honour --no-chase-dsc-distro
Ian Jackson [Mon, 9 Jan 2017 00:08:06 +0000 (00:08 +0000)]
dgit: Dgit handling: Honour --no-chase-dsc-distro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: config handling: better debugging
Ian Jackson [Sun, 8 Jan 2017 12:00:12 +0000 (12:00 +0000)]
dgit: config handling: better debugging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: conflg handling: Undocumented --config-lookup-explode= feature.
Ian Jackson [Sun, 8 Jan 2017 12:11:59 +0000 (12:11 +0000)]
dgit: conflg handling: Undocumented --config-lookup-explode= feature.

For testing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Support distro aliases
Ian Jackson [Sun, 8 Jan 2017 11:26:24 +0000 (11:26 +0000)]
dgit: Support distro aliases

We are going to use this to spot when we accidentally look up "debian"
information in the test suite.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: downstream-gitless: Test import-dsc
Ian Jackson [Sun, 8 Jan 2017 03:26:28 +0000 (03:26 +0000)]
test suite: downstream-gitless: Test import-dsc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodsc import: Call resolve_dsc_field_commit
Ian Jackson [Sun, 8 Jan 2017 03:24:40 +0000 (03:24 +0000)]
dsc import: Call resolve_dsc_field_commit

No functional change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: import-dsc: Comment out missing object test for now
Ian Jackson [Mon, 9 Jan 2017 02:13:30 +0000 (02:13 +0000)]
test suite: import-dsc: Comment out missing object test for now

We are about to teach dgit how to fetch this object, so this will
unexpected pass.  Later we will provide a way to turn off that
behaviour, and uncomment this again.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodsc import: Reorganise to make room for resolve_dsc_field_commit
Ian Jackson [Sun, 8 Jan 2017 03:24:19 +0000 (03:24 +0000)]
dsc import: Reorganise to make room for resolve_dsc_field_commit

No functional change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodsc import: Assign $package earlier
Ian Jackson [Sun, 8 Jan 2017 03:22:39 +0000 (03:22 +0000)]
dsc import: Assign $package earlier

No functional change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: downtream-gitless: Add some rewriting
Ian Jackson [Sun, 8 Jan 2017 03:07:54 +0000 (03:07 +0000)]
test suite: downtream-gitless: Add some rewriting

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: New test downstream-gitless (wip)
Ian Jackson [Sat, 7 Jan 2017 16:28:13 +0000 (16:28 +0000)]
test suite: New test downstream-gitless (wip)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: lib-reprepro: Introduce t-reprepro-includedsc
Ian Jackson [Sat, 7 Jan 2017 18:23:15 +0000 (18:23 +0000)]
test suite: lib-reprepro: Introduce t-reprepro-includedsc

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit; dsc Dgit field handling: Properly resolve the commit in the dsc
Ian Jackson [Sun, 8 Jan 2017 01:49:04 +0000 (01:49 +0000)]
dgit; dsc Dgit field handling: Properly resolve the commit in the dsc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: git_lrfetch_sane: Support multiple calls
Ian Jackson [Sun, 8 Jan 2017 03:01:39 +0000 (03:01 +0000)]
git fetching: git_lrfetch_sane: Support multiple calls

We want to be able to fetch from some other distro, or a bit more from
the same one.

No functional change since no callers pass trueish $supplementary.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: git_lrfetch_sane: Introduce my $url
Ian Jackson [Sun, 8 Jan 2017 02:45:38 +0000 (02:45 +0000)]
git fetching: git_lrfetch_sane: Introduce my $url

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: Tidy up a redundant list in git_lrfetch_sane
Ian Jackson [Sun, 8 Jan 2017 02:44:51 +0000 (02:44 +0000)]
git fetching: Tidy up a redundant list in git_lrfetch_sane

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: Do not crash if nothing we wanted to fetch exists
Ian Jackson [Sun, 8 Jan 2017 02:11:57 +0000 (02:11 +0000)]
git fetching: Do not crash if nothing we wanted to fetch exists

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Improve -DDDD config debugging
Ian Jackson [Sun, 8 Jan 2017 02:11:34 +0000 (02:11 +0000)]
dgit: Improve -DDDD config debugging

Print default values too, when they are looked up and used.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: Fix debugging output after function rename
Ian Jackson [Sun, 8 Jan 2017 01:57:12 +0000 (01:57 +0000)]
git fetching: Fix debugging output after function rename

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: config debugging: do not print ARRAY(0x...)
Ian Jackson [Sun, 8 Jan 2017 01:48:42 +0000 (01:48 +0000)]
dgit: config debugging: do not print ARRAY(0x...)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoDgit.pm: git_cat_file: clarify scalar context semantics
Ian Jackson [Sun, 8 Jan 2017 01:47:46 +0000 (01:47 +0000)]
Dgit.pm: git_cat_file: clarify scalar context semantics

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: Use basedistro for lrfetchrefs
Ian Jackson [Sun, 8 Jan 2017 00:52:59 +0000 (00:52 +0000)]
git fetching: Use basedistro for lrfetchrefs

These do not need to vary with the suite, because the refs are named,
within this namespace, after the corresponding refs on the server.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: Move lrfetch* down in the file
Ian Jackson [Sun, 8 Jan 2017 00:52:19 +0000 (00:52 +0000)]
git fetching: Move lrfetch* down in the file

Code motion only.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit fetching: Break out git_lrfetch_sane
Ian Jackson [Sun, 8 Jan 2017 00:50:02 +0000 (00:50 +0000)]
git fetching: Break out git_lrfetch_sane

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: dsc Dgit field handling: Break out resolve_dsc_field_commit
Ian Jackson [Sun, 8 Jan 2017 00:05:35 +0000 (00:05 +0000)]
dgit: dsc Dgit field handling: Break out resolve_dsc_field_commit

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: dsc Dgit field handling: Parse additional data
Ian Jackson [Sun, 8 Jan 2017 00:03:53 +0000 (00:03 +0000)]
dgit: dsc Dgit field handling: Parse additional data

So far we don't do much with it, so this akes no change except to
messages.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Dgit parsing: Move @ourdscfield loop into parse_dsc_field
Ian Jackson [Sat, 7 Jan 2017 18:51:37 +0000 (18:51 +0000)]
dgit: Dgit parsing: Move @ourdscfield loop into parse_dsc_field

This gives it the $dsc.  Also it means that import-dsc will understand
very old .dscs with Vcs-Dgit-Master.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Enforce a syntax for nominal distros
Ian Jackson [Sat, 7 Jan 2017 18:45:59 +0000 (18:45 +0000)]
dgit: Enforce a syntax for nominal distros

These appear in various interchange output like tags.  They should be
sane.  They're going to appear in Dgit: too where people will need to
use them.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Dgit parsing: Refactor into parse_dsc_field
Ian Jackson [Sat, 7 Jan 2017 18:44:26 +0000 (18:44 +0000)]
dgit: Dgit parsing: Refactor into parse_dsc_field

No functional change other than changes to messages.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoProtocol change: Add distro info to Dgit field
Ian Jackson [Fri, 6 Jan 2017 18:29:00 +0000 (18:29 +0000)]
Protocol change: Add distro info to Dgit field

Downstream clients may need this to get the relevant git commits.
Worse, with the new rewrite functionality, they may get the _wrong_
commits because they may not be rewritten.

For now we implement the publication side.  The reader side is
theoretically straightforward, but probably not so simple in reality,
and certainly fiddly to test.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Option parsing: Move notpushing call in fetch/pull
Ian Jackson [Sun, 8 Jan 2017 12:01:36 +0000 (12:01 +0000)]
dgit: Option parsing: Move notpushing call in fetch/pull

We should use the calculated $idistro and $isuite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Option parsing: combine parseopts_late_defaults and finalise_opts_opts
Ian Jackson [Sat, 7 Jan 2017 16:48:26 +0000 (16:48 +0000)]
dgit: Option parsing: combine parseopts_late_defaults and finalise_opts_opts

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Option parsing: Move parseopts_late_defaults textually
Ian Jackson [Sat, 7 Jan 2017 16:44:17 +0000 (16:44 +0000)]
dgit: Option parsing: Move parseopts_late_defaults textually

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Option parsing: Fix distro/suite reference bugs
Ian Jackson [Sat, 7 Jan 2017 16:41:56 +0000 (16:41 +0000)]
dgit: Option parsing: Fix distro/suite reference bugs

By moving parseopts_late_defaults call.

This is conceptually the same as finalise_late_opts, so do it there.
We have to add a missing call to build_prep_early, as otherwise we
call massage_dbp_args too soon.

Also move a nopushing() call until after $isuite is set

All of this means that we now honour $isuite (and sometimes $idistro)
much better.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Option parsing: Make function parseopts_late_defaults
Ian Jackson [Sat, 7 Jan 2017 16:31:58 +0000 (16:31 +0000)]
dgit: Option parsing: Make function parseopts_late_defaults

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Option parsing: Provide call to build_prep_early in build_source
Ian Jackson [Sat, 7 Jan 2017 18:15:13 +0000 (18:15 +0000)]
dgit: Option parsing: Provide call to build_prep_early in build_source

This means $isuite is set a bit earlier, etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Option parsing: quilt-fixup: Use build_prep_early
Ian Jackson [Sat, 7 Jan 2017 17:30:13 +0000 (17:30 +0000)]
dgit: Option parsing: quilt-fixup: Use build_prep_early

This means $isuite is set early enough.

As a side-effect, we correctly reject -p.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Allow overriding of -dtest-dummy dgit argument
Ian Jackson [Sat, 7 Jan 2017 17:18:49 +0000 (17:18 +0000)]
test suite: Allow overriding of -dtest-dummy dgit argument

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: lib-reprepro: Allow configuring for another distro
Ian Jackson [Sat, 7 Jan 2017 15:54:50 +0000 (15:54 +0000)]
test suite: lib-reprepro: Allow configuring for another distro

We can now make a second `distro' this way, with some additional
optional arguments.

No functional change for existing call sites.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: lib-reprepro: Add a couple of comments
Ian Jackson [Sat, 7 Jan 2017 15:58:36 +0000 (15:58 +0000)]
test suite: lib-reprepro: Add a couple of comments

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Refactor lib-reprepro
Ian Jackson [Sat, 7 Jan 2017 15:52:51 +0000 (15:52 +0000)]
test suite: Refactor lib-reprepro

* Break out t-reprepro-cfg.
* Introduce the variables `mir' and `etcapt' to many functions.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Add t-stunt-parsechangelog to a few tests which were missing it.
Ian Jackson [Sat, 7 Jan 2017 15:13:45 +0000 (15:13 +0000)]
test suite: Add t-stunt-parsechangelog to a few tests which were missing it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Parse Dgit: field properly (look for initial \w+ only)
Ian Jackson [Sat, 7 Jan 2017 16:37:43 +0000 (16:37 +0000)]
test suite: Parse Dgit: field properly (look for initial \w+ only)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: import-dsc: Parse `Dgit:' field properly, using only \w+
Ian Jackson [Sat, 7 Jan 2017 17:27:25 +0000 (17:27 +0000)]
dgit: import-dsc: Parse `Dgit:' field properly, using only \w+

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: gbp-orig: Add a missing -m
Ian Jackson [Sat, 7 Jan 2017 17:40:25 +0000 (17:40 +0000)]
test suite: gbp-orig: Add a missing -m

Without this, it would run an editor if stdout was a tty (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Do not investigate symrefs
Ian Jackson [Sat, 7 Jan 2017 17:05:31 +0000 (17:05 +0000)]
dgit-badcommit-fixup: Do not investigate symrefs

Closes:#850547.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit-badcommit-fixup:
* Do not investigate symrefs.  Closes:#850547.

2 years agotest suite: lib-orig-include-exclude Strip block count out of find -ls
Ian Jackson [Sun, 8 Jan 2017 22:12:41 +0000 (22:12 +0000)]
test suite: lib-orig-include-exclude Strip block count out of find -ls

This is unstable!  I have just seen it vary spontaneously in the
middle of a test run, resulting in this:

 ++ diff -u ../before ../after
 --- ../before   2017-01-08 21:39:48.176033763 +0000
 +++ ../after    2017-01-08 21:39:48.208033833 +0000
 @@ -1,2 +1,2 @@
 -   208380      4 -rw-rw-r--   9 ian      ian           236 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig-docs.tar.gz
 -   208381      4 -rw-rw-r--   8 ian      ian           373 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig.tar.gz
 +   208380      4 -rw-rw-r--  10 ian      ian           236 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig-docs.tar.gz
 +   208381      4 -rw-rw-r--   9 ian      ian           373 Nov  6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig.tar.gz
 + test 1 = 0
 + t-report-failure

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: lib-orig-include-exclude: Introduce origs_findls
Ian Jackson [Sun, 8 Jan 2017 22:07:43 +0000 (22:07 +0000)]
test suite: lib-orig-include-exclude: Introduce origs_findls

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoArrange to pass --debug-quick-random to gpg-agent.
Ian Jackson [Sun, 8 Jan 2017 21:04:31 +0000 (21:04 +0000)]
Arrange to pass --debug-quick-random to gpg-agent.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agobadcommit-rewrite: Fix operation using installed version of fixup.
Ian Jackson [Sun, 8 Jan 2017 21:03:50 +0000 (21:03 +0000)]
badcommit-rewrite: Fix operation using installed version of fixup.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Generalise DGIT_TEST_REAL_<FOO> handling
Ian Jackson [Sun, 8 Jan 2017 13:40:14 +0000 (13:40 +0000)]
test suite: Generalise DGIT_TEST_REAL_<FOO> handling

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: tests/run-all: Use a bit more cpu
Ian Jackson [Sun, 8 Jan 2017 13:14:53 +0000 (13:14 +0000)]
test suite: tests/run-all: Use a bit more cpu

Make allowance for tests that do a bit of downloading or whatever.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: start 2.17~ (again)
Ian Jackson [Sat, 7 Jan 2017 15:09:17 +0000 (15:09 +0000)]
changelog: start 2.17~ (again)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: finalise 2.16.2 archive/debian/2.16.2 debian/2.16.2
Ian Jackson [Sat, 7 Jan 2017 13:32:10 +0000 (13:32 +0000)]
changelog: finalise 2.16.2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup; In --check mode, exit status 2 if things are not fine
Ian Jackson [Sat, 7 Jan 2017 13:23:58 +0000 (13:23 +0000)]
dgit-badcommit-fixup; In --check mode, exit status 2 if things are not fine

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Fix crash when running for 2nd time in bare repo.
Ian Jackson [Sat, 7 Jan 2017 13:23:28 +0000 (13:23 +0000)]
dgit-badcommit-fixup: Fix crash when running for 2nd time in bare repo.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: start 2.17~ (again)
Ian Jackson [Sat, 7 Jan 2017 13:05:49 +0000 (13:05 +0000)]
changelog: start 2.17~ (again)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: finalise 2.16.1 debian/2.16.1
Ian Jackson [Sat, 7 Jan 2017 13:05:09 +0000 (13:05 +0000)]
changelog: finalise 2.16.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: New mode --check which is readonly.
Ian Jackson [Sat, 7 Jan 2017 13:00:41 +0000 (13:00 +0000)]
dgit-badcommit-fixup: New mode --check which is readonly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: start 2.17~
Ian Jackson [Sat, 7 Jan 2017 12:53:58 +0000 (12:53 +0000)]
changelog: start 2.17~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: finalise 2.16 archive/debian/2.16 debian/2.16
Ian Jackson [Fri, 6 Jan 2017 20:46:43 +0000 (20:46 +0000)]
changelog: finalise 2.16

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Put our version in our rewrite map commit message
Ian Jackson [Fri, 6 Jan 2017 20:28:01 +0000 (20:28 +0000)]
dgit-badcommit-fixup: Put our version in our rewrite map commit message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Skip our own output refs
Ian Jackson [Fri, 6 Jan 2017 20:23:30 +0000 (20:23 +0000)]
dgit-badcommit-fixup: Skip our own output refs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Instructions comment
Ian Jackson [Fri, 6 Jan 2017 20:23:20 +0000 (20:23 +0000)]
dgit-badcommit-fixup: Instructions comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoShell bug: avoid local=$(....) as it defeats set -e
Ian Jackson [Fri, 6 Jan 2017 19:49:23 +0000 (19:49 +0000)]
Shell bug: avoid local=$(....) as it defeats set -e

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: badcommit-rewrite: Check HEAD manipulation is right
Ian Jackson [Fri, 6 Jan 2017 18:15:01 +0000 (18:15 +0000)]
test suite: badcommit-rewrite: Check HEAD manipulation is right

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Do not detach HEAD - this is not needed
Ian Jackson [Fri, 6 Jan 2017 18:13:34 +0000 (18:13 +0000)]
dgit-badcommit-fixup: Do not detach HEAD - this is not needed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: New test for history-rewriting
Ian Jackson [Fri, 6 Jan 2017 18:09:54 +0000 (18:09 +0000)]
test suite: New test for history-rewriting

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Now seems to work
Ian Jackson [Fri, 6 Jan 2017 18:09:27 +0000 (18:09 +0000)]
dgit-badcommit-fixup: Now seems to work

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Debugging (commented out)
Ian Jackson [Fri, 6 Jan 2017 18:08:52 +0000 (18:08 +0000)]
dgit-badcommit-fixup: Debugging (commented out)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: lib-core: Provide DGIT_BADCOMMIT_FIXUP
Ian Jackson [Fri, 6 Jan 2017 17:51:29 +0000 (17:51 +0000)]
test suite: lib-core: Provide DGIT_BADCOMMIT_FIXUP

So that tests can test this program.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: t-make-badcommit: Generate a commit we can fix up
Ian Jackson [Fri, 6 Jan 2017 17:50:08 +0000 (17:50 +0000)]
test suite: t-make-badcommit: Generate a commit we can fix up

This is very like a commit generated by #849041.  The wrongness is the
same.  The difference is that it's not in a dgit-generated merge, but
the fixup script doesn't care about that.

The existing test case which uses this (drs-push-rejects) still sees
badness and is therefore still happy.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-badcommit-fixup: Bugfixes
Ian Jackson [Fri, 6 Jan 2017 17:49:49 +0000 (17:49 +0000)]
dgit-badcommit-fixup: Bugfixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoChange name of rewrite map ref (needs an extra / for git)
Ian Jackson [Fri, 6 Jan 2017 17:48:38 +0000 (17:48 +0000)]
Change name of rewrite map ref (needs an extra / for git)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agotest suite: Break out t-make-badcommit
Ian Jackson [Fri, 6 Jan 2017 17:11:03 +0000 (17:11 +0000)]
test suite: Break out t-make-badcommit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Honour dgit-rewrite-map
Ian Jackson [Fri, 6 Jan 2017 17:01:48 +0000 (17:01 +0000)]
dgit: Honour dgit-rewrite-map

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoDgit.pm: Provide git_cat_file
Ian Jackson [Fri, 6 Jan 2017 17:01:14 +0000 (17:01 +0000)]
Dgit.pm: Provide git_cat_file

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