chiark / gitweb /
dgit.git
2 years agochangelog: start 2.11~
Ian Jackson [Tue, 8 Nov 2016 20:48:17 +0000 (20:48 +0000)]
changelog: start 2.11~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: finalise 2.10 archive/debian/2.10
Ian Jackson [Tue, 8 Nov 2016 01:09:08 +0000 (01:09 +0000)]
changelog: finalise 2.10

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-user(7): More info about multisuite branch
Ian Jackson [Tue, 8 Nov 2016 01:06:44 +0000 (01:06 +0000)]
dgit-user(7): More info about multisuite branch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Gardening
Ian Jackson [Tue, 8 Nov 2016 00:24:44 +0000 (00:24 +0000)]
changelog: Gardening

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-tarbomb: Split out from import-nonnative
Ian Jackson [Mon, 7 Nov 2016 23:53:46 +0000 (23:53 +0000)]
Test suite: import-tarbomb: Split out from import-nonnative

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: lib-import-chk: Break out from import-nonnative
Ian Jackson [Mon, 7 Nov 2016 23:52:23 +0000 (23:52 +0000)]
Test suite: lib-import-chk: Break out from import-nonnative

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTests suite: import-nonnative: Put a .pc in the craziest .orig too
Ian Jackson [Mon, 7 Nov 2016 23:48:54 +0000 (23:48 +0000)]
Tests suite: import-nonnative: Put a .pc in the craziest .orig too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: remove_stray_gits: Print a slightly better message
Ian Jackson [Mon, 7 Nov 2016 23:44:52 +0000 (23:44 +0000)]
dgit: remove_stray_gits: Print a slightly better message

Change all call sites, and callers of mktree_in_ud_from_only_subdir.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: git_add_write_tree: Replace two open-coded git-add sites
Ian Jackson [Mon, 7 Nov 2016 23:40:22 +0000 (23:40 +0000)]
dgit: git_add_write_tree: Replace two open-coded git-add sites

No overall functional change.  (We end up passing `.' to git add,
which these two sites didn't previously.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-nonnative: Test origs with .git directories
Ian Jackson [Mon, 7 Nov 2016 23:24:54 +0000 (23:24 +0000)]
Test suite: import-nonnative: Test origs with .git directories

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-nonnative: Test tarbombs
Ian Jackson [Mon, 7 Nov 2016 23:21:22 +0000 (23:21 +0000)]
Test suite: import-nonnative: Test tarbombs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoCope when an orig tarball is a tarbomb.
Ian Jackson [Mon, 7 Nov 2016 23:12:42 +0000 (23:12 +0000)]
Cope when an orig tarball is a tarbomb.

Ie, if it contains other than one single directory toplevel.
Closes:#843422.

Specifically:

 * We change the unpack directory to _unpack-tar in unpack, rather
   than ../unpack-tar.  This means that mktree_in_ud DTRT in that
   directory, rather than in its supposed only subdiredctory
 * We do write-tree on the whole tarball.
 * Then if the tarball had only one subdir in it, we fish the
   subtree's tree object out of the git tree object.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-nonnative: Check that .orig contents match imported trees
Ian Jackson [Mon, 7 Nov 2016 23:05:42 +0000 (23:05 +0000)]
Test suite: import-nonnative: Check that .orig contents match imported trees

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-nonnative: Prepare for more tests
Ian Jackson [Mon, 7 Nov 2016 23:04:22 +0000 (23:04 +0000)]
Test suite: import-nonnative: Prepare for more tests

* Break chk into chk1 and chk2, so we can do stuff in the middle
* Remove $p between runs, so that we can do another test with the same $p

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Introduce git_add_write_tree
Ian Jackson [Mon, 7 Nov 2016 23:03:31 +0000 (23:03 +0000)]
dgit: Introduce git_add_write_tree

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoFix an unconditional print that was supposed to be a printdebug:
Ian Jackson [Mon, 7 Nov 2016 20:58:12 +0000 (20:58 +0000)]
Fix an unconditional print that was supposed to be a printdebug:

origs <blah>.orig.tar.gz f.same=1 #f._differ=-1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: aptget: un-disable cache clean
Ian Jackson [Mon, 7 Nov 2016 20:51:12 +0000 (20:51 +0000)]
dgit: aptget: un-disable cache clean

Have fudged it to see what it did, and it seems to work.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(1): Add caveat about multisuite-generated branches
Ian Jackson [Mon, 7 Nov 2016 03:11:33 +0000 (03:11 +0000)]
dgit(1): Add caveat about multisuite-generated branches

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: clone-reprepro: Use stunt parsechangelog
Ian Jackson [Mon, 7 Nov 2016 03:05:55 +0000 (03:05 +0000)]
Test suite: clone-reprepro: Use stunt parsechangelog

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoBetter error message for inappropriate multi-suite
Ian Jackson [Mon, 7 Nov 2016 02:38:33 +0000 (02:38 +0000)]
Better error message for inappropriate multi-suite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoDocument multisuite
Ian Jackson [Mon, 7 Nov 2016 02:41:44 +0000 (02:41 +0000)]
Document multisuite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: reprepro: Test multisuite with package absent in suite
Ian Jackson [Mon, 7 Nov 2016 02:59:13 +0000 (02:59 +0000)]
Test suite: reprepro: Test multisuite with package absent in suite

It is convenient to do this in this test case, particularly as that
lets us check that our apt-get method handles missing packages
properly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: multisuite: New test
Ian Jackson [Mon, 7 Nov 2016 02:58:49 +0000 (02:58 +0000)]
Test suite: multisuite: New test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Implement multi-suites
Ian Jackson [Mon, 7 Nov 2016 02:58:03 +0000 (02:58 +0000)]
dgit: Implement multi-suites

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: lib-reprepro: cope with non-codenamed suites
Ian Jackson [Mon, 7 Nov 2016 02:57:17 +0000 (02:57 +0000)]
Test suite: lib-reprepro: cope with non-codenamed suites

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: t-archive: DTRT if $suite is not sid
Ian Jackson [Mon, 7 Nov 2016 02:57:00 +0000 (02:57 +0000)]
Test suite: t-archive: DTRT if $suite is not sid

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoActually honour the branch name for $isuite, if we are on dgit branch
Ian Jackson [Mon, 7 Nov 2016 02:56:08 +0000 (02:56 +0000)]
Actually honour the branch name for $isuite, if we are on dgit branch

As documented in the manpage.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Print a debug message if clone removes due to error
Ian Jackson [Mon, 7 Nov 2016 02:55:22 +0000 (02:55 +0000)]
dgit: Print a debug message if clone removes due to error

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Move canonicalise_suite into fetch()
Ian Jackson [Mon, 7 Nov 2016 02:51:23 +0000 (02:51 +0000)]
dgit: Move canonicalise_suite into fetch()

fetchpullargs has to run before we have dealt with multisuites, which
cannot be straightforwardly canonicalised.

Move the canonicalisation out of fetchpullargs.  Previously,
fetchpullargs would always call canonicalise_suite if it wasn't going
to fail.  In one of the cases it would print a message, but we have
just changed canonicalise_suite to print a message too, so the one
from fetchpullargs was redundant.

fetchpullargs is called right before fetch, in cmd_fetch; and, in
cmd_pull.  In cmd_pull the split brain check intervenes between
fetchpullargs and pull which calls fetch.  So overall there is now no
functional change other than the loss of the now-redundant message.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoclone: Postpone canonicalise_suite
Ian Jackson [Mon, 7 Nov 2016 02:50:12 +0000 (02:50 +0000)]
clone: Postpone canonicalise_suite

We are going to want to do some other things beforehand, but after the
dryrun safety catch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Make clone_set_head not depend on $giturl
Ian Jackson [Mon, 7 Nov 2016 02:49:22 +0000 (02:49 +0000)]
dgit: Make clone_set_head not depend on $giturl

When cloning a distro which has no git server, correctly leave the
user on the local dgit branch, not on `master'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: clone: Break out clone_set_head and clone_finish
Ian Jackson [Mon, 7 Nov 2016 02:47:55 +0000 (02:47 +0000)]
dgit: clone: Break out clone_set_head and clone_finish

Again, we are going to want to reuse these bits.

No functional change right now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: fetch_from_archive: Break out _record_1 and _2.
Ian Jackson [Mon, 7 Nov 2016 02:45:13 +0000 (02:45 +0000)]
dgit: fetch_from_archive: Break out _record_1 and _2.

We are going to want to reuse these bits of the fetch finishing-up.

No functional change right now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Always print canonical suite name
Ian Jackson [Mon, 7 Nov 2016 02:44:23 +0000 (02:44 +0000)]
dgit: Always print canonical suite name

Not only when a noncanonical one was specified.  This makes some
output less confusing - especially when combined with the forthcoming
multisuite feature.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: printdone: Use $us.
Ian Jackson [Mon, 7 Nov 2016 02:43:59 +0000 (02:43 +0000)]
dgit: printdone: Use $us.

No significant functional change right now.
When $us changes, it will be more right.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Pass --force-distribution to dch
Ian Jackson [Mon, 7 Nov 2016 02:39:11 +0000 (02:39 +0000)]
Test suite: Pass --force-distribution to dch

If it's wrong, we know what we're doing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Provide reprepro test (for aptget method)
Ian Jackson [Sun, 6 Nov 2016 20:43:41 +0000 (20:43 +0000)]
Test suite: Provide reprepro test (for aptget method)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: orig-include-exclude: Remove some commented-out obsolete bit
Ian Jackson [Sun, 6 Nov 2016 20:41:33 +0000 (20:41 +0000)]
Test suite: orig-include-exclude: Remove some commented-out obsolete bit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Introduce $t_archive_method
Ian Jackson [Sun, 6 Nov 2016 20:40:04 +0000 (20:40 +0000)]
Test suite: Introduce $t_archive_method

* Indirect t-archive-none and t-archive-query via this variable

* Rename t-archive-updated; it is for callers that have updated
  aq/package.$suite.$p.  There is one out-of-lib caller.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: canonicalise_suite_aptget: Add a bit of debug
Ian Jackson [Sun, 6 Nov 2016 20:35:13 +0000 (20:35 +0000)]
dgit: canonicalise_suite_aptget: Add a bit of debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoSupport the Debian *-security suites.
Ian Jackson [Sun, 6 Nov 2016 18:29:47 +0000 (18:29 +0000)]
Support the Debian *-security suites.

(Provide the configuration to use the aptget method.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: aptget archive access method
Ian Jackson [Sun, 6 Nov 2016 18:28:37 +0000 (18:28 +0000)]
dgit: aptget archive access method

Uses Sources.  This is not very efficient and should be avoided for
large apt repositories.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: config: Allow dgit-suite.PATTERN.distro
Ian Jackson [Sun, 6 Nov 2016 18:26:01 +0000 (18:26 +0000)]
dgit: config: Allow dgit-suite.PATTERN.distro

This is going to be useful for *-security.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Introduce access_nomdistro()
Ian Jackson [Sun, 6 Nov 2016 18:23:01 +0000 (18:23 +0000)]
dgit: Introduce access_nomdistro()

This distro name is used for tag names, protocol elements, etc., and
also as a search element for config lookups.

Each distro can specify a nominal-distro.

No functional change with current config.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Introduce archive_query_prepend_mirror
Ian Jackson [Sun, 6 Nov 2016 18:21:50 +0000 (18:21 +0000)]
dgit: Introduce archive_query_prepend_mirror

Now the archive_query functions return urls, not subpaths.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: parsecontrol: Support $allowsigned (nfc)
Ian Jackson [Sun, 6 Nov 2016 18:20:45 +0000 (18:20 +0000)]
dgit: parsecontrol: Support $allowsigned (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Add fakeroot and make to Test-Depends.
Ian Jackson [Tue, 1 Nov 2016 21:05:41 +0000 (21:05 +0000)]
Test suite: Add fakeroot and make to Test-Depends.

These aren't necessarily pulled in by anything else.  (dpkg-dev
Recommends build-essential.  But we don't actually need
build-essential.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: start 2.10~
Ian Jackson [Tue, 1 Nov 2016 21:00:32 +0000 (21:00 +0000)]
changelog: start 2.10~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agofinalise 2.9 archive/debian/2.9
Ian Jackson [Mon, 31 Oct 2016 12:53:32 +0000 (12:53 +0000)]
finalise 2.9

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(1): Better summaries of dgit-maint-merge(7) and dgit-maint-gbp(7)
Ian Jackson [Mon, 31 Oct 2016 12:42:51 +0000 (12:42 +0000)]
dgit(1): Better summaries of dgit-maint-merge(7) and dgit-maint-gbp(7)

Suggested-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-user(7): Suggest "3.0 (native)" rather than bodging 1.0 native
Ian Jackson [Mon, 31 Oct 2016 01:51:28 +0000 (01:51 +0000)]
dgit-user(7): Suggest "3.0 (native)" rather than bodging 1.0 native

This is better than --dpkg-source:-sn because it produces a git tree
which doesn't need weird options, and doesn't delete the user's .orig
(which might still be useful eg for some dgit fetch).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-sponsorship(7): Suggest supplying sample git-archive(1) cmds
Sean Whitton [Mon, 31 Oct 2016 01:15:35 +0000 (18:15 -0700)]
dgit-sponsorship(7): Suggest supplying sample git-archive(1) cmds

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
2 years agodgit-maint-merge(7): Drop subpoint about "nonlinear histories"
Ian Jackson [Mon, 31 Oct 2016 01:01:53 +0000 (01:01 +0000)]
dgit-maint-merge(7): Drop subpoint about "nonlinear histories"

Suggested by Sean

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)
Ian Jackson [Mon, 31 Oct 2016 00:31:02 +0000 (00:31 +0000)]
dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-nmu-simple(7): Remove obsolete caution about lack of DELAYED support
Ian Jackson [Mon, 31 Oct 2016 00:26:40 +0000 (00:26 +0000)]
dgit-nmu-simple(7): Remove obsolete caution about lack of DELAYED support

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Organise for 2.9
Ian Jackson [Mon, 31 Oct 2016 00:22:03 +0000 (00:22 +0000)]
changelog: Organise for 2.9

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Set urgency to medium - many bugfixes
Ian Jackson [Mon, 31 Oct 2016 00:20:18 +0000 (00:20 +0000)]
changelog: Set urgency to medium - many bugfixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: import-dsc: Work in formal (adt) mode
Ian Jackson [Mon, 31 Oct 2016 00:13:41 +0000 (00:13 +0000)]
Test suite: import-dsc: Work in formal (adt) mode

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoFix changelog entry for SIGPIPE to correctly mention Closes:#841090. Closes:#841090.
Ian Jackson [Mon, 31 Oct 2016 00:08:26 +0000 (00:08 +0000)]
Fix changelog entry for SIGPIPE to correctly mention Closes:#841090. Closes:#841090.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Fix ref to #842577
Ian Jackson [Mon, 31 Oct 2016 00:02:32 +0000 (00:02 +0000)]
changelog: Fix ref to #842577

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoMerge branch 'wip.tutorials' into wip
Ian Jackson [Sun, 30 Oct 2016 23:56:29 +0000 (23:56 +0000)]
Merge branch 'wip.tutorials' into wip

2 years agoMerge remote-tracking branch 'spwhitton/wip.tutorials-new' into wip.tutorials
Ian Jackson [Sun, 30 Oct 2016 23:55:52 +0000 (23:55 +0000)]
Merge remote-tracking branch 'spwhitton/wip.tutorials-new' into wip.tutorials

2 years agodgit-maint-native(7): Soften warning about ugliness
Sean Whitton [Sun, 30 Oct 2016 23:54:35 +0000 (16:54 -0700)]
dgit-maint-native(7): Soften warning about ugliness

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
2 years agodgit(1): Recommend -nmu-simple(7) for DDs only, not DMs
Ian Jackson [Sun, 30 Oct 2016 23:54:06 +0000 (23:54 +0000)]
dgit(1): Recommend -nmu-simple(7) for DDs only, not DMs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(1): Remove obsolete workflow information.
Ian Jackson [Sun, 30 Oct 2016 23:36:24 +0000 (23:36 +0000)]
dgit(1): Remove obsolete workflow information.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-nmu-simple(7): Mention vcs-git
Ian Jackson [Sun, 30 Oct 2016 23:36:01 +0000 (23:36 +0000)]
dgit-nmu-simple(7): Mention vcs-git

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-maint-native(7): New manpage
Ian Jackson [Sun, 30 Oct 2016 23:35:28 +0000 (23:35 +0000)]
dgit-maint-native(7): New manpage

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoMakefile: Fix a formatting error (nfc)
Ian Jackson [Sun, 30 Oct 2016 23:33:07 +0000 (23:33 +0000)]
Makefile: Fix a formatting error (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(1): Update BUGS section
Ian Jackson [Sun, 30 Oct 2016 23:31:28 +0000 (23:31 +0000)]
dgit(1): Update BUGS section

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(1): Reference tutorials
Ian Jackson [Sun, 30 Oct 2016 23:31:09 +0000 (23:31 +0000)]
dgit(1): Reference tutorials

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit(7): Substantial updates
Ian Jackson [Sun, 30 Oct 2016 22:47:43 +0000 (22:47 +0000)]
dgit(7): Substantial updates

Including documenting split view.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: inarchivecopy: Test a suite containing only inarchive copies
Ian Jackson [Sun, 30 Oct 2016 22:11:49 +0000 (22:11 +0000)]
Test suite: inarchivecopy: Test a suite containing only inarchive copies

Tests the fix for #842621.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: inarchivecopy: Do a "git init" and "git fetch" test too
Ian Jackson [Sun, 30 Oct 2016 22:11:15 +0000 (22:11 +0000)]
Test suite: inarchivecopy: Do a "git init" and "git fetch" test too

This checks that we receive all the needed objects even if we don't do
git clone.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: inarchivecopy: Prepare for another destination suite
Ian Jackson [Sun, 30 Oct 2016 22:10:38 +0000 (22:10 +0000)]
Test suite: inarchivecopy: Prepare for another destination suite

Replace several hardcoded `stable'.  No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Change t-has-parent to t-has-parent-or-is
Ian Jackson [Sun, 30 Oct 2016 22:06:24 +0000 (22:06 +0000)]
Test suite: Change t-has-parent to t-has-parent-or-is

This is only used by the inarchivecopy test.  And that ought not to
fail if there is no into-suite pseudomerge: that is, when the suite
branch contains the intended commit, rather than something merging the
intended commit into the suite branch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: examplegit setup: Provide "testing" suite too
Ian Jackson [Sun, 30 Oct 2016 22:05:06 +0000 (22:05 +0000)]
Test suite: examplegit setup: Provide "testing" suite too

One of the tests is going to want this.  We ourselves leave it empty.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years ago-p option: Check against changelog
Ian Jackson [Sun, 30 Oct 2016 22:04:27 +0000 (22:04 +0000)]
-p option: Check against changelog

If -p is specified during push, we check that it's right.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoActually provide a -p (--package=) option (!)
Ian Jackson [Sun, 30 Oct 2016 22:03:26 +0000 (22:03 +0000)]
Actually provide a -p (--package=) option (!)

def02420f6d5 "-p option" abolished various adhocery in command line
positional parameter parsing and documented the -p option.  But it
didn't implement it!

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoProperly fetch all archive dgit view tags, as we intended.
Ian Jackson [Sun, 30 Oct 2016 21:59:43 +0000 (21:59 +0000)]
Properly fetch all archive dgit view tags, as we intended.

This deals with the possible "bad object" problem from an in-archive
copy.  Any such in-archive copy should come with either an update to
the suite branch on the dgit-repos server (if maybe it needed a
pseudomerge for centrally maintained history), or be identical to the
upload's version tag.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit_fetch_us: More debugging (nfc)
Ian Jackson [Sun, 30 Oct 2016 21:58:58 +0000 (21:58 +0000)]
git_fetch_us: More debugging (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoCope when cloning suite which doesn't receive uploads, like testing.
Ian Jackson [Sun, 30 Oct 2016 21:04:22 +0000 (21:04 +0000)]
Cope when cloning suite which doesn't receive uploads, like testing.

If $lastpush_hash is '', it means that the dgit git server does not
have the suite branch.  That can even happen if the current version in
the suite was a .dsc with a Dgit field, if an in-archive copy moved
the .dsc from whereever it was uploaded.

Do not crash in this situation.  Instead, give the user the Dgit hash
(and maybe pseudomerge it with the user's history - sigh).

There is still a possible problem: maybe the referenced commit is on
another branch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agochangelog: Mention fix for #842386
Ian Jackson [Sun, 30 Oct 2016 20:16:13 +0000 (20:16 +0000)]
changelog: Mention fix for #842386

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoReject `dgit pull' in split view quilt modes
Ian Jackson [Sun, 30 Oct 2016 20:06:28 +0000 (20:06 +0000)]
Reject `dgit pull' in split view quilt modes

To avoid creating unfortunate wreckage on non-dgit-view
branches.  Closes:#842608.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: gbp-orig: New test (for #841094)
Ian Jackson [Sun, 30 Oct 2016 19:49:31 +0000 (19:49 +0000)]
Test suite: gbp-orig: New test (for #841094)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: t-splitbrain-pushed-good--unpack: Handle new .origs
Ian Jackson [Sun, 30 Oct 2016 19:49:12 +0000 (19:49 +0000)]
Test suite: t-splitbrain-pushed-good--unpack: Handle new .origs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit gbp-build will arrange to let gbp buildpackage generate .orig tarballs
Ian Jackson [Sun, 30 Oct 2016 19:48:43 +0000 (19:48 +0000)]
dgit gbp-build will arrange to let gbp buildpackage generate .orig tarballs

if it seems applicable.  Closes:#841094.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Introduce build_prep_early
Ian Jackson [Sun, 30 Oct 2016 19:44:43 +0000 (19:44 +0000)]
dgit: Introduce build_prep_early

Currently only one call site which is only ever called once.  We make
it idempotent since we're going to want that.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit-maint-gbp(7): Remove optimistic claim of 1-command NMU inclusion
Ian Jackson [Sun, 30 Oct 2016 20:57:01 +0000 (20:57 +0000)]
dgit-maint-gbp(7): Remove optimistic claim of 1-command NMU inclusion

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit: Introduce upstreamversion
Ian Jackson [Sun, 30 Oct 2016 19:44:36 +0000 (19:44 +0000)]
dgit: Introduce upstreamversion

And many call sites.  No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoSupport dgit --delayed= push
Ian Jackson [Sun, 30 Oct 2016 17:55:55 +0000 (17:55 +0000)]
Support dgit --delayed= push

(with a warning in the manpage about possible skew).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agodgit clone: Set timestamps in cloned tree to a single unified time.
Ian Jackson [Sun, 30 Oct 2016 16:34:11 +0000 (16:34 +0000)]
dgit clone: Set timestamps in cloned tree to a single unified time.

This makes it less likely that the user will trip over any
timestamp-dependent FTBFS bugs (eg #842452).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Test --dgit-view-save everywhere
Ian Jackson [Sun, 30 Oct 2016 16:26:00 +0000 (16:26 +0000)]
Test suite: Test --dgit-view-save everywhere

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoNew option --dgit-view-save= for split view quilt modes.
Ian Jackson [Sun, 30 Oct 2016 16:25:31 +0000 (16:25 +0000)]
New option --dgit-view-save= for split view quilt modes.

In particular, means that the output of a split view quilt-fixup is
left somewhere useful.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Make t-ref-same* errors better by tracking and printing names
Ian Jackson [Sun, 30 Oct 2016 15:03:39 +0000 (15:03 +0000)]
Test suite: Make t-ref-same* errors better by tracking and printing names

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Make t-refs-same* not wrongly ignore some nonexistent refs
Ian Jackson [Sun, 30 Oct 2016 14:39:14 +0000 (14:39 +0000)]
Test suite: Make t-refs-same* not wrongly ignore some nonexistent refs

Previously, t_ref_val="" was meant to mean "no refs specified yet" but
could also arise from "ref was specified but did not exist".

Distinguish these two cases, by using t_ref_val="" to mean only the
latter.  "No refs specified yet" is represented as t_ref_val unset.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: inarchivecopy: Fix tag-vs-remote checking
Ian Jackson [Sun, 30 Oct 2016 15:04:07 +0000 (15:04 +0000)]
Test suite: inarchivecopy: Fix tag-vs-remote checking

This was entirely broken, and only works because (a) $vtag^1 does not
exist, and (b) this is erroneously not spotted by t-ref-same-*.

Instead check that the suite branch has the tag (of the package which
has been moved into that suite) as a direct ancestor.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Provide t-has-parent
Ian Jackson [Sun, 30 Oct 2016 15:03:23 +0000 (15:03 +0000)]
Test suite: Provide t-has-parent

No callers yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Document args to t-has-ancestor
Ian Jackson [Sun, 30 Oct 2016 15:03:07 +0000 (15:03 +0000)]
Test suite: Document args to t-has-ancestor

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoTest suite: Explicitly configure user.name and user.email
Ian Jackson [Thu, 27 Oct 2016 19:22:10 +0000 (20:22 +0100)]
Test suite: Explicitly configure user.name and user.email

So that tests work when environment doesn't have
defaults.

Closes:#842279 (I hope).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agoimport-dsc: Actually print signature warning without --require-valid
Ian Jackson [Tue, 25 Oct 2016 15:42:07 +0000 (16:42 +0100)]
import-dsc: Actually print signature warning without --require-valid

If --require-valid-signature was not set, we would not print the
warning if there was one.  That is quite wrong.

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