git-debrebase: maintain debrebase-last

This is mostly for the benefit of dgit(1), which wants to know whether
to run gdr to do quilt fixup.

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

git-debrebase: ffq_prev_branchinfo: return $drlast

No functional change yet as no-one uses this information.

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

Dgit.pm: provide $gdrlast_refprefix

No users yet so no functional change.

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

git-debrebase(5): minor improvements

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

git-debrebase: NOTES updates

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

git-debrebase: move some todo/notes to NOTES

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

git-debrebase(1): document options

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

git-debrebase(1): ship

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

git-debrebase(1): document record-ffq-prev

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

git-debrebase(1): document some more

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

git-debrebase(1): document convert-to-gbp

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

git-debrebase(1): document convert-from-gbp

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

git-debrebase(1): wip

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

git-debrebase(1): wip

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

git-debrebase(5): finished now I think

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

git-debrebase(5): Document commit message annotations

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

git-debrebase(5): Terminology fixes, cleanups

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

git-debrebase(5): All of README now in (5)

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

git-debrebase(5): more from README

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

git-debrebase(5): tidying up

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

git-debrebase(5): copy more stuff from README

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

git-debrebase(5): wip, converting from README

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

git-debrebase: NOTES: tidying up

git-debrebase: NOTES: record gbp import work done

git-debrebase: NOTES: reword, record decisions about pm and ffq, tidy

git-debrebase: NOTES: reword to record decisions about pm and ffq handling

git-debrebase: test suite: add some t-git-next-date

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

git-debrebase: test suite: test --anchor option

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

git-debrebase: provide --anchor option

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

git-debrebase: test suite: gdr-newupstream-v0: omit upstream

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

git-debrebase: new-upstream-v0: allow upstream to be omitted

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

git-debrebase: test suite: gdr-newupstream-v0: new test

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

git-debrebase: new-upstream-v0: call record_ffq_auto (nfc)

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

git-debrebase: introduce record_ffq_auto (nfc)

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

git-debrebase: NOTES: a todo

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

git-debrebase: renmae $old_upstream_update* to $old_anchor* (nfc)

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

git-debrebase: do remaining ref update atomically

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

git-debrebase: do most ref updates together, atomically

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

git-debrebase: test suite: t-gdr-good: fix comment

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

git-debrebase: test suite: test ff stitching

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

git-debrebase: stitch: add an update-ref message

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

git-debrebase: stitch: ff when possible

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

git-debrebase: be properly selective about StartRewrite

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

git-debrebase: test suite: spot any pointless pseudomerges

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

git-debrebase: test suite: spot any merges which have multiple identical parents

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

git-debrebase: Rename `launder' to `launder-v0'

This command is too raw, really, and we may want that name for
something else (eg, rebase and stitch).

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

git-debrebase: Recognise anchors by commit annotation, only

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

git-debrebase: Recognise anchors by commit annotation

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

git-debrebase: docs etc.: Intend to recognise anchors by commit annotation

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

git-debrebase: README: change diagrams to use @ for anchor

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

git-debrebase: Introduce term `anchor'

And replace `breakwater merge' and `breakwater upstream merge'
everywhere.

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

git-debrebase: NOTES: done test suite, pretty much

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

git-debrebase: test suite: gdr nmu divergence: check that divergence check trips on nmus

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

git-debrebase: fix ffq divergence checking (many bugs)

Also add some debugging to ffq checking

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

git-debrebase: fix cfg in scalar context (!)

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

git-debrebase: test suite: gdr nmu divergence: do maintainer first

In practical terms this is needed because we are only using one tree,
and otherwise the nmu's dgit push will update dgit/dgit/sid, causing
the ffq check to fail (when we fix it, in a moment).

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

git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail

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

git-debrebase: test suite: gdr-diverge-nmu-dgit: new test

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

git-debrebase: test suite: lib-gdr: break out some more t-*

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

git-debrebase: test suite: lib-gdr: break out some more t-*

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

git-debrebase: test suite: gdr-diverge-nmu: complete

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

git-debrebase: test suite: gdr-diverge-nmu: more work, still need to check

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

git-debrebase: test suite: gdr-diverge-nmu: add some t-git-next-date

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

git-debrebase: do not bomb on totally ambiguous pseudomerges

Actually, we want `git-merge -s ours' (or `git-debrebase stitch')
to be comprehended.  We sacrifice `git-merge -s theirs'.

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

git-debrebase: test suite: gdr-diverge-nmu: add a t-git-next-date

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

git-debrebase: print more why on Unprocessable commits

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

git-debrebase: bomb on totally ambiguous pseudomerges

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

git-debrebase: test suite: gdr-diverge-nmu: new test, not complete yet

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

git-debrebase: test suite: lib-gdr: introduce t-nmu-upload-3

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

git-debrebase: test suite: lib-gdr: move t-nmu-upload-[12]

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

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>