git-debrebase: test suite: gdr-viagit: new test

Have verified with this:

  diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit
  index 55fe4d74..20576c23 100755
  --- a/tests/tests/gdr-viagit
  +++ b/tests/tests/gdr-viagit
  @@ -17,6 +17,7 @@ git-debrebase) ;;
  cat <<'END' >$st
   #!/bin/sh
   set -x
  +export GIT_DIR=$PWD/`git-rev-parse --git-dir`
   exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
   END
  chmod +x $st

that this would indeed spot at least some problems.

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

git-debrebase: test suite: gdr-import-dgit: test a new upstream non-gdr upload too

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

git-debrebase: test suite: lib-gdr: add some t-git-next-date calls

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

git-debrebase: test suite: gdr-convert-gbp: use t-dch-commit one more time

We want the date-smashing done by t-dch-commit.

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

git-debrebase: test suite: gdr-*: use faketime to control dch dates

This means that the dgit- and gdr-generated commits with dates from
changelogs are all adjusted.  This makes the gitk in the gdr tests
look more like a real one would, so we can see if it's pretty.  (It
also makes it easier to debug the tests.)

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

git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date

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

test suite: Update dummy dates

To make things look nice in gitk in our test trees, etc., it is nice
if the fake date is at least as recent as the commits etc. in the
worktree tarballs and pkg-srcs.

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

git-debrebase: test suite: gdr-import-dgit: introduce nmu-fold

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

git-debrebase: test suite: gdr-import-dgit: add an upload to incorporate nmu

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

git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)

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

git-debrebase: test suite: gdr-import-dgit: move gbp import (nfc)

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

git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload-1, -2

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

git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload (nfc)

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

git-debrebase: convert-to-gbp: mention commit tag

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

git-debrebase: convert-from-gbp: fix usage comment

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

git-debrebase: convert-to-gbp: declare it not v0

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

git-debrebase: convert-to-gbp: implementation seems to work

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

git-debrebase: test suite: t-gdr-good: test git-debrebase breakwater

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

git-debrebase: test suite: t-gdr-good: split up the big case into two (nfc)

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

git-debrebase: provide breakwater command

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

git-debrebase: classify: provide Why for Unknown

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

git-debrebase: NOTES: avoid merges

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

git-debrebase: test suite: do not dgit pull (sets a bad example)

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

git-debrebase: NOTES: about divergence and merges

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

git-debrebase: slight message improvements etc.

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

git-debrebase: rename gbp2gdr to convert-from-gbp

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

git-debrebase: test suite: introduce t-make-new-upstream-tarball

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

git-debrebase: test suite: note we've added a test

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

git-debrebase: test suite: gdr-import-dgit: extend

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

git-debrebase: test suite: gdr-import-dgit: extend

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

git-debrebase: bugfix

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

git-debrebase: drop a superfluous rm_subdir_cached qw(debian/patches)

This is done by $read_tree_debian->($cltree).  So nfc.

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

git-debrebase: test suite: add a missing --quiet to git-diff

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

git-debrebase: test suite: introduce t-gdr-good

And abolish the two things it was made of.

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

git-debrebase: test suite: introduce t-gdr-same-as-before

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

git-debrebase: dgit import: honour $upp_limit

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

git-debrebase: DgitImportUnpatched: defer upstream diff check

We can't do this during the initial walk, because what we ought to be
comparing is the previous breakwater with the new one.  So we have to
wait until the walk has proceeded down the overwritten branch, to find
the old breakwater.

This can be done by waiting until we are rebuilding the branch: at
that point, we have just built the previous breakwater, so we can
compare it to the dgit unpatched import.

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

git-debrebase: fix Overwritten to be an array like it says, etc.

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

git-debrebase: test suite: gdr-import-dgit: wip

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

git-debrebase: test suite: introduce t-some-changes

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

git-debrebase: test suite: introduce t-dch-commit

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

git-debrebase: test suite: gdr-edits: check branch structure after last push

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

git-debrebase: test suite: gdr-edits: do a push

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

git-debrebase: test suite: gbp2gdr: fix not-gdr-processable to not modify things

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

git-debrebase: test suite: gbp2gdr: process incoming

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

git-debrebase: NOTES: another todo

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

git-debrebase: test: check branch structure, more

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

git-debrebase: test: check branch structure

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

git-debrebase: some NOTES

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

test suite: note some todos for gdr-edits

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

git-debrebase: stitch better

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

git-debrebase: wip stitch

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

git-debrebase: record ffq-prev on rebase

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

git-debrebase: break out ffq_prev_branchinfo (nfc)

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

git-debrebase: fix $/ to be local in cfg (!)

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

test suite: gdr-edits: more

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

git-debrebase: do not add -i in default invocation

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

test suite: gbp2gdr: drop some branches we do not want here

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

test suite: gdr-edits: wip new test

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

test suite: gbp2gdr: call t-setup-done

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

test suite: gbp2gdr: drop junk at the end

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

test suite: gbp2gdr: seems to work now

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

test suite: something to have a salsa (general purpose git) repo

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

git-debrebase: check head is clean before starting

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

git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups

We are going to make get_head check the tree is clean

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

git-debrebase: test: use conventional branch names

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

git-debrebase: for master branch, check dgit/dgit/sid too

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

git-debrebase: bugfixes to record_ffq_prev

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

git-debrebase: make cfg optionally take $optional (nfc)

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

git-debrebase: wip cmd_record_ffq_prev

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

git-debrebase: provide record_ffq_prev (no callers yet)

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

debian/control, git-debrebase: "use fnmatch;"

We are going to want this for globbing in the ffq configuration.

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

git-debrebase: introduce --noop-ok

No actual effect yet

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

git-debrebase: notes re ffq-prev ref name

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

git-debrebase: intent re record-ffqrebase

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

git-debrebase: intent re record-ffrebase

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

test suite: gbp2gdr: use -f<tag> rather than --force

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

git-debrebase: provide -f<tag>

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

git-debrebase: introduce any_fproblems (nfc)

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

git-debrebase: introduce tags for fproblems, no use yet

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

git-debrebase: more notes

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

git-debrebase: note re debrebase push?

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

git-debrebase: decide: make few pseudomerges, and preserve them

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

git-debrebase: notes re psuedomerges

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

git-debrebase: notes

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

git-debrebase: note that we have mostly done the gbp import

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

git-debrebase: insist that breakwater merges are merges

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

git-debrebase: introduce $claims_to_be_breakwater (nfc)

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

git-debrebase: explain why breakwater bases must be merges

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

git-debrebase: fix misdetection of breakwater declarations as other pseudomerges

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

git-debrebase: rework commit annotations

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

git-debrebase: list tags currently written

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

test suite: git-debrebase: turn on debug

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

git-debrebase: bugfixes

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

test suite: gbp2gdr: run gdr gbp2debrebase

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

git-debrebase: wip gbp2debrebase

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

test suite: initial git-debrebase setup attempts - bugfixes

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

test suite: initial git-debrebase setup attempts

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

test suite: infrastructure for testing git-debrebase

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

git-debrebase: Install it in /usr/bin

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