chiark / gitweb /
dgit.git
3 years agodgit: complete_file_from_dsc: Introduce $refetched
Ian Jackson [Tue, 10 Jan 2017 14:34:08 +0000 (14:34 +0000)]
dgit: complete_file_from_dsc: Introduce $refetched

Make have a option which, if set, causes hash mismatches to result in
a refetch rather than a crash.

No functional change because no call sites pass it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: complete_file_from_dsc: Reorganise $fetchhash
Ian Jackson [Tue, 10 Jan 2017 14:28:58 +0000 (14:28 +0000)]
dgit: complete_file_from_dsc: Reorganise $fetchhash

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: complete_file_from_dsc: Introduce $checkhash
Ian Jackson [Tue, 10 Jan 2017 14:26:38 +0000 (14:26 +0000)]
dgit: complete_file_from_dsc: Introduce $checkhash

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: generate_commits_from_dsc: Introduce $upper_f
Ian Jackson [Tue, 10 Jan 2017 14:10:50 +0000 (14:10 +0000)]
dgit: generate_commits_from_dsc: Introduce $upper_f

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agochangelog: Fix entry referring twice to refs/dgit-fetch/DISTRO
Ian Jackson [Tue, 10 Jan 2017 13:45:35 +0000 (13:45 +0000)]
changelog: Fix entry referring twice to refs/dgit-fetch/DISTRO

Reported-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: After downloading .debian.* files, save them in `..', too
Ian Jackson [Tue, 10 Jan 2017 13:43:10 +0000 (13:43 +0000)]
dgit: After downloading .debian.* files, save them in `..', too

Ie do this not just for .origs.  We don't want the user needlessly
re-downloading them on each fetch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agotest suite: defdistro-import-dsc: New test
Ian Jackson [Tue, 10 Jan 2017 13:29:26 +0000 (13:29 +0000)]
test suite: defdistro-import-dsc: New test

Add test for import-dsc with default distro.  (Detects #850781.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: import-dsc: Add missing call to notpushing().
Ian Jackson [Tue, 10 Jan 2017 13:28:21 +0000 (13:28 +0000)]
dgit: import-dsc: Add missing call to notpushing().

Avoids crashing with undefined $isuite.  Closes:#850781.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: Do not nedlessly re-fetch the rewrite map.
Ian Jackson [Mon, 9 Jan 2017 17:42:40 +0000 (17:42 +0000)]
dgit: Do not nedlessly re-fetch the rewrite map.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agochangelog: start 3.1
Ian Jackson [Mon, 9 Jan 2017 17:42:02 +0000 (17:42 +0000)]
changelog: start 3.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agochangelog: finalise 3.0 archive/debian/3.0 debian/3.0
Ian Jackson [Mon, 9 Jan 2017 17:37:09 +0000 (17:37 +0000)]
changelog: finalise 3.0

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agotest suite: defdistro-mirror: Add missing dependency
Ian Jackson [Mon, 9 Jan 2017 17:12:00 +0000 (17:12 +0000)]
test suite: defdistro-mirror: Add missing dependency

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agotest suite: defdistro-rpush: Remove workaround for missing isuite param
Ian Jackson [Mon, 9 Jan 2017 16:15:52 +0000 (16:15 +0000)]
test suite: defdistro-rpush: Remove workaround for missing isuite param

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: rpush: Use $isuite for $isuite, not $csuite
Ian Jackson [Mon, 9 Jan 2017 16:14:21 +0000 (16:14 +0000)]
dgit: rpush: Use $isuite for $isuite, not $csuite

Send isuite as a parameter, and use it if it's provided, instead of
csuite.  This means config lookups like
    dgit-distro.SUITE.distro
only need the user-provided suite name (eg `unstable'), and don't need
to be duplicated for the canonical name (eg `sid').

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agotest suite: Test that default distro works
Ian Jackson [Mon, 9 Jan 2017 16:11:32 +0000 (16:11 +0000)]
test suite: Test that default distro works

Ie check that dgit-distro.SUITE.distro works

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agotest suite: Provide t-defdistro (for use with t-alt-test)
Ian Jackson [Mon, 9 Jan 2017 16:10:16 +0000 (16:10 +0000)]
test suite: Provide t-defdistro (for use with t-alt-test)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: $isuite handling: Defer calls to access_* until first `want'
Ian Jackson [Mon, 9 Jan 2017 16:07:15 +0000 (16:07 +0000)]
dgit: $isuite handling: Defer calls to access_* until first `want'

pushing, rpush_handle_protovsn_bothends, and quiltmode, all depend on
access_*.  For that we need $isuite, but we only get that (in the form
of $csuite) from the build host.

We can move all of these calls into i_resp_want, which is called the
first time the build host actually wants something from us.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: $isuite fixes: defer pushing and rpush_handle_protovsn_bothends in rpush
Ian Jackson [Mon, 9 Jan 2017 16:03:45 +0000 (16:03 +0000)]
dgit: $isuite fixes: defer pushing and rpush_handle_protovsn_bothends in rpush

We mustn't call pushing until we have parsed the arguments enough to
find $isuite.  So remove the call to pushing from
cmd_remote_push_build_host.  Now we rely on cmd_push's call to
pushing, which it does after the argument parsing.

We then need to move rpush_handle_protovsn_bothends (which implicitly
calls accesss_*) too, until we have got $isuite and called pushing().
We can move that into dopush.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: rpush: suppress changelog tag format check
Ian Jackson [Mon, 9 Jan 2017 15:53:34 +0000 (15:53 +0000)]
dgit: rpush: suppress changelog tag format check

The changelog might be received (and therefore parsed) before we have
been told the suite.  So we can't check the tag format because we
cannot know the distro yet.

Simply suppress this early check.  If the tag format is wrong, we will
discover this later.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: Option parsing: Move pushing call in push
Ian Jackson [Mon, 9 Jan 2017 15:52:08 +0000 (15:52 +0000)]
dgit: Option parsing: Move pushing call in push

Otherwise $isuite might not be set when we call access_something.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: rpush: Provide $we_are_initiator
Ian Jackson [Mon, 9 Jan 2017 15:50:48 +0000 (15:50 +0000)]
dgit: rpush: Provide $we_are_initiator

No functional change yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agochangelog: Tidy a bit
Ian Jackson [Mon, 9 Jan 2017 14:54:07 +0000 (14:54 +0000)]
changelog: Tidy a bit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agochangelog: Mention #850519 re docs updates
Ian Jackson [Mon, 9 Jan 2017 03:29:59 +0000 (03:29 +0000)]
changelog: Mention #850519 re docs updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agochangelog: Document dgit(1) changes.
Ian Jackson [Mon, 9 Jan 2017 03:29:23 +0000 (03:29 +0000)]
changelog: Document dgit(1) changes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(1): Fix --force-import-dsc-with-dgit-field
Ian Jackson [Mon, 9 Jan 2017 03:28:41 +0000 (03:28 +0000)]
dgit(1): Fix --force-import-dsc-with-dgit-field

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(1): Clarify --no-chase-dsc-distro
Ian Jackson [Mon, 9 Jan 2017 03:28:29 +0000 (03:28 +0000)]
dgit(1): Clarify --no-chase-dsc-distro

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(1): --overwrite: say in title that it's optional
Ian Jackson [Mon, 9 Jan 2017 03:28:07 +0000 (03:28 +0000)]
dgit(1): --overwrite: say in title that it's optional

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(1): Remove stray sentence.
Ian Jackson [Mon, 9 Jan 2017 03:27:33 +0000 (03:27 +0000)]
dgit(1): Remove stray sentence.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(1): Remove comment about retries
Ian Jackson [Mon, 9 Jan 2017 03:27:23 +0000 (03:27 +0000)]
dgit(1): Remove comment about retries

Error messages now tell the user the situation.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(1): Mention need for dgit sbuild -A
Ian Jackson [Mon, 9 Jan 2017 03:27:04 +0000 (03:27 +0000)]
dgit(1): Mention need for dgit sbuild -A

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(7): Move autotools deletion para up
Ian Jackson [Mon, 9 Jan 2017 03:04:13 +0000 (03:04 +0000)]
dgit(7): Move autotools deletion para up

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit(7): Updated `trouble' section to suggest deletion
Ian Jackson [Mon, 9 Jan 2017 03:02:41 +0000 (03:02 +0000)]
dgit(7): Updated `trouble' section to suggest deletion

Suggest having dpkg-source delete the autotools output (with a patch
if necessary).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: When generating orig+debian/patches view, copy debian/ from HEAD.
Ian Jackson [Mon, 9 Jan 2017 02:54:27 +0000 (02:54 +0000)]
dgit: When generating orig+debian/patches view, copy debian/ from HEAD.

This makes less noise in diffs.  Closes:#850095.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agofetch and pull ignore the changelog suite when it is UNRELEASED.
Ian Jackson [Mon, 9 Jan 2017 02:08:07 +0000 (02:08 +0000)]
fetch and pull ignore the changelog suite when it is UNRELEASED.

Closes:#848646.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoHonour dgit-distro.*.default-suite and dgit.default.default-suite.
Ian Jackson [Mon, 9 Jan 2017 02:04:31 +0000 (02:04 +0000)]
Honour dgit-distro.*.default-suite and dgit.default.default-suite.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit-maint-merge(7): Use debian/source/patch-header
Sean Whitton [Thu, 22 Dec 2016 18:43:37 +0000 (18:43 +0000)]
dgit-maint-merge(7): Use debian/source/patch-header

Closes:849120

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agoProvide `dgit print-dgit-repos-server-source-url'.
Ian Jackson [Mon, 9 Jan 2017 01:42:43 +0000 (01:42 +0000)]
Provide `dgit print-dgit-repos-server-source-url'.

Re:#850521.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit: clone-dgit-repos-server: Set $access_forpush
Ian Jackson [Mon, 9 Jan 2017 01:37:46 +0000 (01:37 +0000)]
dgit: clone-dgit-repos-server: Set $access_forpush

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 years agodgit-sponsorship(7): Use --no-dep14tag
Sean Whitton [Thu, 22 Dec 2016 17:31:05 +0000 (17:31 +0000)]
dgit-sponsorship(7): Use --no-dep14tag

While this complicates the sponsor's workflow a little, it simplifies
the sponsee's workflow: they don't have to decide whether to delete
DEP-14 tags that other guides have told them to create.

Closes:#849105.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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

3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>