chiark / gitweb /
dgit.git
4 years agodgit-repos-server: tag2upload: Better message from upstream mismatch
Ian Jackson [Sat, 6 Jul 2019 17:37:03 +0000 (18:37 +0100)]
dgit-repos-server: tag2upload: Better message from upstream mismatch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Check the upstream tag syntax only once
Ian Jackson [Sat, 6 Jul 2019 17:36:51 +0000 (18:36 +0100)]
dgit-repos-server: tag2upload: Check the upstream tag syntax only once

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Verify the tag slightly earlier
Ian Jackson [Sat, 6 Jul 2019 17:36:28 +0000 (18:36 +0100)]
dgit-repos-server: tag2upload: Verify the tag slightly earlier

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: A few more error case tests
Ian Jackson [Sat, 6 Jul 2019 17:25:06 +0000 (18:25 +0100)]
test suite: tagupl: A few more error case tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Improve a message
Ian Jackson [Sat, 6 Jul 2019 17:23:24 +0000 (18:23 +0100)]
dgit-repos-server: tag2upload: Improve a message

Could be multiple distro=, in which case any matching is OK.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Drop an obsolete comment
Ian Jackson [Sat, 6 Jul 2019 17:23:02 +0000 (18:23 +0100)]
dgit-repos-server: tag2upload: Drop an obsolete comment

The usage comment says this script should be retried.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Test an email: version mismatch
Ian Jackson [Sat, 6 Jul 2019 17:14:10 +0000 (18:14 +0100)]
test suite: tagupl: Test an email: version mismatch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Improve a reject message
Ian Jackson [Sat, 6 Jul 2019 17:13:45 +0000 (18:13 +0100)]
dgit-repos-server: tag2upload: Improve a reject message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: log when we fail and email
Ian Jackson [Sat, 6 Jul 2019 17:13:26 +0000 (18:13 +0100)]
dgit-repos-server: tag2upload: log when we fail and email

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Use a different strategy to avoid fsck fail
Ian Jackson [Sat, 6 Jul 2019 17:07:36 +0000 (18:07 +0100)]
test suite: tagupl: Use a different strategy to avoid fsck fail

This leaves us with a $p directory which is often convenient

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Test a really broken tag
Ian Jackson [Sat, 6 Jul 2019 17:04:33 +0000 (18:04 +0100)]
test suite: tagupl: Test a really broken tag

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Break out and soup up log moving
Ian Jackson [Sat, 6 Jul 2019 17:04:05 +0000 (18:04 +0100)]
test suite: tagupl: Break out and soup up log moving

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Test some wrong tag names
Ian Jackson [Sat, 6 Jul 2019 16:44:40 +0000 (17:44 +0100)]
test suite: tagupl: Test some wrong tag names

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Break out next-mangle
Ian Jackson [Sat, 6 Jul 2019 16:44:25 +0000 (17:44 +0100)]
test suite: tagupl: Break out next-mangle

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: test one bad tag
Ian Jackson [Sat, 6 Jul 2019 16:33:29 +0000 (17:33 +0100)]
test suite: tagupl: test one bad tag

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl-*: Break out t-tagupl-run-drs
Ian Jackson [Sat, 6 Jul 2019 16:33:14 +0000 (17:33 +0100)]
test suite: tagupl-*: Break out t-tagupl-run-drs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Drop a debug $_ from quit message
Ian Jackson [Sat, 6 Jul 2019 16:32:39 +0000 (17:32 +0100)]
dgit-repos-server: tag2upload: Drop a debug $_ from quit message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Use a bpd and clean up origs
Ian Jackson [Sat, 6 Jul 2019 16:31:56 +0000 (17:31 +0100)]
dgit-repos-server: tag2upload: Use a bpd and clean up origs

This prevents us keeping forever the junk from uploads, and it
prevents us reusing it too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl-native: New test
Ian Jackson [Sat, 6 Jul 2019 15:44:49 +0000 (16:44 +0100)]
test suite: tagupl-native: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: tag2upload: Cope with native packages
Ian Jackson [Sat, 6 Jul 2019 15:44:27 +0000 (16:44 +0100)]
dgit-repos-server: tag2upload: Cope with native packages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agogit-debpush: Numerous improvements
Sean Whitton [Sat, 6 Jul 2019 15:50:22 +0000 (16:50 +0100)]
git-debpush: Numerous improvements

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agogit-debpush: Tolerate not specifying a quilt mode if not needed
Ian Jackson [Sat, 6 Jul 2019 15:35:31 +0000 (16:35 +0100)]
git-debpush: Tolerate not specifying a quilt mode if not needed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: Break out t-tagupl-*
Ian Jackson [Sat, 6 Jul 2019 15:35:16 +0000 (16:35 +0100)]
test suite: Break out t-tagupl-*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Drop a now-irrelevant chunk of commented code
Ian Jackson [Sat, 6 Jul 2019 15:12:29 +0000 (16:12 +0100)]
test suite: tagupl: Drop a now-irrelevant chunk of commented code

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: Use git-debpush
Ian Jackson [Sat, 6 Jul 2019 13:29:46 +0000 (14:29 +0100)]
test suite: tagupl: Use git-debpush

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agogit-debpush: new binary package
Sean Whitton [Fri, 5 Jul 2019 17:11:20 +0000 (18:11 +0100)]
git-debpush: new binary package

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agogit-debpush(1): new manpage
Sean Whitton [Sat, 6 Jul 2019 15:01:45 +0000 (16:01 +0100)]
git-debpush(1): new manpage

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agodgit(1): Fix reference in description of --quilt=auto
Sean Whitton [Sat, 6 Jul 2019 15:49:18 +0000 (16:49 +0100)]
dgit(1): Fix reference in description of --quilt=auto

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agod/copyright: Update copyright years
Sean Whitton [Sat, 6 Jul 2019 15:48:57 +0000 (16:48 +0100)]
d/copyright: Update copyright years

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agodebian/rules: Break out specpkg_install_common
Ian Jackson [Sat, 6 Jul 2019 18:05:21 +0000 (19:05 +0100)]
debian/rules: Break out specpkg_install_common

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: Provide DGIT_DEBPUSH_TEST
Ian Jackson [Sat, 6 Jul 2019 13:29:28 +0000 (14:29 +0100)]
test suite: Provide DGIT_DEBPUSH_TEST

No user yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agogit-debpush: new script
Sean Whitton [Fri, 5 Jul 2019 17:11:20 +0000 (18:11 +0100)]
git-debpush: new script

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: Do not translate tag subject lines
Ian Jackson [Sat, 6 Jul 2019 15:02:51 +0000 (16:02 +0100)]
dgit: Do not translate tag subject lines

These are parsed by dgit-repos-server.
Translating them breaks things.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: tagupl: New test case for new dgit-repos-server mode
Ian Jackson [Fri, 5 Jul 2019 16:25:22 +0000 (17:25 +0100)]
test suite: tagupl: New test case for new dgit-repos-server mode

Currently we hand-synthesise a suitable tag.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: New prototype tag2upload mode for git-debpush
Ian Jackson [Fri, 5 Jul 2019 13:41:29 +0000 (14:41 +0100)]
dgit-repos-server: New prototype tag2upload mode for git-debpush

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: Provide a stunt dgit
Ian Jackson [Sat, 6 Jul 2019 11:33:35 +0000 (12:33 +0100)]
test suite: Provide a stunt dgit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: Break out t-chain-test-somehow
Ian Jackson [Sat, 6 Jul 2019 11:32:47 +0000 (12:32 +0100)]
test suite: Break out t-chain-test-somehow

This will be used for when we want to source tests/lib from
some program run by a test.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest site: Provide a stunt sendmail
Ian Jackson [Sat, 6 Jul 2019 10:35:18 +0000 (11:35 +0100)]
test site: Provide a stunt sendmail

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: drs-git-ext: Honour DGIT_DRS_MODE
Ian Jackson [Fri, 5 Jul 2019 17:16:24 +0000 (18:16 +0100)]
test suite: drs-git-ext: Honour DGIT_DRS_MODE

This is a bit of a kludge, but it will do for present purposes.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: parsetag_general: Switch to $distrofn
Ian Jackson [Sat, 6 Jul 2019 10:22:00 +0000 (11:22 +0100)]
dgit-repos-server: parsetag_general: Switch to $distrofn

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: parsetag_general: Abolish $mainfn, use readtag
Ian Jackson [Sat, 6 Jul 2019 09:33:46 +0000 (10:33 +0100)]
dgit-repos-server: parsetag_general: Abolish $mainfn, use readtag

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: Break out readtag
Ian Jackson [Sat, 6 Jul 2019 09:30:35 +0000 (10:30 +0100)]
dgit-repos-server: Break out readtag

No functional change other than to debug output.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: parsetag_general: New argument $need_distro
Ian Jackson [Fri, 5 Jul 2019 18:34:16 +0000 (19:34 +0100)]
dgit-repos-server: parsetag_general: New argument $need_distro

No functional change with the existing call site.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: Break apart parsetag()
Ian Jackson [Fri, 5 Jul 2019 18:31:40 +0000 (19:31 +0100)]
dgit-repos-server: Break apart parsetag()

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: Prepare for modes which take arguments
Ian Jackson [Fri, 5 Jul 2019 15:44:30 +0000 (16:44 +0100)]
dgit-repos-server: Prepare for modes which take arguments

Currently none do.  Both the existing mode_ subroutines check @ARGV,
so this has no overall change other than to error messages.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-server: Break out basic_tag_checks
Ian Jackson [Fri, 5 Jul 2019 15:38:38 +0000 (16:38 +0100)]
dgit-repos-server: Break out basic_tag_checks

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: Include dgit tag metadata in maintainer view tag too
Ian Jackson [Sat, 6 Jul 2019 14:39:27 +0000 (15:39 +0100)]
dgit: Include dgit tag metadata in maintainer view tag too

This is for the use of git-debpush and other tools which want to
figure out the quilt mode from the git history.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: tags: Add missing blank lines to messages
Ian Jackson [Sat, 6 Jul 2019 14:51:02 +0000 (15:51 +0100)]
dgit: tags: Add missing blank lines to messages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: Move tag metadata calculation earlier
Ian Jackson [Sat, 6 Jul 2019 14:50:19 +0000 (15:50 +0100)]
dgit: Move tag metadata calculation earlier

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: Allow -p with various push modes
Ian Jackson [Sat, 6 Jul 2019 11:14:18 +0000 (12:14 +0100)]
dgit: Allow -p with various push modes

This checks the supplied package name against the changelog.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoDgit.pm: Move $suite_re from dgit
Ian Jackson [Fri, 5 Jul 2019 18:39:38 +0000 (19:39 +0100)]
Dgit.pm: Move $suite_re from dgit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: Include quilt mode in archive/ tag in split view
Ian Jackson [Fri, 5 Jul 2019 13:07:08 +0000 (14:07 +0100)]
dgit: Include quilt mode in archive/ tag in split view

After this, a program examining this tag can see one of the following
possibilities:

"split --quilt=<splitting>"
   splitting quilt view, `3.0 (quilt)'

"split --quilt=<nonsplitting>"
   `3.0 (quilt)', mostly-dgit-compatible branch, but split view
   (bureaucracy commits not on maintainer branch)

"no-split --quilt=<nonsplitting>"
   `3.0 (quilt)', maintainer uses dgit branch

"split" / "no-split"
   non-`3.0 (quilt)'

No "split" or "no-split"
   generated by old versions of dgit, quilt transformation
   information not captured in machine-readable form

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: rpush protocol version 6: Include splitbrain param
Ian Jackson [Fri, 5 Jul 2019 15:11:43 +0000 (16:11 +0100)]
dgit: rpush protocol version 6: Include splitbrain param

And, in the push responder, check that we agree.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: rpush protocol: Actually select version 5 !
Ian Jackson [Fri, 5 Jul 2019 15:27:26 +0000 (16:27 +0100)]
dgit: rpush protocol: Actually select version 5 !

These must be most-preferred first, ie in reverse order.

Change the comment, to mention this.  The information about protocol
changes is in the detailed protocol description.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: determine_whether_split_brain: Make it take $format
Ian Jackson [Fri, 5 Jul 2019 15:04:00 +0000 (16:04 +0100)]
dgit: determine_whether_split_brain: Make it take $format

Rather than returning it.  Adjust the two call sites.
No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: rpush: Move push_parse_dsc earlier
Ian Jackson [Fri, 5 Jul 2019 15:01:01 +0000 (16:01 +0100)]
dgit: rpush: Move push_parse_dsc earlier

We are going to want this information sooner.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: push_mktags: Provide $format
Ian Jackson [Fri, 5 Jul 2019 13:05:41 +0000 (14:05 +0100)]
dgit: push_mktags: Provide $format

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: Break out format_quiltmode_splitting
Ian Jackson [Fri, 5 Jul 2019 12:59:04 +0000 (13:59 +0100)]
dgit: Break out format_quiltmode_splitting

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: push_mktags: Refactor introducing @dtxinfo
Ian Jackson [Fri, 5 Jul 2019 12:53:19 +0000 (13:53 +0100)]
dgit: push_mktags: Refactor introducing @dtxinfo

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: push_mktags: Rename variable $dtxinfo
Ian Jackson [Fri, 5 Jul 2019 12:51:54 +0000 (13:51 +0100)]
dgit: push_mktags: Rename variable $dtxinfo

No functional change

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: Start 9.1
Ian Jackson [Tue, 2 Jul 2019 15:57:26 +0000 (16:57 +0100)]
changelog: Start 9.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: finalise 9.0 archive/debian/9.0 debian/9.0
Ian Jackson [Tue, 2 Jul 2019 15:55:24 +0000 (16:55 +0100)]
changelog: finalise 9.0

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: Expand on explanation of #930922
Ian Jackson [Tue, 2 Jul 2019 14:36:42 +0000 (15:36 +0100)]
changelog: Expand on explanation of #930922

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: Tidy documentation of 9.0
Ian Jackson [Tue, 2 Jul 2019 14:22:31 +0000 (15:22 +0100)]
changelog: Tidy documentation of 9.0

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: Working on 9.0, run gbp-dch
Ian Jackson [Tue, 2 Jul 2019 13:39:36 +0000 (14:39 +0100)]
changelog: Working on 9.0, run gbp-dch

Run
  gbp dch --since=dgit/dgit/sid --ignore-branch
and edit the results to be in the 9.0~ stanza.

Needs a lot of tidying before release.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: start 9.0
Ian Jackson [Tue, 2 Jul 2019 13:38:27 +0000 (14:38 +0100)]
changelog: start 9.0

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: pseudo-finalise 8.6~
Ian Jackson [Tue, 2 Jul 2019 13:37:14 +0000 (14:37 +0100)]
changelog: pseudo-finalise 8.6~

We are going to add a new stanza for 9.0 but we aren't allowed
unfinalised entries in the middle of the changelog.  So finalise this
one with UNRELEASED.

When 8.6 actually goes out we will merge again and this will all be
more regular.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agoMerge branch 'buster'
Ian Jackson [Tue, 2 Jul 2019 13:36:04 +0000 (14:36 +0100)]
Merge branch 'buster'

4 years agochangelog: Document the change so far
Ian Jackson [Tue, 2 Jul 2019 13:35:21 +0000 (14:35 +0100)]
changelog: Document the change so far

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agochangelog: Retarget at buster
Ian Jackson [Tue, 2 Jul 2019 13:35:01 +0000 (14:35 +0100)]
changelog: Retarget at buster

This is now the stable branch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: debpolicy-taintrm: Drop some xxx's
Ian Jackson [Mon, 1 Jul 2019 12:38:50 +0000 (13:38 +0100)]
test suite: debpolicy-taintrm: Drop some xxx's

Testing without t-policy-periodic is probably more rigorous (and we
have other tests that do run it).  We don't want to duplicate this
test, as its value is probably not that great compared to its runtime.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: debpolicy-taintrm: New test
Ian Jackson [Mon, 1 Jul 2019 12:36:36 +0000 (13:36 +0100)]
test suite: debpolicy-taintrm: New test

Closes: #929249
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-repos-policy-debian: Add a tiny bit of debugging output
Ian Jackson [Mon, 1 Jul 2019 12:35:31 +0000 (13:35 +0100)]
dgit-repos-policy-debian: Add a tiny bit of debugging output

No other change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-maint-{merge,debrebase}(7): Using untagged upstream commits
Sean Whitton [Sun, 23 Jun 2019 16:07:57 +0000 (17:07 +0100)]
dgit-maint-{merge,debrebase}(7): Using untagged upstream commits

Closes: #930964
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agodgit-maint-debrebase(7): Minor wording change apropos of #930956
Ian Jackson [Mon, 1 Jul 2019 12:20:39 +0000 (13:20 +0100)]
dgit-maint-debrebase(7): Minor wording change apropos of #930956

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filter
Sean Whitton [Sun, 23 Jun 2019 15:31:02 +0000 (16:31 +0100)]
dgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filter

This is better than just --stat for finding new and deleted files in a
new upstream release, which may need accounting for in d/copyright.

Closes: #930956
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agogit-debrebase(1): typo fix
Niko Tyni [Sat, 8 Jun 2019 08:12:07 +0000 (11:12 +0300)]
git-debrebase(1): typo fix

[ S-o-b added after checking with ntyni on irc -iwj ]

Signed-off-by: Niko Tyni <ntyni@debian.org>
Closes: #930215
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agogit-debrebase: fix convert-from-dgit-view argv handling
Niko Tyni [Sat, 8 Jun 2019 07:58:01 +0000 (10:58 +0300)]
git-debrebase: fix convert-from-dgit-view argv handling

[ S-o-b added after checking with ntyni on irc -iwj ]

Signed-off-by: Niko Tyni <ntyni@debian.org>
Closes: #930214
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): baredebian+git: Document this alias
Ian Jackson [Sun, 30 Jun 2019 21:19:28 +0000 (22:19 +0100)]
dgit(1): baredebian+git: Document this alias

Suggested-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: baredebian-plusgit: New test for baredebian+git
Ian Jackson [Sun, 30 Jun 2019 21:16:56 +0000 (22:16 +0100)]
test suite: baredebian-plusgit: New test for baredebian+git

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit: baredebian: Honour baredebian+git alias for baredebian
Ian Jackson [Sun, 30 Jun 2019 21:16:20 +0000 (22:16 +0100)]
dgit: baredebian: Honour baredebian+git alias for baredebian

We convert this to `baredebian' internally, and that is what will
appear in messages.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: baredebian: Break out baredebian-test-minimum
Ian Jackson [Sun, 30 Jun 2019 21:15:28 +0000 (22:15 +0100)]
test suite: baredebian: Break out baredebian-test-minimum

Update all callers.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: baredebian-*: Drop explicit list of implied deps
Ian Jackson [Sun, 30 Jun 2019 20:07:49 +0000 (21:07 +0100)]
test suite: baredebian-*: Drop explicit list of implied deps

These are now handled by the scanning of t-import-*.

Change to the output is simply to move quilt earlier in the list.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: enumerate-tests: include deps of t-import-*
Ian Jackson [Sun, 30 Jun 2019 20:07:30 +0000 (21:07 +0100)]
test suite: enumerate-tests: include deps of t-import-*

No change to the resulting output.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: enumerate-tests: Drop duplicate dependencies
Ian Jackson [Sun, 30 Jun 2019 20:00:19 +0000 (21:00 +0100)]
test suite: enumerate-tests: Drop duplicate dependencies

No change to the output, other than to drop a second mention of
`devscripts' from one stanza in debian/tests/control.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: enumerate-tests: Break out allsedderies
Ian Jackson [Sun, 30 Jun 2019 13:52:32 +0000 (14:52 +0100)]
test suite: enumerate-tests: Break out allsedderies

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): In --include-dirty caveat, say "especially --clean=git"
Ian Jackson [Sun, 30 Jun 2019 13:30:27 +0000 (14:30 +0100)]
dgit(1): In --include-dirty caveat, say "especially --clean=git"

Closes: #930922
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): In --include-dirty caveat, mention --clean=dpkg-source
Ian Jackson [Sun, 30 Jun 2019 13:29:05 +0000 (14:29 +0100)]
dgit(1): In --include-dirty caveat, mention --clean=dpkg-source

Suggested-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): In --include-dirty caveat, use semantic newlines
Ian Jackson [Sun, 30 Jun 2019 13:28:24 +0000 (14:28 +0100)]
dgit(1): In --include-dirty caveat, use semantic newlines

No change to rendered output.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): expand on description of behaviour of --include-dirty
Sean Whitton [Sat, 22 Jun 2019 17:35:09 +0000 (18:35 +0100)]
dgit(1): expand on description of behaviour of --include-dirty

See #930922.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
4 years agodgit: Do not translate import commit messages
Ian Jackson [Sun, 30 Jun 2019 00:34:31 +0000 (01:34 +0100)]
dgit: Do not translate import commit messages

Translating these was a mistake.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): baredebian+tarball: Document new quilt mode
Ian Jackson [Sun, 30 Jun 2019 11:36:51 +0000 (12:36 +0100)]
dgit(1): baredebian+tarball: Document new quilt mode

Closes: #931253
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): baredebian: Add caveat about not checking edits
Ian Jackson [Sun, 30 Jun 2019 09:58:08 +0000 (10:58 +0100)]
dgit(1): baredebian: Add caveat about not checking edits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agodgit(1): baredebian: Fix an editing error
Ian Jackson [Sun, 30 Jun 2019 11:35:35 +0000 (12:35 +0100)]
dgit(1): baredebian: Fix an editing error

".gitignore" here is spurious.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: baredebian-multitar: Check tarball import structure
Ian Jackson [Sun, 30 Jun 2019 11:16:47 +0000 (12:16 +0100)]
test suite: baredebian-multitar: Check tarball import structure

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: lib-baredebian: Provide `origbase'
Ian Jackson [Sun, 30 Jun 2019 11:16:17 +0000 (12:16 +0100)]
test suite: lib-baredebian: Provide `origbase'

Was just a local variable `orig'.  Make it available.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: baredebian-multitar: New test
Ian Jackson [Sun, 30 Jun 2019 00:17:20 +0000 (01:17 +0100)]
test suite: baredebian-multitar: New test

We should exercise all that tarball import machinery.

The test doesn't yet really examine the results.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: lib-baredebian: Machinery for multiple origs
Ian Jackson [Sun, 30 Jun 2019 00:19:03 +0000 (01:19 +0100)]
test suite: lib-baredebian: Machinery for multiple origs

No functional change with existing caller.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: baredebian: Break out baredebian-tarball-mode
Ian Jackson [Sun, 30 Jun 2019 10:00:22 +0000 (11:00 +0100)]
test suite: baredebian: Break out baredebian-tarball-mode

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
4 years agotest suite: baredebian-tarball: New test
Ian Jackson [Sat, 29 Jun 2019 14:59:45 +0000 (15:59 +0100)]
test suite: baredebian-tarball: New test

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