chiark / gitweb /
dgit.git
2 years agoInfra: dgit-infrastructure has, and uses, its own copies of the perl modules
Ian Jackson [Sat, 15 Oct 2016 16:50:26 +0000 (17:50 +0100)]
Infra: dgit-infrastructure has, and uses, its own copies of the perl modules

This avoids introducing a versioned dependency between dgit and
dgit-infrastructure (and also makes it easier to test cross-version
compatibility).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoInfra: Introduce Debian::Dgit::Infra
Ian Jackson [Sat, 15 Oct 2016 16:04:33 +0000 (17:04 +0100)]
Infra: Introduce Debian::Dgit::Infra

This is used by all the Perl in dgit-infrastructure.deb.
So far it does nothing, so no functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Add debhelper (>=8) to test suite's global Depends.
Ian Jackson [Thu, 13 Oct 2016 17:08:47 +0000 (18:08 +0100)]
Test suite: Add debhelper (>=8) to test suite's global Depends.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: quilt-gbp: Check that we do not update user's HEAD
Ian Jackson [Thu, 13 Oct 2016 15:45:35 +0000 (16:45 +0100)]
Test suite: quilt-gbp: Check that we do not update user's HEAD

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: quilt-splitbrains: Check that we do not update user's HEAD
Ian Jackson [Thu, 13 Oct 2016 15:36:45 +0000 (16:36 +0100)]
Test suite: quilt-splitbrains: Check that we do not update user's HEAD

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Tidy up a bit
Ian Jackson [Wed, 12 Oct 2016 17:21:39 +0000 (18:21 +0100)]
changelog: Tidy up a bit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit.1: Minor clarifications
Ian Jackson [Wed, 12 Oct 2016 17:20:34 +0000 (18:20 +0100)]
dgit.1: Minor clarifications

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoCopyright: Actually provide copy of DCO
Ian Jackson [Wed, 12 Oct 2016 17:19:52 +0000 (18:19 +0100)]
Copyright: Actually provide copy of DCO

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoCopyright: Mention, and provide copy of, DCO
Ian Jackson [Tue, 11 Oct 2016 01:22:08 +0000 (02:22 +0100)]
Copyright: Mention, and provide copy of, DCO

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoCopyright: Add notices to some more of the (larger) files
Ian Jackson [Tue, 11 Oct 2016 01:21:48 +0000 (02:21 +0100)]
Copyright: Add notices to some more of the (larger) files

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: When generating patch filenames from titles, first transliterate them (lossily...
Ian Jackson [Mon, 10 Oct 2016 01:03:52 +0000 (02:03 +0100)]
dgit: When generating patch filenames from titles, first transliterate them (lossily) to ascii.  Closes:#834807.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTODO.BRANCH: Remove empty file - yay!
Ian Jackson [Mon, 10 Oct 2016 00:08:15 +0000 (01:08 +0100)]
TODO.BRANCH: Remove empty file - yay!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Mention that we don't set a fetch spec
Ian Jackson [Mon, 10 Oct 2016 00:07:57 +0000 (01:07 +0100)]
changelog: Mention that we don't set a fetch spec

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTODO.BRANCH: Many BTS bugs now fixed
Ian Jackson [Mon, 10 Oct 2016 00:07:30 +0000 (01:07 +0100)]
TODO.BRANCH: Many BTS bugs now fixed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: mismatches-contents: New test
Ian Jackson [Sun, 9 Oct 2016 23:57:48 +0000 (00:57 +0100)]
Test suite: mismatches-contents: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: HEAD/.dsc mismatch error: Much better message
Ian Jackson [Sun, 9 Oct 2016 23:54:19 +0000 (00:54 +0100)]
dgit: HEAD/.dsc mismatch error: Much better message

Closes:#809516.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Rename mismatches-dscchanges
Ian Jackson [Sun, 9 Oct 2016 21:14:48 +0000 (22:14 +0100)]
Test suite: Rename mismatches-dscchanges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Get sense of failed clone failed cleanup error reporting check correct.
Ian Jackson [Sun, 9 Oct 2016 21:08:01 +0000 (22:08 +0100)]
dgit: Get sense of failed clone failed cleanup error reporting check correct.

Closes:#796773.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: gitconfig: New test
Ian Jackson [Sun, 9 Oct 2016 20:43:53 +0000 (21:43 +0100)]
Test suite: gitconfig: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: New config option slurping approach
Ian Jackson [Sun, 9 Oct 2016 20:43:19 +0000 (21:43 +0100)]
dgit: New config option slurping approach

Allows local git config options to override user-global ones, as is
proper.  Closes:#835858.

Also, we now need to handle -c options ourselves.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: unrepresentable: New test
Ian Jackson [Sun, 9 Oct 2016 19:49:24 +0000 (20:49 +0100)]
Test suite: unrepresentable: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoBetter error message if HEAD contains changes unrepresentable
Ian Jackson [Sun, 9 Oct 2016 19:48:57 +0000 (20:48 +0100)]
Better error message if HEAD contains changes unrepresentable

by `3.0 (quilt)'.  Closes:#834618.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: quilt analysis: quiltify_trees_differ: provide new $unrepres arg
Ian Jackson [Sun, 9 Oct 2016 19:46:48 +0000 (20:46 +0100)]
dgit: quilt analysis: quiltify_trees_differ: provide new $unrepres arg

No-one passes this yet, so no functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: quilt analysis: Print orig and HEAD tree hashes.
Ian Jackson [Sun, 9 Oct 2016 19:46:00 +0000 (20:46 +0100)]
dgit: quilt analysis: Print orig and HEAD tree hashes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: quilt analysis: Replace H2O with O2H
Ian Jackson [Sun, 9 Oct 2016 19:44:12 +0000 (20:44 +0100)]
dgit: quilt analysis: Replace H2O with O2H

Right now the direction of the diff does not matter, but soon it will,
and the natural direction is O2H, not O2H.  Change all references.
No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Better error message if non-split-brain patch stack no longer applies
Ian Jackson [Sun, 9 Oct 2016 18:50:16 +0000 (19:50 +0100)]
dgit: Better error message if non-split-brain patch stack no longer applies

(due to new upstream version, or user messing with it). Closes:#833025.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Mention #833025 re --quilt=
Ian Jackson [Sun, 9 Oct 2016 15:18:36 +0000 (16:18 +0100)]
changelog: Mention #833025 re --quilt=

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit.1: Document the expected form of HEAD for each --quilt= mode.
Ian Jackson [Sun, 9 Oct 2016 14:41:47 +0000 (15:41 +0100)]
dgit.1: Document the expected form of HEAD for each --quilt= mode.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit.1: Discourage use of the --PROGRAM:OPTION escape hatch.
Ian Jackson [Sun, 9 Oct 2016 14:21:20 +0000 (15:21 +0100)]
dgit.1: Discourage use of the --PROGRAM:OPTION escape hatch.

(Apropos of various bug reports including #800060.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Mention #800110
Ian Jackson [Sun, 9 Oct 2016 12:58:41 +0000 (13:58 +0100)]
changelog: Mention #800110

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: mismatch: New test
Ian Jackson [Sun, 9 Oct 2016 12:57:28 +0000 (13:57 +0100)]
Test suite: mismatch: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Before committing to push, check that .dsc and .changes correspond.
Ian Jackson [Sun, 9 Oct 2016 12:56:57 +0000 (13:56 +0100)]
dgit: Before committing to push, check that .dsc and .changes correspond.

Closes:#800060.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Break out @files_csum_info_fields (nfc)
Ian Jackson [Sun, 9 Oct 2016 12:56:00 +0000 (13:56 +0100)]
dgit: Break out @files_csum_info_fields (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Mention #800060
Ian Jackson [Sun, 9 Oct 2016 12:55:42 +0000 (13:55 +0100)]
changelog: Mention #800060

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit.1: Clarify the --clean= options' documentation. Closes:#800054.
Ian Jackson [Sun, 9 Oct 2016 11:54:24 +0000 (12:54 +0100)]
dgit.1: Clarify the --clean= options' documentation.  Closes:#800054.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Test that we pass correct -v to genchanges
Ian Jackson [Sun, 9 Oct 2016 11:40:03 +0000 (12:40 +0100)]
Test suite: Test that we pass correct -v to genchanges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: stunt Parse.pm: add comment about %options
Ian Jackson [Sun, 9 Oct 2016 11:37:34 +0000 (12:37 +0100)]
Test suite: stunt Parse.pm: add comment about %options

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoArrange for the special dgit remote to be skipped by git fetch --all etc.
Ian Jackson [Sun, 9 Oct 2016 11:11:38 +0000 (12:11 +0100)]
Arrange for the special dgit remote to be skipped by git fetch --all etc.

Closes:#827892.

Not quite the patch from Sean: we want to do this on every fetch, and
we don't overwrite the user's configuration if for some reason they
have set this (hopefully they haven't...)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoDon't break if user has push.followTags=true. Closes:#827878.
Ian Jackson [Sun, 9 Oct 2016 10:56:36 +0000 (11:56 +0100)]
Don't break if user has push.followTags=true.  Closes:#827878.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Fix location of a bugfix entry
Ian Jackson [Sun, 9 Oct 2016 10:54:43 +0000 (11:54 +0100)]
changelog: Fix location of a bugfix entry

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoUpdate changelog for fetch spec
Ian Jackson [Sun, 9 Oct 2016 00:39:35 +0000 (01:39 +0100)]
Update changelog for fetch spec

2 years agoUpdate changelog for in-archive copies
Ian Jackson [Sun, 9 Oct 2016 00:38:39 +0000 (01:38 +0100)]
Update changelog for in-archive copies

2 years agoUpdate changelog for --quilt= split brain
Ian Jackson [Sun, 9 Oct 2016 00:38:12 +0000 (01:38 +0100)]
Update changelog for --quilt= split brain

2 years agoUpdate changelog for tag format
Ian Jackson [Sun, 9 Oct 2016 00:37:13 +0000 (01:37 +0100)]
Update changelog for tag format

2 years agoMake --quilt=gbp the default for dgit gbp-build.
Ian Jackson [Sun, 9 Oct 2016 00:36:12 +0000 (01:36 +0100)]
Make --quilt=gbp the default for dgit gbp-build.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit.1: Document --quilt=gbp et al.
Ian Jackson [Sun, 9 Oct 2016 00:33:31 +0000 (01:33 +0100)]
dgit.1: Document --quilt=gbp et al.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTODO.BRANCH: Quilt output improved now
Ian Jackson [Sun, 9 Oct 2016 00:14:58 +0000 (01:14 +0100)]
TODO.BRANCH: Quilt output improved now

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: quilt: Test that our patch makes it through dgit and gbp pq
Ian Jackson [Sun, 9 Oct 2016 00:13:41 +0000 (01:13 +0100)]
Test suite: quilt: Test that our patch makes it through dgit and gbp pq

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: quilt: Provide Gbp-pq headers in our new patch test case
Ian Jackson [Sun, 9 Oct 2016 00:13:12 +0000 (01:13 +0100)]
Test suite: quilt: Provide Gbp-pq headers in our new patch test case

And expect dgit to honour them

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoQuilt output: Honour and strip Gbp-pq headers
Ian Jackson [Sun, 9 Oct 2016 00:12:37 +0000 (01:12 +0100)]
Quilt output: Honour and strip Gbp-pq headers

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoQuilt admin commits: Provide [dgit ...] in all of them
Ian Jackson [Sun, 9 Oct 2016 00:10:26 +0000 (01:10 +0100)]
Quilt admin commits: Provide [dgit ...] in all of them

With the version number, in general.  (These are used during
quiltification of the user's branch, not during import, so they don't
need to be stable.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoQuilt output: Normalise trailing newlines in commit message
Ian Jackson [Sun, 9 Oct 2016 00:08:26 +0000 (01:08 +0100)]
Quilt output: Normalise trailing newlines in commit message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoQuilt output: Include Date header
Ian Jackson [Sun, 9 Oct 2016 00:07:59 +0000 (01:07 +0100)]
Quilt output: Include Date header

Copy this from the commit's author date.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoQuilt output: Produce output like git-format-patch
Ian Jackson [Sun, 9 Oct 2016 00:06:32 +0000 (01:06 +0100)]
Quilt output: Produce output like git-format-patch

Do not .-convert the message and stuff it in Description.

Instead, generate a normal-looking patch with From and Subject.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoREADME.dsc-import: Ship to /usr/share/doc
Ian Jackson [Sat, 8 Oct 2016 22:09:49 +0000 (23:09 +0100)]
README.dsc-import: Ship to /usr/share/doc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoREADME.dsc-import: Document actually-imported approach
Ian Jackson [Sat, 8 Oct 2016 22:09:21 +0000 (23:09 +0100)]
README.dsc-import: Document actually-imported approach

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years ago.gitignore: Add debhelper-build-stamp
Ian Jackson [Sat, 8 Oct 2016 22:07:10 +0000 (23:07 +0100)]
.gitignore: Add debhelper-build-stamp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNOTES: Remove obsolete file
Ian Jackson [Sat, 8 Oct 2016 22:02:05 +0000 (23:02 +0100)]
NOTES: Remove obsolete file

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogbp options: done from TODO.BRANCH
Ian Jackson [Sat, 8 Oct 2016 21:31:23 +0000 (22:31 +0100)]
gbp options: done from TODO.BRANCH

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogbp options: Document
Ian Jackson [Sat, 8 Oct 2016 21:30:39 +0000 (22:30 +0100)]
gbp options: Document

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoManpage: Embolden some command option strings
Ian Jackson [Sat, 8 Oct 2016 21:30:27 +0000 (22:30 +0100)]
Manpage: Embolden some command option strings

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogbp options: Honour --gbp-pq instead of --gbp
Ian Jackson [Sat, 8 Oct 2016 21:29:41 +0000 (22:29 +0100)]
gbp options: Honour --gbp-pq instead of --gbp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogbp options: Provide --gbp-build
Ian Jackson [Sat, 8 Oct 2016 21:28:33 +0000 (22:28 +0100)]
gbp options: Provide --gbp-build

And, provide the sub opts_opt_multi_cmd to help with options of this
kind.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogbp options: Introduce gbp_pq function (nfc)
Ian Jackson [Sat, 8 Oct 2016 21:19:30 +0000 (22:19 +0100)]
gbp options: Introduce gbp_pq function (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Tidy up output from gbp pq
Ian Jackson [Sat, 8 Oct 2016 21:01:12 +0000 (22:01 +0100)]
New import: Tidy up output from gbp pq

gbp pq import can print some warnings if it doesn't like the patches
much.  There is no point showing these warnings to the user of `dgit
clone' or `dgit fetch'.

As for the warnings in split brain mode, we will leave those, and
leave them with colour enabled.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-nonnative: Enhanced and finished
Ian Jackson [Sat, 8 Oct 2016 19:21:35 +0000 (20:21 +0100)]
Test suite: import-nonnative: Enhanced and finished

Use t-git-next-date.  (Our GIT_AUTHOR_DATE settings were wrong and
therefore ineffective.)

Add a 1.0 with diff test.  Add some comments about package format.

Now the test is finished.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Set GIT_COMMITTER_* and GIT_AUTHOR_*
Ian Jackson [Sat, 8 Oct 2016 20:53:35 +0000 (21:53 +0100)]
New import: Set GIT_COMMITTER_* and GIT_AUTHOR_*

gbp pq import generates commits which are affected by these (COMMITTER
always and AUTHOR sometimes).  But we need imports to be stable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoSplit brain: Set GIT_AUTHOR_* too
Ian Jackson [Sat, 8 Oct 2016 20:52:42 +0000 (21:52 +0100)]
Split brain: Set GIT_AUTHOR_* too

Sometimes the patches don't have authorship information, in which case
using the caller's is wrong.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoSplit brain: .gitignore patch: Slightly better commit message
Ian Jackson [Sat, 8 Oct 2016 20:39:29 +0000 (21:39 +0100)]
Split brain: .gitignore patch: Slightly better commit message

Don't sort-of-imply that the dgit version is the package version.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Add dependency on git-buildpackage
Ian Jackson [Sat, 8 Oct 2016 20:56:38 +0000 (21:56 +0100)]
New import: Add dependency on git-buildpackage

Now we may run gbp pq import even if user is not using gbp.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-native: New test
Ian Jackson [Sat, 8 Oct 2016 19:20:45 +0000 (20:20 +0100)]
Test suite: import-native: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Make t-archive-none idempotent
Ian Jackson [Sat, 8 Oct 2016 19:19:51 +0000 (20:19 +0100)]
Test suite: Make t-archive-none idempotent

No overall functional change just yet, but it means we can wipe our
test archives.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Fix two test cases (git-foo => git foo)
Ian Jackson [Sat, 8 Oct 2016 19:19:11 +0000 (20:19 +0100)]
Test suite: Fix two test cases (git-foo => git foo)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: New fetch algorithm: Fix a message
Ian Jackson [Sat, 8 Oct 2016 18:19:13 +0000 (19:19 +0100)]
dgit: New fetch algorithm: Fix a message

This should have been debug output all along.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Get rid of some pointless output
Ian Jackson [Sat, 8 Oct 2016 18:18:31 +0000 (19:18 +0100)]
New import: Get rid of some pointless output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Import: Add a lot of debugging
Ian Jackson [Sat, 8 Oct 2016 18:14:29 +0000 (19:14 +0100)]
New import: Import: Add a lot of debugging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-quilt: Initial version of new test case
Ian Jackson [Sat, 8 Oct 2016 17:58:04 +0000 (18:58 +0100)]
Test suite: import-quilt: Initial version of new test case

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoImport: orig files: cope with signatures
Ian Jackson [Sat, 8 Oct 2016 16:47:33 +0000 (17:47 +0100)]
Import: orig files: cope with signatures

Fix up .orig detection to handle .asc's (and other signatures) of
.orig components the same way as their tarballs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoImport: orig files: Fix .orig-comp pattern match
Ian Jackson [Sat, 8 Oct 2016 16:43:51 +0000 (17:43 +0100)]
Import: orig files: Fix .orig-comp pattern match

Fix up .orig detection to correctly allow exactly the right .orig-comp
components accorging to dpkg-source(1).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTODO.BRANCH: Consequences of new import
Ian Jackson [Sat, 8 Oct 2016 16:38:18 +0000 (17:38 +0100)]
TODO.BRANCH: Consequences of new import

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Entirely new import algorithm
Ian Jackson [Sun, 2 Oct 2016 19:55:57 +0000 (20:55 +0100)]
New import: Entirely new import algorithm

See README.dsc-import (which needs some updating).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: make_commit_text: Some more debug
Ian Jackson [Sat, 8 Oct 2016 16:39:04 +0000 (17:39 +0100)]
New import: make_commit_text: Some more debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Introduce make_commit_text (nfc)
Ian Jackson [Sat, 8 Oct 2016 14:30:50 +0000 (15:30 +0100)]
New import: Introduce make_commit_text (nfc)

No callers yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: stunt parsechangelog: fallback
Ian Jackson [Sat, 8 Oct 2016 15:48:29 +0000 (16:48 +0100)]
Test suite: stunt parsechangelog: fallback

Fall back to system implementation if command line options are
requested that we don't understand.  This is a bit fiddly - we need to
strip the stunt entry out of PATH and also out of PERLLIB.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Print synthesised git commit message a bit earlier
Ian Jackson [Sat, 8 Oct 2016 14:32:09 +0000 (15:32 +0100)]
New import: Print synthesised git commit message a bit earlier

No significant functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoFix up .orig detection to be less trustful of (ambiguous) filenames.
Ian Jackson [Sat, 8 Oct 2016 12:19:54 +0000 (13:19 +0100)]
Fix up .orig detection to be less trustful of (ambiguous) filenames.

We cannot simply match the filenaem because `foo_1.0.orig.tar.gz'
might be the `.orig.tar.gz' of foo version 1.0, or the `.tar.gz' of
foo version 1.0.orig.

We need either to consider the whole .dsc (this works since the
formats with no `.orig' or `.debian' or whatever are precisely ones
where there is only one file anyway), or know the version number.

Replace is_orig_file with two functions, one for each situation.

While we're here, do not barf if we find uncompressed tarballs.  (We
don't expect to find any but it would be nice if they worked...)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTODO.BRANCH: a todo item
Ian Jackson [Sun, 2 Oct 2016 19:53:52 +0000 (20:53 +0100)]
TODO.BRANCH: a todo item

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: Slightly better message in mktree_in_ud_from_only_subdir
Ian Jackson [Wed, 28 Sep 2016 23:33:43 +0000 (00:33 +0100)]
New import: Slightly better message in mktree_in_ud_from_only_subdir

This is going to be processing .dsc's tarballs directly, so we need
slightly better error reporting.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew import: mktree_in_ud_from_only_subdir: New $raw parameter (nfc)
Ian Jackson [Wed, 28 Sep 2016 23:33:03 +0000 (00:33 +0100)]
New import: mktree_in_ud_from_only_subdir: New $raw parameter (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoFix two calls to chdir without proper error checking.
Ian Jackson [Wed, 28 Sep 2016 22:48:02 +0000 (23:48 +0100)]
Fix two calls to chdir without proper error checking.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoDo not fail to do some important quilt processing in some --quilt modes.
Ian Jackson [Wed, 28 Sep 2016 17:35:00 +0000 (18:35 +0100)]
Do not fail to do some important quilt processing in some --quilt modes.

Make `madformat' mean precisely `is 3.0 (quilt)' and change the two
call sites which wanted to check the quilt mode too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoImport: Consolidate emails into coherent plan
Ian Jackson [Wed, 28 Sep 2016 17:24:26 +0000 (18:24 +0100)]
Import: Consolidate emails into coherent plan

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoImport: Copy plan from emails
Ian Jackson [Wed, 28 Sep 2016 17:05:53 +0000 (18:05 +0100)]
Import: Copy plan from emails

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: quilt-gbp: Test that we crash if archive doesn't do "maint" tags
Ian Jackson [Mon, 26 Sep 2016 00:35:15 +0000 (01:35 +0100)]
Test suite: quilt-gbp: Test that we crash if archive doesn't do "maint" tags

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoSplit brain: Check that archive supports "maint", earlier
Ian Jackson [Mon, 26 Sep 2016 00:34:16 +0000 (01:34 +0100)]
Split brain: Check that archive supports "maint", earlier

Otherwise the user will be disappointed shortly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Make t-newtag specify maint too
Ian Jackson [Mon, 26 Sep 2016 00:33:17 +0000 (01:33 +0100)]
Test suite: Make t-newtag specify maint too

Since actually several tests which use t-newtag are quilty split brain
ones which technically require it, although nothing checks this right
now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Test --overwrite (without VERSION)
Ian Jackson [Mon, 26 Sep 2016 00:14:22 +0000 (01:14 +0100)]
Test suite: Test --overwrite (without VERSION)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoOverwrite: Document --overwrite option (without VERSION)
Ian Jackson [Mon, 26 Sep 2016 00:13:31 +0000 (01:13 +0100)]
Overwrite: Document --overwrite option (without VERSION)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoOverwrite: Support --overwrite without a version
Ian Jackson [Mon, 26 Sep 2016 00:07:05 +0000 (01:07 +0100)]
Overwrite: Support --overwrite without a version

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: getfield, parsechangelog: Fix two bugs in error reporting
Ian Jackson [Mon, 26 Sep 2016 00:05:32 +0000 (01:05 +0100)]
dgit: getfield, parsechangelog: Fix two bugs in error reporting

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