git-debrebase: Rename `conclude' to `quick'

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

git-debrebase: comment: explain why tagged linear anchors are evil

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

git-debrebase: Only make finalised changelog entries

Unfortunately, finalised UNRELEASED has become the dominant convention
in Debian.  So conform to that.

Also this breaks a test, which assumed that the operation date did not
leak into the output tree.  But, sadly, now it does.

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

git-debrebase: Do not run a no-op rebase in default mode

No functional change: this is always a no-op, since $breakwater is one
of HEAD's ancestors.

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

git-debrebase: Handle -i option as a git-rebase option

Ie, as a request to do a rebase.

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

git-debrebase: Provide conclude subcommand

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

git-debrebase: break out do_stitch (nfc)

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

git-debrebase: avoid stack trace from badusage()

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

git-debrebase: Improve/fix handling of $prose

Allow specification of the whole prose.  Set the default in
cmd_stitch.  Always include the word `stitch' in the reflog.

Also fix a comment typo.

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

git-debrebase: Rename `problem'/`fproblem' to `snag'

And add a cross-reference the first time it's mentioned in the
manpage.

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

git-debrebase: introduce ffq_prev_info (nfc)

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

git-debrebase: Break out do_launder_head (nfc)

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

git-debrebase: break out stitch() (nfc)

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

git-debrebase: rename $drlast to $gdrlast (nfc)

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

git-debrebase(1): Further manpage improvement

Prompted by email from Sean.

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

git-debrebase(5): We are going to generate patches ourselves

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

git-debrebase(5): Corrections and clarifications to dgit import

Also untabify those diagrams.

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

git-debrebase(5): Untabify the diagram a bit

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

git-debrebase(5): Some minor cross-reference additions to TERMINOLOGY

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

git-debrebase(1),(5): More changes from conversation with Sean

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

git-debrebase(5): Move TERMINOLOGY earlier

As suggested by Sean.

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

git-debrebase(5): Improvements from Sean

Suggested in or prompted by Sean's mail of 28th March.

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

git-debrebase(5): Rework the description a bit

Mention whether branches and branch states are ff.  And describe the
breakwater.

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

git-debrebase(1): Improvements from Sean

Suggested in or prompted by Sean's mail of 28th March.

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

git-debrebase: Provide anchor subcommand

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

git-debrebase: Rework keycommits out of breakwater_of

* Return the anchor too
* More flexible special case handling
* Call sites adjusted, resulting in fixes to special case handling

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

git-debrebase: stitch: make noop actually be a no-op

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

git-debrebase: stitch: check the branch is laundered

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

git-debrebase: breakwater_of: permit unclean to be an fproblem

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

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>