chiark / gitweb /
dgit.git
2 years agoexit status: Introdude Debian::Dgit::ExitStatus
Ian Jackson [Sat, 16 Jun 2018 12:41:00 +0000 (13:41 +0100)]
exit status: Introdude Debian::Dgit::ExitStatus

No callers yet.

Also, no version for dgit-infrastructure.  The one perl script in
dgit-infrastructure that cares a lot about its exit status
(dgit-repos-policy-debian) already has an END { } and uses _exit,
which is a bit like our approach here, but simpler.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Implement make-patches
Ian Jackson [Sun, 22 Apr 2018 23:32:43 +0000 (00:32 +0100)]
git-debrebase: Implement make-patches

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: gdr-subcommands: Add some t-git-next-date
Ian Jackson [Sun, 22 Apr 2018 23:32:05 +0000 (00:32 +0100)]
git-debrebase: test suite: gdr-subcommands: Add some t-git-next-date

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Run gbp pq export only from (perhaps private) laundered branch
Ian Jackson [Sun, 22 Apr 2018 23:29:31 +0000 (00:29 +0100)]
git-debrebase: Run gbp pq export only from (perhaps private) laundered branch

When the branch is stitched, gbp pq will descend into both sides of
the pseudomerge.  This will duplicate patches and be generally bad.

So instead, use walk to generate, privately, a laundered version of
HEAD, to use to generate the patches.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Break out make_patches_staged (nfc)
Ian Jackson [Sun, 22 Apr 2018 22:38:00 +0000 (23:38 +0100)]
git-debrebase: Break out make_patches_staged (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: conclude, quick: uncleanness after laundry is fatal
Ian Jackson [Sun, 22 Apr 2018 22:32:36 +0000 (23:32 +0100)]
git-debrebase: conclude, quick: uncleanness after laundry is fatal

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Defend against missing snags_maybe_bail calls
Ian Jackson [Sun, 22 Apr 2018 22:27:26 +0000 (23:27 +0100)]
git-debrebase: Defend against missing snags_maybe_bail calls

Almost the only thing gdr does as an output is to update HEAD and
other refs.  That's done with run_deferred_updates.  So, there,
check that (i) we have called snags_maybe_bail at least once;
(ii) we have not had any snags since.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Add a several missing snags_maybe_bail calls
Ian Jackson [Sun, 22 Apr 2018 22:23:15 +0000 (23:23 +0100)]
git-debrebase: Add a several missing snags_maybe_bail calls

That these were missing is a bit alarming.  I am about to add some
more defences against missing this check.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Fix a message to use "" properly
Ian Jackson [Sun, 22 Apr 2018 22:22:53 +0000 (23:22 +0100)]
git-debrebase: Fix a message to use "" properly

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: gdr-subcommands: Better error handling/debugging
Ian Jackson [Sun, 22 Apr 2018 22:22:24 +0000 (23:22 +0100)]
git-debrebase: test suite: gdr-subcommands: Better error handling/debugging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Do not mind stitching an unlaundered branch
Ian Jackson [Sun, 22 Apr 2018 21:46:28 +0000 (22:46 +0100)]
git-debrebase: Do not mind stitching an unlaundered branch

 <Diziet> I discover that stitch treats non-launderedness as a snag.
 <Diziet> This is not quite compatible with these newfangled
          push-your-unlaundered-stuff workflows.
 <Diziet> It would be possible to make one of prepush or stitch
          (currently synonyms) behave differently in this respect.

 <spwhitton> do you know why stitch treats non-launderedness as a snag?
 <spwhitton> given that we expect [most people] to use `git debrebase
          conclude`, which launders, and never invoke `git debrebase
          stitch` explicitly, it would be okay to change that such
          that `git debrebase stitch` does not consider
          non-launderedness to be a snag.

 <Diziet> I think it does that just because I am the kind of person
          who thinks, when writing some routine, "what could I check
          here?" :-)
 <Diziet> I think you are perhaps right that it ought not to.
 <Diziet> "conclude" didn't exist then of course.

 <spwhitton> okay.  git-debrebase(1) could note "you probably want
          conclude because you probably want to launder"

 <Diziet> Mmmm.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: do_stitch: Introduce $unclean argument
Ian Jackson [Sun, 22 Apr 2018 21:43:56 +0000 (22:43 +0100)]
git-debrebase: do_stitch: Introduce $unclean argument

Update all call sites.  No functional change just yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Provide "prepush"
Ian Jackson [Sun, 22 Apr 2018 21:35:58 +0000 (22:35 +0100)]
git-debrebase: Provide "prepush"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Provide and test "conclude"
Ian Jackson [Sun, 22 Apr 2018 21:28:49 +0000 (22:28 +0100)]
git-debrebase: Provide and test "conclude"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): Fix to say that noop is always ok for "quick"
Ian Jackson [Sun, 22 Apr 2018 21:27:07 +0000 (22:27 +0100)]
git-debrebase(1): Fix to say that noop is always ok for "quick"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): Very minor clarification to "quick"
Ian Jackson [Sun, 22 Apr 2018 21:26:40 +0000 (22:26 +0100)]
git-debrebase(1): Very minor clarification to "quick"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: New test for subcommands
Ian Jackson [Sun, 22 Apr 2018 21:14:55 +0000 (22:14 +0100)]
git-debrebase: test suite: New test for subcommands

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Rename `conclude' to `quick'
Ian Jackson [Sun, 22 Apr 2018 21:13:59 +0000 (22:13 +0100)]
git-debrebase: Rename `conclude' to `quick'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: comment: explain why tagged linear anchors are evil
Ian Jackson [Sun, 22 Apr 2018 17:54:31 +0000 (18:54 +0100)]
git-debrebase: comment: explain why tagged linear anchors are evil

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Only make finalised changelog entries
Ian Jackson [Sun, 22 Apr 2018 16:20:09 +0000 (17:20 +0100)]
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>
2 years agogit-debrebase: Do not run a no-op rebase in default mode
Ian Jackson [Sun, 22 Apr 2018 16:01:32 +0000 (17:01 +0100)]
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>
2 years agogit-debrebase: Handle -i option as a git-rebase option
Ian Jackson [Sun, 22 Apr 2018 15:38:51 +0000 (16:38 +0100)]
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>
2 years agogit-debrebase: Provide conclude subcommand
Ian Jackson [Sun, 22 Apr 2018 15:12:56 +0000 (16:12 +0100)]
git-debrebase: Provide conclude subcommand

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: break out do_stitch (nfc)
Ian Jackson [Sun, 22 Apr 2018 15:12:13 +0000 (16:12 +0100)]
git-debrebase: break out do_stitch (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: avoid stack trace from badusage()
Ian Jackson [Sun, 22 Apr 2018 15:52:29 +0000 (16:52 +0100)]
git-debrebase: avoid stack trace from badusage()

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Improve/fix handling of $prose
Ian Jackson [Sun, 22 Apr 2018 15:07:00 +0000 (16:07 +0100)]
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>
2 years agogit-debrebase: Rename `problem'/`fproblem' to `snag'
Ian Jackson [Sun, 22 Apr 2018 12:27:45 +0000 (13:27 +0100)]
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>
2 years agogit-debrebase: introduce ffq_prev_info (nfc)
Ian Jackson [Thu, 5 Apr 2018 19:20:30 +0000 (20:20 +0100)]
git-debrebase: introduce ffq_prev_info (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Break out do_launder_head (nfc)
Ian Jackson [Thu, 29 Mar 2018 18:48:04 +0000 (19:48 +0100)]
git-debrebase: Break out do_launder_head (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: break out stitch() (nfc)
Ian Jackson [Sun, 25 Mar 2018 16:11:41 +0000 (17:11 +0100)]
git-debrebase: break out stitch() (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: rename $drlast to $gdrlast (nfc)
Ian Jackson [Sun, 22 Apr 2018 11:52:47 +0000 (12:52 +0100)]
git-debrebase: rename $drlast to $gdrlast (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): Further manpage improvement
Ian Jackson [Wed, 18 Apr 2018 17:31:12 +0000 (18:31 +0100)]
git-debrebase(1): Further manpage improvement

Prompted by email from Sean.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): We are going to generate patches ourselves
Ian Jackson [Sun, 15 Apr 2018 15:59:07 +0000 (16:59 +0100)]
git-debrebase(5): We are going to generate patches ourselves

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): Corrections and clarifications to dgit import
Ian Jackson [Sun, 15 Apr 2018 15:56:29 +0000 (16:56 +0100)]
git-debrebase(5): Corrections and clarifications to dgit import

Also untabify those diagrams.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): Untabify the diagram a bit
Ian Jackson [Sun, 15 Apr 2018 15:56:00 +0000 (16:56 +0100)]
git-debrebase(5): Untabify the diagram a bit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): Some minor cross-reference additions to TERMINOLOGY
Ian Jackson [Sun, 15 Apr 2018 15:53:56 +0000 (16:53 +0100)]
git-debrebase(5): Some minor cross-reference additions to TERMINOLOGY

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1),(5): More changes from conversation with Sean
Ian Jackson [Sat, 14 Apr 2018 15:24:23 +0000 (16:24 +0100)]
git-debrebase(1),(5): More changes from conversation with Sean

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): Move TERMINOLOGY earlier
Ian Jackson [Sat, 14 Apr 2018 12:58:42 +0000 (13:58 +0100)]
git-debrebase(5): Move TERMINOLOGY earlier

As suggested by Sean.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): Improvements from Sean
Ian Jackson [Thu, 12 Apr 2018 00:11:49 +0000 (01:11 +0100)]
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>
2 years agogit-debrebase(5): Rework the description a bit
Ian Jackson [Wed, 11 Apr 2018 23:29:50 +0000 (00:29 +0100)]
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>
2 years agogit-debrebase(1): Improvements from Sean
Ian Jackson [Wed, 11 Apr 2018 23:25:15 +0000 (00:25 +0100)]
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>
2 years agogit-debrebase: Provide anchor subcommand
Ian Jackson [Sun, 25 Mar 2018 16:10:49 +0000 (17:10 +0100)]
git-debrebase: Provide anchor subcommand

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Rework keycommits out of breakwater_of
Ian Jackson [Sun, 25 Mar 2018 16:06:32 +0000 (17:06 +0100)]
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>
2 years agogit-debrebase: stitch: make noop actually be a no-op
Ian Jackson [Sun, 25 Mar 2018 11:56:54 +0000 (12:56 +0100)]
git-debrebase: stitch: make noop actually be a no-op

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: stitch: check the branch is laundered
Ian Jackson [Sun, 25 Mar 2018 11:55:07 +0000 (12:55 +0100)]
git-debrebase: stitch: check the branch is laundered

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: breakwater_of: permit unclean to be an fproblem
Ian Jackson [Sun, 25 Mar 2018 11:53:59 +0000 (12:53 +0100)]
git-debrebase: breakwater_of: permit unclean to be an fproblem

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: maintain debrebase-last
Ian Jackson [Sun, 25 Mar 2018 11:33:28 +0000 (12:33 +0100)]
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>
2 years agogit-debrebase: ffq_prev_branchinfo: return $drlast
Ian Jackson [Sun, 25 Mar 2018 11:07:19 +0000 (12:07 +0100)]
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>
2 years agoDgit.pm: provide $gdrlast_refprefix
Ian Jackson [Sun, 25 Mar 2018 11:05:45 +0000 (12:05 +0100)]
Dgit.pm: provide $gdrlast_refprefix

No users yet so no functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): minor improvements
Ian Jackson [Mon, 19 Feb 2018 01:56:44 +0000 (01:56 +0000)]
git-debrebase(5): minor improvements

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: NOTES updates
Ian Jackson [Mon, 19 Feb 2018 01:43:57 +0000 (01:43 +0000)]
git-debrebase: NOTES updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: move some todo/notes to NOTES
Ian Jackson [Mon, 19 Feb 2018 01:39:50 +0000 (01:39 +0000)]
git-debrebase: move some todo/notes to NOTES

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): document options
Ian Jackson [Mon, 19 Feb 2018 01:38:37 +0000 (01:38 +0000)]
git-debrebase(1): document options

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): ship
Ian Jackson [Mon, 19 Feb 2018 01:27:05 +0000 (01:27 +0000)]
git-debrebase(1): ship

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): document record-ffq-prev
Ian Jackson [Mon, 19 Feb 2018 01:25:45 +0000 (01:25 +0000)]
git-debrebase(1): document record-ffq-prev

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): document some more
Ian Jackson [Mon, 19 Feb 2018 01:21:32 +0000 (01:21 +0000)]
git-debrebase(1): document some more

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): document convert-to-gbp
Ian Jackson [Mon, 19 Feb 2018 01:18:01 +0000 (01:18 +0000)]
git-debrebase(1): document convert-to-gbp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): document convert-from-gbp
Ian Jackson [Mon, 19 Feb 2018 01:13:50 +0000 (01:13 +0000)]
git-debrebase(1): document convert-from-gbp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): wip
Ian Jackson [Mon, 19 Feb 2018 01:03:36 +0000 (01:03 +0000)]
git-debrebase(1): wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(1): wip
Ian Jackson [Mon, 19 Feb 2018 00:52:11 +0000 (00:52 +0000)]
git-debrebase(1): wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): finished now I think
Ian Jackson [Sun, 18 Feb 2018 22:47:27 +0000 (22:47 +0000)]
git-debrebase(5): finished now I think

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): Document commit message annotations
Ian Jackson [Sun, 18 Feb 2018 22:46:58 +0000 (22:46 +0000)]
git-debrebase(5): Document commit message annotations

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): Terminology fixes, cleanups
Ian Jackson [Sun, 18 Feb 2018 22:28:31 +0000 (22:28 +0000)]
git-debrebase(5): Terminology fixes, cleanups

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): All of README now in (5)
Ian Jackson [Sun, 18 Feb 2018 21:37:02 +0000 (21:37 +0000)]
git-debrebase(5): All of README now in (5)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): more from README
Ian Jackson [Sun, 18 Feb 2018 21:36:45 +0000 (21:36 +0000)]
git-debrebase(5): more from README

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): tidying up
Ian Jackson [Sun, 18 Feb 2018 21:22:40 +0000 (21:22 +0000)]
git-debrebase(5): tidying up

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): copy more stuff from README
Ian Jackson [Sun, 18 Feb 2018 21:18:14 +0000 (21:18 +0000)]
git-debrebase(5): copy more stuff from README

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase(5): wip, converting from README
Ian Jackson [Sun, 18 Feb 2018 21:14:14 +0000 (21:14 +0000)]
git-debrebase(5): wip, converting from README

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: NOTES: tidying up
Ian Jackson [Sun, 18 Feb 2018 14:56:00 +0000 (14:56 +0000)]
git-debrebase: NOTES: tidying up

2 years agogit-debrebase: NOTES: record gbp import work done
Ian Jackson [Sun, 18 Feb 2018 14:53:05 +0000 (14:53 +0000)]
git-debrebase: NOTES: record gbp import work done

2 years agogit-debrebase: NOTES: reword, record decisions about pm and ffq, tidy
Ian Jackson [Sun, 18 Feb 2018 14:52:25 +0000 (14:52 +0000)]
git-debrebase: NOTES: reword, record decisions about pm and ffq, tidy

2 years agogit-debrebase: NOTES: reword to record decisions about pm and ffq handling
Ian Jackson [Sun, 18 Feb 2018 14:47:02 +0000 (14:47 +0000)]
git-debrebase: NOTES: reword to record decisions about pm and ffq handling

2 years agogit-debrebase: test suite: add some t-git-next-date
Ian Jackson [Sun, 18 Feb 2018 14:35:55 +0000 (14:35 +0000)]
git-debrebase: test suite: add some t-git-next-date

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: test --anchor option
Ian Jackson [Sun, 18 Feb 2018 14:35:48 +0000 (14:35 +0000)]
git-debrebase: test suite: test --anchor option

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: provide --anchor option
Ian Jackson [Sun, 18 Feb 2018 14:34:57 +0000 (14:34 +0000)]
git-debrebase: provide --anchor option

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: gdr-newupstream-v0: omit upstream
Ian Jackson [Sun, 18 Feb 2018 14:16:54 +0000 (14:16 +0000)]
git-debrebase: test suite: gdr-newupstream-v0: omit upstream

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: new-upstream-v0: allow upstream to be omitted
Ian Jackson [Sun, 18 Feb 2018 14:16:41 +0000 (14:16 +0000)]
git-debrebase: new-upstream-v0: allow upstream to be omitted

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: gdr-newupstream-v0: new test
Ian Jackson [Sun, 18 Feb 2018 14:15:03 +0000 (14:15 +0000)]
git-debrebase: test suite: gdr-newupstream-v0: new test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: new-upstream-v0: call record_ffq_auto (nfc)
Ian Jackson [Sun, 18 Feb 2018 14:13:53 +0000 (14:13 +0000)]
git-debrebase: new-upstream-v0: call record_ffq_auto (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: introduce record_ffq_auto (nfc)
Ian Jackson [Sun, 18 Feb 2018 14:13:30 +0000 (14:13 +0000)]
git-debrebase: introduce record_ffq_auto (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: NOTES: a todo
Ian Jackson [Sun, 18 Feb 2018 13:55:15 +0000 (13:55 +0000)]
git-debrebase: NOTES: a todo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: renmae $old_upstream_update* to $old_anchor* (nfc)
Ian Jackson [Sun, 18 Feb 2018 13:54:10 +0000 (13:54 +0000)]
git-debrebase: renmae $old_upstream_update* to $old_anchor* (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: do remaining ref update atomically
Ian Jackson [Sun, 18 Feb 2018 13:37:31 +0000 (13:37 +0000)]
git-debrebase: do remaining ref update atomically

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: do most ref updates together, atomically
Ian Jackson [Sun, 18 Feb 2018 13:36:27 +0000 (13:36 +0000)]
git-debrebase: do most ref updates together, atomically

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: t-gdr-good: fix comment
Ian Jackson [Sun, 18 Feb 2018 13:20:53 +0000 (13:20 +0000)]
git-debrebase: test suite: t-gdr-good: fix comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: test ff stitching
Ian Jackson [Sun, 18 Feb 2018 13:20:35 +0000 (13:20 +0000)]
git-debrebase: test suite: test ff stitching

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: stitch: add an update-ref message
Ian Jackson [Sun, 18 Feb 2018 13:20:23 +0000 (13:20 +0000)]
git-debrebase: stitch: add an update-ref message

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: stitch: ff when possible
Ian Jackson [Sun, 18 Feb 2018 13:20:07 +0000 (13:20 +0000)]
git-debrebase: stitch: ff when possible

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: be properly selective about StartRewrite
Ian Jackson [Sun, 18 Feb 2018 13:04:53 +0000 (13:04 +0000)]
git-debrebase: be properly selective about StartRewrite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: spot any pointless pseudomerges
Ian Jackson [Sun, 18 Feb 2018 12:34:48 +0000 (12:34 +0000)]
git-debrebase: test suite: spot any pointless pseudomerges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: spot any merges which have multiple identical parents
Ian Jackson [Sun, 18 Feb 2018 12:30:08 +0000 (12:30 +0000)]
git-debrebase: test suite: spot any merges which have multiple identical parents

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Rename `launder' to `launder-v0'
Ian Jackson [Sun, 18 Feb 2018 12:09:11 +0000 (12:09 +0000)]
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>
2 years agogit-debrebase: Recognise anchors by commit annotation, only
Ian Jackson [Sun, 18 Feb 2018 12:02:04 +0000 (12:02 +0000)]
git-debrebase: Recognise anchors by commit annotation, only

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Recognise anchors by commit annotation
Ian Jackson [Sun, 18 Feb 2018 11:57:09 +0000 (11:57 +0000)]
git-debrebase: Recognise anchors by commit annotation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: docs etc.: Intend to recognise anchors by commit annotation
Ian Jackson [Sun, 18 Feb 2018 11:45:57 +0000 (11:45 +0000)]
git-debrebase: docs etc.: Intend to recognise anchors by commit annotation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: README: change diagrams to use @ for anchor
Ian Jackson [Sun, 18 Feb 2018 11:35:49 +0000 (11:35 +0000)]
git-debrebase: README: change diagrams to use @ for anchor

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: Introduce term `anchor'
Ian Jackson [Sun, 18 Feb 2018 11:32:21 +0000 (11:32 +0000)]
git-debrebase: Introduce term `anchor'

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

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: NOTES: done test suite, pretty much
Ian Jackson [Sun, 18 Feb 2018 00:16:21 +0000 (00:16 +0000)]
git-debrebase: NOTES: done test suite, pretty much

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: test suite: gdr nmu divergence: check that divergence check trips...
Ian Jackson [Sun, 18 Feb 2018 00:15:49 +0000 (00:15 +0000)]
git-debrebase: test suite: gdr nmu divergence: check that divergence check trips on nmus

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 years agogit-debrebase: fix ffq divergence checking (many bugs)
Ian Jackson [Sun, 18 Feb 2018 00:07:05 +0000 (00:07 +0000)]
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>