Declare fast forward from 0.22-experimental2

[dgit --overwrite=0.22-experimental2]

changelog: finalise 4.0

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

dgit: --deliberately-not-fast-forward works properly in split view quilt modes (suppressing the pseudomerge).

changelog: start 4.0~

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

changelog: start 3.11~

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

changelog: finalise 3.10

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

changelog: Update for docs fixes

Signed-off-by: Nicholas D Steeves <nsteeves@gmail.com>

docs: Fix typos

Signed-off-by: Nicholas D Steeves <nsteeves@gmail.com>

import-maintmangle: New test for changelog Maintainer mangling.

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

lib-import-chk: New import_chk_changelog_massage hook

Nothing sets this yet, so no functional change.

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

dgit: importing: Better handle commas in changelog maintainer fields

Some maintainers have written commas in the maintainer field of their
changelog entries.  Such changelog entries could not be imported.

clogp_authline had code to replace multiple maintainers (which are
hypothetical right now) into just the first, but that trips on these
maintainers with commas.

Ultimately we should expect that the Maintainer: field from
dpkg-parsechangelog is in (a subset of) RFC5322 recipient field
format.  In that format, any commas would need to be quoted.

So:

If the Maintainer field from dpkg-parsechangelog has a comma which has
no @ or " before it, then we consider it a single old-school
comma-containing maintainer.  If it were intended as multiple
maintainers, then the first maintainer has no email address.  Not
coping properly with that very-hypothetical future seems OK.  We
simply delete the comma, so that the things we record in the git
history are more conservative.

If there is a " we leave things untouched in the hope that this is a
single address, albeit with some quoting.  The alternative would be to
try to use a full RFC5322 parser.  That's quite a risky change.

Perhaps we will revisit this after stretch.

For now this Closes:#852661.

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

test suite: lib-import-chk: Test commit authorship

Check that commits have smae authorship as appears in the changelog.
(Or, at least, the same authorship set.)

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

dgit: Do not fail when run with detached HEAD.  Closes:#853022.

Specifically:

* Pass -q to git-symbolic-ref.  That means that it doesn't print
  an error message when HEAD is not a symbolic ref (ie, a
  detached head), and it means that the exit status is then 1
  rather than 128.

* If the return value from cmdoutput_errok is undef, check $? (which
  is the exit status <<8) and then simply pass on the undef.

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

dgit: branchsuite: Break out @cmd

We are going to need to reuse this to print a proper error message.

No functional change.

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

dgit: Strip initial newline from Changes line from dpkg-parsechangelog

so as to avoid blank line in commit messages.  Closes:#853093.

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

test suite: quilt-useremail: New test for user config copying

Test for #853085.

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

dgit: Copy several user.* settings from main tree git local config

Copy to dgit private workarea.  Closes:#853085.

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

changelog: start 3.10~

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

changelog: finalise 3.9

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

dgit-maint-merge(7): Quote sample clone commands

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

dgit-maint-merge(7): Get git clone url right.  Closes:#852609.

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

test suite: overwrite-chkclog: test UNRELEASED handling.

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

dgit --overwrite: Check $gf->('Distribution')

Check that the overwritten version's changelog entry is not
UNRELEASED.

This could easily happen if this release was being made from a git
branch which predates the previous package upload, with working
practices which commit finalised UNRELEASED changelog entries with the
complete version number for the next upload.  (Such practices seem
quite common.)

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

pseudomerge_version_check; Break out $gf

No functional change.

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

changelog: start 3.9~

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

changelog: finalise 3.8

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

test suite: defdistro-setup: Test that setup-* functions distro selection works.

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

test suite: t-defdistro: Set distro='' too

This means that t-defdistro works without t-chain-test and
reinvocation.

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

config and suite handling: Make dgit-setup-* work in default distro.

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

changelog: start 3.8~

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

finalise 3.7

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

changelog: Documemnt dgit-maint-merge changes

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

dgit-maint-merge(7): updates re #852090: suggestions by Sean

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

dgit-maint-merge(7): updates re #852090: suggestions by me

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

dgit-maint-merge(7): updates re #852090: suggestions by me

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

dgit-maint-merge(7): updates re #852090: suggestions by me

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

dgit-maint-merge(7): Fix a typo `detachs'

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

Makefile: New %.view target:

`make dgit-maint-merge.7.view' runs `man -l ...'

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

test suite: defdistro-dsd-clone-drs: New test

Would have detected #851906 (and hopefully #850521).

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

changelog: Document fixes to repos_server_url

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

dgit: repos_server_url: Set $access_forpush to 1

In 468edf05661e "dgit: clone-dgit-repos-server: Set $access_forpush"
we set this to 0.

But this is wrong.  The dgit-repos-server is used for pushing, not for
readonly access.  The readonly url may be entirely wrong, and indeed
it is, for Debian.

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

dgit: repos_server_url: Set $isuite

We need to set this or access_*() fails.  Set it to a dummy value.
The user will need to specify -d to get the server for a non-default
distro, which is hopefully obvious.

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

dgit: repos_server_url(): Break out

No functional change.

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

changelog: start 3.7~

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

changelog: finalise 3.6

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

dgit: aptget archive access method

Add dummy implementation of file_in_archive_aptget copied from
file_in_archive_dummycat.  Re:#851697.

infrastructure: Do not reject commits with no author/committer name

But still insist on email address and date).

Peter Green reports that eg 71e128629ec786f3 in upstream xen.git is
such a commit (and is accepted by github).

Closes:#851716.

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

infrastructure: Properly honour NOCOMMITCHECK policy hook exit status.

Closes:#851800.

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

test suite: downstream-gitless: Test import of .dsc with unsafe url.

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

test suite: downstream-gitless: Test import of .dsc from unknown distro.

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

dgit: git_lrfetch_sane: Take $url, and pass it right value in import

This means we actually use the url from a Dgit .dsc field naming an
unknown distro.  Closes:#851728.

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

dgit: git_get_config: Use confess, not croak

Using croak was simply a mistake.  I always wanted a stack trace.

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

Dgit.pm: Call `confess' when shellquote gets an undef arg

This can happen if a command (eg passed to debugcmd) has an undef
argument.  This turns an undefined warning into an explicit internal
error.

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

changelog: start 3.6~

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

changelog: finalise 3.5

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

changelog: gardening

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

test suite: gitattributes: Call t-ok.

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

test suite: gitattributes: More testing of clone: check for message (#851624)

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

dgit: clonee: Do setup_new_tree earlier.

This avoids printing a spurious warning about actually-defused
gitattributes when cloning.  Closes:#851624.

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

test suite: gitattributes: More testing of clone: check good clone

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

test suite: gitattributes: work around git attribute updates bug

touch af/*, to work around #851713

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

test suite: gitattributes: More testing of clone: check sums

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

test suite: gitattributes: Start to test clone

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

test suite: gitattributes: Break out sums_check_broken

No functional change.

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

dgit: Defuse gitattributes in private working area, always

Even if we don't do it in the user's tree because config
setup-gitattributes=false.

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

dgit: Improve comment left in .git/info/attributes.

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

test suite: gitattributes: Check that warning does not appear when unexpected

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

test suite: gitattributes: Break out t-dgit-warn-check

No functional change.

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

test suite: gitattributes: Break out wd= setting

No functional change.

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

test suite: gitattributes: Test that checkout is good too

test suite: gitattributes: Break out sums_check

No functional change.

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

test suite: gitattributes: Rename $branch (from $refname)

No functional change.

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

test suite: gitattributes: Move setting of sums

Fixes some of the working filenames.

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

test suite: gitattributes: Call t-git-none

This is preparatory to testing clone.  No significant effect right
now.

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

test suite: gitattributes: Break out origtar= setting

No functional change.

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

test suite: gitattributes: Fix a ----- message

No significant change.

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

test suite: gitattributes: Break out dscf= setting

No functional change.

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

changelog: start 3.5~

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

changelog: finalise 3.4

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

test suite: worktrees: Replace references to /home/ian

Replace with references to /nonexistent, to catch inadvertant
accesses.

Now `git-grep /home/ian' produces only one hit - in a commit message,
where it's harmless.

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

test suite; drs-push-rejects: Set origin's url

Use an ad-hoc expression which produces the right ext:: rune, as dgit
would.

Closes:#851580.

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

changelog: start 3.4~

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

changelog: finalise 3.3

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

test suite: gitattributes: try to guess some attr names from manpage

This may allow the test suite to detect if git gains new attributes.
The worst case is that we add unknown attributes to our test package.

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

changelog: Document gitattributes handling

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

dgit(1): gitattributes: Document dgit-distro.distro.setup-gitattributes

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

gitattributes: Docs and message wordsmithing

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

test suite: gitattributes: Check for expected warnings

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

gitattributes: Issue a warning on un-defused .gitattributes

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

test suite: gitattributes: Remove .git from orig

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

test suite: gitattributes: test unsetup tree, too

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

test suite: gitattributes: Test source format 1.0 with diff

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

test suite: gitattributes: Reorganise and improve, still wip

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

test suite: gitattributes: new test, still wip

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

gitattributes: dgit: setup-gitattributes: New action

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

gitattributes: Suppress transformations in our cloned trees

The user wants a checkout of the actual source tree, so that their
checkout and the source package are identical.

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

gitattributes: Suppress transformations in ud

We want all of our own manipulations to be unaffected by gitattributes
transformations, so that the imported git *trees* are identical to the
source packages.  (Ie, if transformations are in effect, the
*checkout* of such a tree might not be identical to the source
package.)

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

dgit: gitattributes: Provide setup_gitattrs (internal function)

This is the idempotent function which adds the appropriate runes to
.git/info/attributes.  No callers yet.

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

gitattributes: dgit(7): Document our approach and rationale

This is not properly implemented yet.

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

dgit: import_dsc: Break out import_dsc_result

No functional change other than slight change to messages.

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