fix Mixed handling

when dieing due to bad commit, print differs

in classify, call get_differs with args in right oder

get_differs tolerates addition of debian/series as well as appending to it

call setup_sigwarn

launder: fix

introduce update_head_checkout

downstream-rebase-launder-v0 first cut

classificaton generates Changelog type

introduce DS_DEB

differentiate changelog from other diffs in get_differ
no change to classification output

also fix a $_ eq m{...} bug!

classify: tolerate backwards breakwater merges

classify: introduce $prevbrw (nfc)

wip fixes for new no global $playground

wip, before abolish Dgit.pm's  global

WIP FOUND

fixes

git-debrebase; get_commit: use new $etype

fixes

wip debug, fixes etc.

wip fixes

finish get_differs ?

wip

move --name-only

allow opts

avoid renames

wip

wip

WIP FOUND

rebase fixes

rebase: go back to my $build

We never don't have exactly one parent

fixes

introduce build_start

abolish recursion

rewrite in brw_cl too

rename @upp_cl @brw_cl $wantbrwonly

wip

wip rebase fixes

wip found

pseudocode typo

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

wip, redoing origin handling

wip import handling etc.

fix README typo

git-debrebase fixes

git-debrebase fixes

git-debrebase fixes

sort out report, and walk, allegedly

abolish $pseudos_must_overwrite_this

spelling

wip pseudomerge handling

wip found

wip

abolish abbrev thing

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

found

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

README.git-debrebase: diagrams of how to handle imports

README tidy up

README.git-debrebase: both emails

wip: README

wip

wip, found

wip, launder rm patches

wip gitattrs dealt with

remove an xxx

wip

wip comments

wip notes

wip notes

capture breakwater tip

avoid rewrite better

avoid rewrite

WIP command line comments

WIP, new new-upstream

git-debrebase WIP minimal executable ?

WIP

WIP

WIP

WIP

WIP

WIP classification core done?

WIP before reorgs?

Dgit: "confess" when we die due to a warning, rather than symply dieing.

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

git-debrebase: Stub script to prove config handling works

Tested with
  PATH=$PWD:$PATH git -c wombat.foo.bar=23 -c wombat.foo.bar=37 debrebase

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

Dgit.pm: Break out git_get_symref

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

Dgit.pm: git_cat_file: Introduce $etype parameter

No functional change for existing callers.

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

Dgit.pm: Move $playground global to dgit.

It makes the interface to the playground functions confusing.

No functional change.

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

dgit: archive-api-query: Avoid crashing due to lack of $isuite

Otherwise:

  Use of uninitialized value $isuite in concatenation (.) or string at dgit line 705.

This breaks the infrastructure.  Closes:#886592.

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

changelog: start 4.3

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

changelog: finalise 4.2

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

changelog: Set distribution to unstable

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

changelog: Document using dpkg-source to build source packages

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

changelog: Entry for push-source subcommand

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

test suite: push-source: new tests

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

test suite: Add library function t-push-was-source-only

No functional change.

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

Update some copyright info

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

dgit(1): Entry for build-source recommends using push-source

If the user invokes build-source because they are going to upload,
they should use push-source rather than push to benefit from the
additional safety check that the upload is actually source-only.

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

dgit(1): Note that push-source doesn't need --rm-old-changes

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

dgit: New command: push-source

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

dgit: Implement test_source_only_changes

No functional change.

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

dgit: build_source bypasses dpkg-buildpackage

This is to avoid the inclusion of .buildinfo in the .changes.  Quoting
<https://lists.debian.org/debian-dpkg/2017/06/msg00005.html>:

    A .buildinfo file is not useful for a source-only upload which is
    veried to be identical to the intended source as present in the
    uploader's version control (eg, by the use of dgit).

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

quilt-gbp test: Set DGIT_TEST_TOLERATE_UNPATCHED_CLEAN

In quilt-gbp we want to test whether dgit detects that quilt fixups
cannot be linear because the user has failed to pass an appropriate
quilt option in a patches-unapplied tree.

build_source() cleans before applying patches, and the package's clean
target might error out because patches are not applied.  This prevents
dgit from attempting quilt linearisation and thus determining that the
tree might be patches-unapplied.  So set an environment variable
telling the package's clean target not to do that.

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

example_1.0 worktree: Accept DGIT_TEST_TOLERATE_UNPATCHED_CLEAN

The clean target in the quilt-tip-2 branch in the example_1.0 worktree
errors out if patches are not applied.  With this change, if
DGIT_TEST_TOLERATE_UNPATCHED_CLEAN is set to "true", it will not error
out in this case.

No users, so no functional change.

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