chiark / gitweb /
Ian Jackson [Wed, 17 Jul 2019 02:22:50 +0000 (03:22 +0100)]
tag2upload: baredebian: Pass dgit refs/tags/, not the commit hash
This will enable git to report the upstream tag in its messages.
The tag name is safe to pass here since dgit only uses its referent,
unless it is nice enough to print.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Jul 2019 02:16:29 +0000 (03:16 +0100)]
Dgit.pm: resolve_upstream_version: Report tag, where sensible
This affect what is show in commit messages (including the parseable
parts) made by dgit and git-debrebase. Now they prefer to refer to
the tag name if the caller specified refs/tags/ and the tag name is
a nice one.
This is not expected to make much difference for human callers (who
will probably not explicitly qualify their tag refs). But it will
make a difference for scripts.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Jul 2019 01:47:22 +0000 (02:47 +0100)]
tag2upload: Actually recognise and honour --quilt in tag
Non-default quilt modes were completely broken before.
We only didn't notice because the existing tests worked with the
default.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Jul 2019 01:46:58 +0000 (02:46 +0100)]
dgit-repos-server: parsetag: Print a bit more debug about junk
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Jul 2019 01:03:55 +0000 (02:03 +0100)]
dgit-repos-server: Don't crash on --quilt=baredebian
The die needs to be qualified. This little bit of fcode has never
worked.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Jul 2019 02:18:31 +0000 (03:18 +0100)]
Dgit.pm: reflog_cache_insert: Use ensurepath for the reflog
Otherwise quilt fixup can fail in a too-fresh git tree.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Jul 2019 02:14:34 +0000 (03:14 +0100)]
Dgit.pm: Provide `ensurepath'
Like `ensuredir' but also a bit like a more controlled `mkdir -p'.
We use make_path from File::Path. It dies on failure.
No caller yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Jul 2019 01:11:31 +0000 (02:11 +0100)]
test suite: tagupl-*: Move t-pushed-good out of t-tagupl-test
We are going to want to do this separately in some cases.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Jul 2019 21:02:37 +0000 (22:02 +0100)]
changelog: Start 9.3
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Jul 2019 21:01:32 +0000 (22:01 +0100)]
changelog: Finalise 9.2 (no source changes)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jul 2019 13:30:45 +0000 (14:30 +0100)]
changelog: start 9.2
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jul 2019 13:28:45 +0000 (14:28 +0100)]
changelog: finalise 9.1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jul 2019 13:27:09 +0000 (14:27 +0100)]
changelog: Minor adjustment to git-debpush discussion
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jul 2019 13:23:19 +0000 (14:23 +0100)]
changelog: Add a couple of missing entries
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jul 2019 13:12:29 +0000 (14:12 +0100)]
dgit-repos-server: Remove comment saying it's a prototype
We have done everything to make it safe to use. Obviously it still
needs some web service queue thing around it to invoke it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Sun, 7 Jul 2019 08:54:37 +0000 (09:54 +0100)]
git-debpush(1): Tweak AUTHOR section
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Sean Whitton [Sun, 7 Jul 2019 06:14:35 +0000 (07:14 +0100)]
git-debpush: Don't pretend to support --baredebian+tarball
Instead of just deleting the option from the argument parser, accept
it, but print a message explicitly stating that the *quilt mode* is
not supported by this workflow (i.e. it's not just git-debpush passing
the quilt mode on to tag2upload that we don't support).
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Sean Whitton [Sun, 7 Jul 2019 06:09:42 +0000 (07:09 +0100)]
changelog: Update
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Sean Whitton [Sun, 7 Jul 2019 06:09:08 +0000 (07:09 +0100)]
git-debpush(1): Fix POD formatting
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Ian Jackson [Sun, 7 Jul 2019 10:08:01 +0000 (11:08 +0100)]
test suite: unset CDPATH
This can cause tests to pass which should fail (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 23:13:50 +0000 (00:13 +0100)]
test suite: tagupl: Test git-debpush --upstream=
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 23:09:14 +0000 (00:09 +0100)]
git-debpush: Defend against git-deborig #931509
Without this, when git-deborig fails and #931509 isn't fixed,
git-debpush will silently exit with a nonzero exit status which is
very unfriendly.
With this change it does something like this:
git-debpush: git-deborig failed; maybe try git-debpush --upstream=TAG
fatal: Invalid object name 'refs/tags/couldn't find any of the following tags'.
It then exits status 127. This is obviously daft, but making this
any better is even more complex.
When git-deborig is fixed it will do this:
couldn't find any of the following tags: 1.0, v1.0, upstream/1.0
tell me a tag or branch head to make an orig.tar from: git deborig --just-print '--version=1.0-1' COMMITTISH
git-debpush: git-deborig failed; maybe try git-debpush --upstream=TAG
which is still not brilliant but I guess it will do.
The downside, if it is one, is that we lose git-deborig's original
exit status.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>
Ian Jackson [Sat, 6 Jul 2019 22:55:58 +0000 (23:55 +0100)]
test suite: tagupl: Drop an unused variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:54:54 +0000 (23:54 +0100)]
git-debpush: Support --upstream=TAG (and document it)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:51:13 +0000 (23:51 +0100)]
git-debpush: Defend against unexpected git-deborig output
If git-deborig prints something other than a tag name, for example an
error message (see #931509), this approach will bomb out, roughly
appropriately.
This will also become useful when we make upstream_tag overrideable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>
Ian Jackson [Sat, 6 Jul 2019 22:32:22 +0000 (23:32 +0100)]
git-debpush: Change comment heading
IMO "Principles of Operation" would be a comprehensive reference
detailing the model and functionality. I think "Design Principles"
is the conventional name for semi-self-imposed choices/constraints.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Acked-by: Sean Whitton <spwhitton@spwhitton.name>
Ian Jackson [Sat, 6 Jul 2019 22:28:34 +0000 (23:28 +0100)]
test suite: t-tagupl-test: Check that salsa master was pushed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:25:29 +0000 (23:25 +0100)]
test suite: tagupl-native: Drop obsolete todo comment
We do now test all these, in tests/tests/tagupl.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:24:19 +0000 (23:24 +0100)]
test suite: t-tagupl-test: Use "salsa" as the source
This checks that push pushed the tag(s) there.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:23:46 +0000 (23:23 +0100)]
test suite: t-tagupl-run-drs: New source parameter
Change all callers.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:23:19 +0000 (23:23 +0100)]
test suite: tagupl*: Drop use of --no-push
Now we do actually push.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:21:50 +0000 (23:21 +0100)]
test suite: t-tagupl-setting: Provide a "salsa" remote
This will give git-debpush somewhere to push to.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 22:12:44 +0000 (23:12 +0100)]
test suite: tagupl*: Run t-tagupl-settings in $p
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 20:49:41 +0000 (21:49 +0100)]
git-debpush: Fixes to help with pushing native packages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Sat, 6 Jul 2019 20:32:39 +0000 (21:32 +0100)]
changelog: Entry for new "git-push-to-upload" workflow tools
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Ian Jackson [Sat, 6 Jul 2019 18:51:42 +0000 (19:51 +0100)]
dgit-repos-server: tag2upload: Clarify key situation comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 18:49:52 +0000 (19:49 +0100)]
test suite: tagupl: Check Source mismatch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 18:45:18 +0000 (19:45 +0100)]
test suite: tagupl: Test changelog version
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 18:45:04 +0000 (19:45 +0100)]
dgit-repos-server: tag2upload: Check changelog info
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 18:44:53 +0000 (19:44 +0100)]
test suite: tagupl: Update version when needed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 18:26:12 +0000 (19:26 +0100)]
test suite: tagupl: Test lack of signature
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jul 2019 08:52:42 +0000 (09:52 +0100)]
test suite: tagupl: Test signature verification fail.
This test case is broken because it doesn't call t-tagupl-run-drs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 17:57:25 +0000 (18:57 +0100)]
test suite: tagupl: raw-mangled: Use 1.0-2 tagname in raw-mangled
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 17:55:43 +0000 (18:55 +0100)]
test suite: tagupl: raw-mangled: Fix mangled tagger test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 17:43:22 +0000 (18:43 +0100)]
test suite: tagupl: raw-mangled: Break out
No functional change.
This test case is broken because it doesn't call t-tagupl-run-drs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 6 Jul 2019 17:37:21 +0000 (18:37 +0100)]
test suite: tagupl: A few more error case tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>