Test suite: Replace make in Test-Depends with build-essential.

Most of the tests do in fact run dpkg-buildpackage which bombs out if
build-essential is missing.

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

changelog: start 2.11~

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

changelog: finalise 2.10

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

dgit-user(7): More info about multisuite branch

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

changelog: Gardening

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

Test suite: import-tarbomb: Split out from import-nonnative

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

Test suite: lib-import-chk: Break out from import-nonnative

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

Tests suite: import-nonnative: Put a .pc in the craziest .orig too

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

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>

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>

Test suite: import-nonnative: Test origs with .git directories

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

Test suite: import-nonnative: Test tarbombs

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

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>

Test suite: import-nonnative: Check that .orig contents match imported trees

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

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>

dgit: Introduce git_add_write_tree

No functional change.

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

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>

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>

dgit(1): Add caveat about multisuite-generated branches

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

Test suite: clone-reprepro: Use stunt parsechangelog

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

Better error message for inappropriate multi-suite

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

Document multisuite

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

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>

Test suite: multisuite: New test

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

dgit: Implement multi-suites

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

Test suite: lib-reprepro: cope with non-codenamed suites

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

Test suite: t-archive: DTRT if $suite is not sid

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

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>

dgit: Print a debug message if clone removes due to error

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

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>

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>

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>

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>

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>

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>

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>

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>

Test suite: Provide reprepro test (for aptget method)

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

Test suite: orig-include-exclude: Remove some commented-out obsolete bit

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

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>

dgit: canonicalise_suite_aptget: Add a bit of debug

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

Support the Debian *-security suites.

(Provide the configuration to use the aptget method.)

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

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>

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>

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>

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>

dgit: parsecontrol: Support $allowsigned (nfc)

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

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>

changelog: start 2.10~

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

finalise 2.9

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

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>

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>

dgit-sponsorship(7): Suggest supplying sample git-archive(1) cmds

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

dgit-maint-merge(7): Drop subpoint about "nonlinear histories"

Suggested by Sean

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

dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)

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

dgit-nmu-simple(7): Remove obsolete caution about lack of DELAYED support

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

changelog: Organise for 2.9

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

changelog: Set urgency to medium - many bugfixes

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

Test suite: import-dsc: Work in formal (adt) mode

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

Fix changelog entry for SIGPIPE to correctly mention Closes:#841090. Closes:#841090.

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

changelog: Fix ref to #842577

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

Merge branch 'wip.tutorials' into wip

Merge remote-tracking branch 'spwhitton/wip.tutorials-new' into wip.tutorials

dgit-maint-native(7): Soften warning about ugliness

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

dgit(1): Recommend -nmu-simple(7) for DDs only, not DMs

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

dgit(1): Remove obsolete workflow information.

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

dgit-nmu-simple(7): Mention vcs-git

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

dgit-maint-native(7): New manpage

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

Makefile: Fix a formatting error (nfc)

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

dgit(1): Update BUGS section

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

dgit(1): Reference tutorials

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

dgit(7): Substantial updates

Including documenting split view.

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

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>

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>

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>

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>

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>

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

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>

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>

git_fetch_us: More debugging (nfc)

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

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>

changelog: Mention fix for #842386

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

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>

Test suite: gbp-orig: New test (for #841094)

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

Test suite: t-splitbrain-pushed-good--unpack: Handle new .origs

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

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>

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>

dgit-maint-gbp(7): Remove optimistic claim of 1-command NMU inclusion

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

dgit: Introduce upstreamversion

And many call sites.  No functional change.

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

Support dgit --delayed= push

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

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

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>

Test suite: Test --dgit-view-save everywhere

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

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>

Test suite: Make t-ref-same* errors better by tracking and printing names

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

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>

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>

Test suite: Provide t-has-parent

No callers yet.

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

Test suite: Document args to t-has-ancestor

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

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>