dgit-maint-{merge,debrebase}(7): Using untagged upstream commits

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

dgit-maint-debrebase(7): Minor wording change apropos of #930956

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

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>

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>

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>

dgit(1): baredebian+git: Document this alias

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

test suite: baredebian-plusgit: New test for baredebian+git

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

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>

test suite: baredebian: Break out baredebian-test-minimum

Update all callers.

No functional change.

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

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>

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>

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>

test suite: enumerate-tests: Break out allsedderies

No functional change.

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

dgit(1): In --include-dirty caveat, say "especially --clean=git"

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

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>

dgit(1): In --include-dirty caveat, use semantic newlines

No change to rendered output.

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

dgit(1): expand on description of behaviour of --include-dirty

See #930922.

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

dgit: Do not translate import commit messages

Translating these was a mistake.

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

dgit(1): baredebian+tarball: Document new quilt mode

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

dgit(1): baredebian: Add caveat about not checking edits

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

dgit(1): baredebian: Fix an editing error

".gitignore" here is spurious.

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

test suite: baredebian-multitar: Check tarball import structure

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

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>

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>

test suite: lib-baredebian: Machinery for multiple origs

No functional change with existing caller.

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

test suite: baredebian: Break out baredebian-tarball-mode

No functional change.

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

test suite: baredebian-tarball: New test

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

test suite: lib-baredebian: Tolerate uvtag not being set

No functional change with the existing test.

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

dgit: New quilt mode "baredebian+tarball"

No documentation yet.

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

test suite: lib-baredebian: Break out $uvtag

No functional change.

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

test suite: lib-baredebian: Break out $uv everywhere

No functional change.

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

test suite: lib-baredebian: Split up big function

No functional change.

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

test suite: baredebian: move setting of $quiltmode to lib

No functional change.

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

test suite: lib-baredebian: Introduce $quiltmode

No functional change.

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

dgit: return $r1authline from import_tarball_commits

No functional change for existing caller, which just discards it.

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

dgit: import_tarball_tartrees: Provide OrigPart

No functional change for existing caller.

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

dgit: import_tarball_tartrees: Handle @dfi==1 case in caller

We are going to introduce a caller which doesn't want this check.

No overall functional change other than to debugging output.

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

dgit: import_tarball_tartrees: Honour Path in dfis

These do not appear in information collected from a .dsc; in that
case, the files are arranged to be in the playground where they can be
simply picked up.

But we are going to want to direct import_tarball_tartrees to tarballs
found elsewhere.

No functional change with the current sources of dfi information.

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

dgit: Break out import_tarball_commits

No functional change.

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

dgit: Break out import_tarball_tartrees

No functional change.

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

Dgit.pm: read_tree_*: Treat '' as meaning 'delete this'

No functional change with existing callers.

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

dgit: Break out $quilt_options_re

No functional change.

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

test suite: baredebian: break out lib-baredebian, baredebian-test

No functional change.

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

test suite: baredebian: Add missing dependency quil

This was simply missing and causes the formal adt run to fail.

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

test suite: lib: Add missing dependencies for git-deborig

I seem to have overlooked the 2nd line of the relevant part of the
devscripts package description.

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

test suite: baredebian-push: Add missing dependency DEBORIG

Our enumeration system does not capture dependencies from
t-setup-import.

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

test suite: t-setup-done: Arrange to save all DGIT_TEST_REAL_*

Otherwise the importer may end up with our stunt versions on their
PATH, but without the necessary DGIT_TEST_REAL_* variables which stop
infinite recursion.

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

dgit(1): split view: Talk about `your local git clone'

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

dgit(1): document --quilt=bareebian

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

test suite: baredebian-push: Test rejection of -wgf

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

dgit: baredebian: Reject --clean=git

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

test suite: baredebian-push: Check that history is roughly right

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

dgit: baredebian: Note upstream commitish source in prose

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

dgit: baredebian: Provide $quilt_upstream_commitish_message

No functional change.

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

dgit: baredebian: Note upstream version and commitish source

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

test suite: baredebian-push: Actually test --quilt=baredebian

This is all quite awful really.  I think that is inherent.

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

test suite: baredebian setup, and a skeleton to run it

The baredebian-push test will be fleshed out in a moment.

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

i18n: Add translator notes about ASCII art changes display

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

dgit: baredebian: New quilt mode

This is the bulk of the implementation including all essential
changes.

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

dgit: baredebian: Introduce --upstream-commitish

Not documented yet.  Nor, used, since $quilt_mode is not ever
baredebian yet.

So currently just an option you can pass to make dgit bomb out.

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

test suite: Add DEBORIG pseudo-dependency

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

Dgit.pm: resolve_upstream_version: Return a message too

No functional change for existing callers.

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

dgit: Introduce $uhead and $uhead_whatshort

No overall functional change other than (sadly) to complicate the life
of translators.  I will add some notes for translators after I've made
this string actually vary.

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

dgit: Make $format available in build_or_push_prep_modes

By returning it from determine_whether_split_brain.

No functional change yet.

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

git-debrebase: Replace one open-coded hash-object with hash_commit

No functional change.

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

Dgit.pm: Move hash_commit from dgit

No functional change other than to no longer honour @git.

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

Dgit.pm: Move make_commit (git-commit-tree wrapper) from gdr

No functional change other than to no longer honour @git.

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

Rename various *make_commit* to *hash_commit*

This avoids a subroutine name clash with make_commit in gdr.

No functional change.

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

Dgit.pm: Move read-tree wrappers from git-debrebase

No functional change other than to no longer honour @git.

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

Dgit.pm: Move resolve_upstream_version from git-debrebase

No functional change.

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

Dgit.pm: Move upstream_commitish_search from git-debrebase

No functional change.

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

docs: Document --split-view and change terminology

We now speak in the docs of
  * splitting quilt mode(s)
  * split view (being) in operation

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

test suite: new test forcesplit-linear

Test split view with non-splitting quilt mode.

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

test suite: forcesplit-overwrite: Test with bare --overwrite

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

test suite: forcesplit-overwrite: Test without --overwrite

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

test suite: forcesplit-overwrite: Break out "try"

No functional change.

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

test suite: forcesplit-overwrite: Check -pushed-good

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

test suite; New test forcesplit-overwrite

Still needs:
 * checking that we didn't move HEAD
 * checking HEAD tree is equal

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

dgit: Reject split view with correct message

Now, it is not just a splitting quilt mode which might cause this, but
also an explicit request for split view.

This has some duplicated text, which I understand is easier for
translators.

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

dgit: Support split view in non-splitting quilt modes

Provide --split-view|brain=auto|always|never and the corresponding
access cfg option .split-view.

This is not documented or tested yet.

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

dgit: In code, rename splitbrain quilt modes to splitting

A "splitting" quilt mode is going to be one which requires split brain
mode.  But split brain mode is going to be possible in other quilt
modes too.

The existing name of the splitbrain quilt cache is correct: it is used
precisely for quilt fixup, in split brain modes (even for non
splitting quilt modes, now).  In split brain mode without quilt, it is
not needed or used.

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

dgit: Reject dgit pull in split brain mode

In splitting quilt modes dgit pull would have to back-convert the
changes and currently there is no code to do this, and these cases
were correctly rejected before.

But in other quilt modes it would still have to strip off pseudomerges
or quilt fixup commits.

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

dgit: Move determine_whether_split_brain further up the file

No functional change.

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

dgit: Break out determine_whether_split_brain

No functional change.

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

dgit: Crash if we forgot to set $do_split_brain

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

dgit: Put !! inside do_split_brain()

No functional change.

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

dgit: Introduce do_split_brain()

No functional change yet.

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

dgit(1): Tidying up after tag format: Drop splitbrain conditional

Now, debiantags is always just debiantag_new plus
debiantag_maintview.  So we can drop this complexity.

No functional change.

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

dgit: Tidying up after tag format: Drop debiantag

Remove the now-superfluous level of indirection.

No functional change.

At some future point we may rename debiantag_new to debiantag
everywhere, but not right now.

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

Dgit.pm: Tidying up after tag format: Drop debiantag_old

The one remaining call site was in debiantags, where
debiantag_maintview is (also) correct.

No functional change.

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

dgit(1): Tidying up after tag format: Drop qualifications

All servers are now assumed to cope with split view tags.

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

dgit(1): Correct --always-dep14tag

This was documented as --always-dep14tag but dgit only accepts
--dep14tag-always.

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

dgit: Tidying up after tag format: Collapse $dodep14tag test

No functional change.

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

infra: Drop support for old tag name on server side

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

dgit: Introduce $protovsn 5; part of tidying up after tag format

This drops the tagformat param; the semantics are as if `new'
were specified.  Eventually, when we can drop support for
$protovsn 4, all traces of this parameter can then be gone.

No overall functional change.
No immediate compatibility implications.

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

dgit: Drop $protovsn < 4; part of tidying up after tag format

This drops support for rpush where our peer is older than dgit 2.0.
(This does not include the dgit in any Debian release.)

No nontrivial functional change, since we already rejected older dgits
due to them implying the old tag format.

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

dgit: Tidying up after tag format: drop ..._can_splitbrain

Substitute this fixed value into its call sites.  No functional change.

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

dgit: Drop support for old tag format

access_cfg_tagformats_can_splitbrain always returns true now.  We'll
delete it in a moment.

We now insist on protocol version 4 because older ones imply the old
tag format.

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

dgit: tag format: Add missing $protovsn comment re tagformat param

No fuctional change.  We are going to get rid of this in a moment, but
this change makes clearer what is going on.

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

test suite: Drop all testing of old tag formats, and compatibility

This is quite old now.  We are dropping support for it.

The new tags came in in dgit 2.0 in October 2016.  No version of dgit
without them was in any Debian release.  We don't expect there are any
sites using old servers which do not support the new format, or anyone
using a dgit client older than 2.x who cannot upgrade.

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