chiark / gitweb /
dgit.git
17 months agogit-debrebase: test suite: lib-gdr: break out some more t-*
Ian Jackson [Sat, 17 Feb 2018 23:26:53 +0000 (23:26 +0000)]
git-debrebase: test suite: lib-gdr: break out some more t-*

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-diverge-nmu: complete
Ian Jackson [Sat, 17 Feb 2018 23:07:56 +0000 (23:07 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: complete

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-diverge-nmu: more work, still need to check
Ian Jackson [Sat, 17 Feb 2018 22:52:36 +0000 (22:52 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: more work, still need to check

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-diverge-nmu: add some t-git-next-date
Ian Jackson [Sat, 17 Feb 2018 22:52:11 +0000 (22:52 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: add some t-git-next-date

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: do not bomb on totally ambiguous pseudomerges
Ian Jackson [Sat, 17 Feb 2018 22:51:16 +0000 (22:51 +0000)]
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>
17 months agogit-debrebase: test suite: gdr-diverge-nmu: add a t-git-next-date
Ian Jackson [Sat, 17 Feb 2018 22:38:22 +0000 (22:38 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: add a t-git-next-date

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: print more why on Unprocessable commits
Ian Jackson [Sat, 17 Feb 2018 22:38:02 +0000 (22:38 +0000)]
git-debrebase: print more why on Unprocessable commits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: bomb on totally ambiguous pseudomerges
Ian Jackson [Sat, 17 Feb 2018 22:37:47 +0000 (22:37 +0000)]
git-debrebase: bomb on totally ambiguous pseudomerges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-diverge-nmu: new test, not complete yet
Ian Jackson [Sat, 17 Feb 2018 22:19:49 +0000 (22:19 +0000)]
git-debrebase: test suite: gdr-diverge-nmu: new test, not complete yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: lib-gdr: introduce t-nmu-upload-3
Ian Jackson [Sat, 17 Feb 2018 21:05:09 +0000 (21:05 +0000)]
git-debrebase: test suite: lib-gdr: introduce t-nmu-upload-3

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: lib-gdr: move t-nmu-upload-[12]
Ian Jackson [Sat, 17 Feb 2018 20:50:14 +0000 (20:50 +0000)]
git-debrebase: test suite: lib-gdr: move t-nmu-upload-[12]

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-viagit: new test
Ian Jackson [Sat, 17 Feb 2018 20:44:53 +0000 (20:44 +0000)]
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>
17 months agogit-debrebase: test suite: gdr-import-dgit: test a new upstream non-gdr upload too
Ian Jackson [Sat, 17 Feb 2018 19:41:36 +0000 (19:41 +0000)]
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>
17 months agogit-debrebase: test suite: lib-gdr: add some t-git-next-date calls
Ian Jackson [Sat, 17 Feb 2018 19:37:40 +0000 (19:37 +0000)]
git-debrebase: test suite: lib-gdr: add some t-git-next-date calls

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-convert-gbp: use t-dch-commit one more time
Ian Jackson [Sat, 17 Feb 2018 19:25:12 +0000 (19:25 +0000)]
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>
17 months agogit-debrebase: test suite: gdr-*: use faketime to control dch dates
Ian Jackson [Sat, 17 Feb 2018 19:23:58 +0000 (19:23 +0000)]
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>
17 months agogit-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date
Ian Jackson [Sat, 17 Feb 2018 19:23:02 +0000 (19:23 +0000)]
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>
17 months agotest suite: Update dummy dates
Ian Jackson [Sat, 17 Feb 2018 19:20:50 +0000 (19:20 +0000)]
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>
17 months agogit-debrebase: test suite: gdr-import-dgit: introduce nmu-fold
Ian Jackson [Sat, 17 Feb 2018 18:57:03 +0000 (18:57 +0000)]
git-debrebase: test suite: gdr-import-dgit: introduce nmu-fold

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: add an upload to incorporate nmu
Ian Jackson [Sat, 17 Feb 2018 18:49:21 +0000 (18:49 +0000)]
git-debrebase: test suite: gdr-import-dgit: add an upload to incorporate nmu

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)
Ian Jackson [Sat, 17 Feb 2018 18:46:04 +0000 (18:46 +0000)]
git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: move gbp import (nfc)
Ian Jackson [Sat, 17 Feb 2018 18:45:49 +0000 (18:45 +0000)]
git-debrebase: test suite: gdr-import-dgit: move gbp import (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: introduce nmu-upload-1, -2
Ian Jackson [Sat, 17 Feb 2018 18:12:48 +0000 (18:12 +0000)]
git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload-1, -2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: introduce nmu-upload (nfc)
Ian Jackson [Sat, 17 Feb 2018 12:30:39 +0000 (12:30 +0000)]
git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: convert-to-gbp: mention commit tag
Ian Jackson [Sat, 17 Feb 2018 12:27:29 +0000 (12:27 +0000)]
git-debrebase: convert-to-gbp: mention commit tag

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: convert-from-gbp: fix usage comment
Ian Jackson [Sat, 17 Feb 2018 12:22:18 +0000 (12:22 +0000)]
git-debrebase: convert-from-gbp: fix usage comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: convert-to-gbp: declare it not v0
Ian Jackson [Sat, 17 Feb 2018 12:22:06 +0000 (12:22 +0000)]
git-debrebase: convert-to-gbp: declare it not v0

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: convert-to-gbp: implementation seems to work
Ian Jackson [Sat, 17 Feb 2018 12:21:09 +0000 (12:21 +0000)]
git-debrebase: convert-to-gbp: implementation seems to work

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: t-gdr-good: test git-debrebase breakwater
Ian Jackson [Sat, 17 Feb 2018 12:05:18 +0000 (12:05 +0000)]
git-debrebase: test suite: t-gdr-good: test git-debrebase breakwater

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: t-gdr-good: split up the big case into two (nfc)
Ian Jackson [Sat, 17 Feb 2018 12:00:57 +0000 (12:00 +0000)]
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>
17 months agogit-debrebase: provide breakwater command
Ian Jackson [Sat, 17 Feb 2018 11:47:19 +0000 (11:47 +0000)]
git-debrebase: provide breakwater command

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: classify: provide Why for Unknown
Ian Jackson [Sat, 17 Feb 2018 11:46:35 +0000 (11:46 +0000)]
git-debrebase: classify: provide Why for Unknown

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: NOTES: avoid merges
Ian Jackson [Sat, 17 Feb 2018 11:24:05 +0000 (11:24 +0000)]
git-debrebase: NOTES: avoid merges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: do not dgit pull (sets a bad example)
Ian Jackson [Sat, 17 Feb 2018 11:21:51 +0000 (11:21 +0000)]
git-debrebase: test suite: do not dgit pull (sets a bad example)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: NOTES: about divergence and merges
Ian Jackson [Sat, 17 Feb 2018 11:19:57 +0000 (11:19 +0000)]
git-debrebase: NOTES: about divergence and merges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: slight message improvements etc.
Ian Jackson [Fri, 16 Feb 2018 22:44:13 +0000 (22:44 +0000)]
git-debrebase: slight message improvements etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: rename gbp2gdr to convert-from-gbp
Ian Jackson [Fri, 16 Feb 2018 22:43:45 +0000 (22:43 +0000)]
git-debrebase: rename gbp2gdr to convert-from-gbp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: introduce t-make-new-upstream-tarball
Ian Jackson [Fri, 16 Feb 2018 22:15:28 +0000 (22:15 +0000)]
git-debrebase: test suite: introduce t-make-new-upstream-tarball

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: note we've added a test
Ian Jackson [Fri, 16 Feb 2018 21:53:38 +0000 (21:53 +0000)]
git-debrebase: test suite: note we've added a test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: extend
Ian Jackson [Fri, 16 Feb 2018 21:14:20 +0000 (21:14 +0000)]
git-debrebase: test suite: gdr-import-dgit: extend

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: extend
Ian Jackson [Fri, 16 Feb 2018 21:13:56 +0000 (21:13 +0000)]
git-debrebase: test suite: gdr-import-dgit: extend

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: bugfix
Ian Jackson [Fri, 16 Feb 2018 21:13:41 +0000 (21:13 +0000)]
git-debrebase: bugfix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: drop a superfluous rm_subdir_cached qw(debian/patches)
Ian Jackson [Fri, 16 Feb 2018 21:06:45 +0000 (21:06 +0000)]
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>
17 months agogit-debrebase: test suite: add a missing --quiet to git-diff
Ian Jackson [Fri, 16 Feb 2018 20:55:07 +0000 (20:55 +0000)]
git-debrebase: test suite: add a missing --quiet to git-diff

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: introduce t-gdr-good
Ian Jackson [Fri, 16 Feb 2018 20:34:30 +0000 (20:34 +0000)]
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>
17 months agogit-debrebase: test suite: introduce t-gdr-same-as-before
Ian Jackson [Fri, 16 Feb 2018 20:32:38 +0000 (20:32 +0000)]
git-debrebase: test suite: introduce t-gdr-same-as-before

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: dgit import: honour $upp_limit
Ian Jackson [Fri, 16 Feb 2018 20:30:32 +0000 (20:30 +0000)]
git-debrebase: dgit import: honour $upp_limit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: DgitImportUnpatched: defer upstream diff check
Ian Jackson [Fri, 16 Feb 2018 20:24:56 +0000 (20:24 +0000)]
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>
17 months agogit-debrebase: fix Overwritten to be an array like it says, etc.
Ian Jackson [Fri, 16 Feb 2018 20:21:51 +0000 (20:21 +0000)]
git-debrebase: fix Overwritten to be an array like it says, etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-import-dgit: wip
Ian Jackson [Fri, 16 Feb 2018 15:48:06 +0000 (15:48 +0000)]
git-debrebase: test suite: gdr-import-dgit: wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: introduce t-some-changes
Ian Jackson [Fri, 16 Feb 2018 15:13:24 +0000 (15:13 +0000)]
git-debrebase: test suite: introduce t-some-changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: introduce t-dch-commit
Ian Jackson [Fri, 16 Feb 2018 15:09:18 +0000 (15:09 +0000)]
git-debrebase: test suite: introduce t-dch-commit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-edits: check branch structure after last push
Ian Jackson [Fri, 16 Feb 2018 15:01:03 +0000 (15:01 +0000)]
git-debrebase: test suite: gdr-edits: check branch structure after last push

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gdr-edits: do a push
Ian Jackson [Fri, 16 Feb 2018 14:55:48 +0000 (14:55 +0000)]
git-debrebase: test suite: gdr-edits: do a push

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gbp2gdr: fix not-gdr-processable to not modify things
Ian Jackson [Fri, 16 Feb 2018 14:55:34 +0000 (14:55 +0000)]
git-debrebase: test suite: gbp2gdr: fix not-gdr-processable to not modify things

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test suite: gbp2gdr: process incoming
Ian Jackson [Fri, 16 Feb 2018 14:45:18 +0000 (14:45 +0000)]
git-debrebase: test suite: gbp2gdr: process incoming

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: NOTES: another todo
Ian Jackson [Fri, 16 Feb 2018 14:44:59 +0000 (14:44 +0000)]
git-debrebase: NOTES: another todo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test: check branch structure, more
Ian Jackson [Fri, 16 Feb 2018 11:49:44 +0000 (11:49 +0000)]
git-debrebase: test: check branch structure, more

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: test: check branch structure
Ian Jackson [Fri, 16 Feb 2018 11:49:05 +0000 (11:49 +0000)]
git-debrebase: test: check branch structure

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: some NOTES
Ian Jackson [Fri, 16 Feb 2018 09:06:06 +0000 (09:06 +0000)]
git-debrebase: some NOTES

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: note some todos for gdr-edits
Ian Jackson [Fri, 16 Feb 2018 09:04:28 +0000 (09:04 +0000)]
test suite: note some todos for gdr-edits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: stitch better
Ian Jackson [Fri, 16 Feb 2018 09:01:38 +0000 (09:01 +0000)]
git-debrebase: stitch better

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: wip stitch
Ian Jackson [Thu, 15 Feb 2018 20:18:24 +0000 (20:18 +0000)]
git-debrebase: wip stitch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: record ffq-prev on rebase
Ian Jackson [Thu, 15 Feb 2018 20:17:12 +0000 (20:17 +0000)]
git-debrebase: record ffq-prev on rebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: break out ffq_prev_branchinfo (nfc)
Ian Jackson [Thu, 15 Feb 2018 20:16:42 +0000 (20:16 +0000)]
git-debrebase: break out ffq_prev_branchinfo (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: fix $/ to be local in cfg (!)
Ian Jackson [Thu, 15 Feb 2018 20:14:18 +0000 (20:14 +0000)]
git-debrebase: fix $/ to be local in cfg (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: gdr-edits: more
Ian Jackson [Thu, 15 Feb 2018 19:34:09 +0000 (19:34 +0000)]
test suite: gdr-edits: more

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: do not add -i in default invocation
Ian Jackson [Thu, 15 Feb 2018 19:29:00 +0000 (19:29 +0000)]
git-debrebase: do not add -i in default invocation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: gbp2gdr: drop some branches we do not want here
Ian Jackson [Thu, 15 Feb 2018 19:26:55 +0000 (19:26 +0000)]
test suite: gbp2gdr: drop some branches we do not want here

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: gdr-edits: wip new test
Ian Jackson [Thu, 15 Feb 2018 19:20:24 +0000 (19:20 +0000)]
test suite: gdr-edits: wip new test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: gbp2gdr: call t-setup-done
Ian Jackson [Thu, 15 Feb 2018 19:20:06 +0000 (19:20 +0000)]
test suite: gbp2gdr: call t-setup-done

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: gbp2gdr: drop junk at the end
Ian Jackson [Thu, 15 Feb 2018 19:09:11 +0000 (19:09 +0000)]
test suite: gbp2gdr: drop junk at the end

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: gbp2gdr: seems to work now
Ian Jackson [Thu, 15 Feb 2018 19:08:44 +0000 (19:08 +0000)]
test suite: gbp2gdr: seems to work now

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: something to have a salsa (general purpose git) repo
Ian Jackson [Thu, 15 Feb 2018 19:08:17 +0000 (19:08 +0000)]
test suite: something to have a salsa (general purpose git) repo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: check head is clean before starting
Ian Jackson [Thu, 15 Feb 2018 18:54:38 +0000 (18:54 +0000)]
git-debrebase: check head is clean before starting

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups
Ian Jackson [Thu, 15 Feb 2018 18:53:52 +0000 (18:53 +0000)]
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>
17 months agogit-debrebase: test: use conventional branch names
Ian Jackson [Thu, 15 Feb 2018 16:14:04 +0000 (16:14 +0000)]
git-debrebase: test: use conventional branch names

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: for master branch, check dgit/dgit/sid too
Ian Jackson [Thu, 15 Feb 2018 16:09:14 +0000 (16:09 +0000)]
git-debrebase: for master branch, check dgit/dgit/sid too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: bugfixes to record_ffq_prev
Ian Jackson [Thu, 15 Feb 2018 15:57:38 +0000 (15:57 +0000)]
git-debrebase: bugfixes to record_ffq_prev

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: make cfg optionally take $optional (nfc)
Ian Jackson [Thu, 15 Feb 2018 15:48:14 +0000 (15:48 +0000)]
git-debrebase: make cfg optionally take $optional (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: wip cmd_record_ffq_prev
Ian Jackson [Thu, 15 Feb 2018 15:36:00 +0000 (15:36 +0000)]
git-debrebase: wip cmd_record_ffq_prev

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: provide record_ffq_prev (no callers yet)
Ian Jackson [Thu, 15 Feb 2018 15:35:53 +0000 (15:35 +0000)]
git-debrebase: provide record_ffq_prev (no callers yet)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agodebian/control, git-debrebase: "use fnmatch;"
Ian Jackson [Thu, 15 Feb 2018 15:35:28 +0000 (15:35 +0000)]
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>
17 months agogit-debrebase: introduce --noop-ok
Ian Jackson [Thu, 15 Feb 2018 15:34:57 +0000 (15:34 +0000)]
git-debrebase: introduce --noop-ok

No actual effect yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: notes re ffq-prev ref name
Ian Jackson [Thu, 15 Feb 2018 13:52:50 +0000 (13:52 +0000)]
git-debrebase: notes re ffq-prev ref name

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: intent re record-ffqrebase
Ian Jackson [Mon, 12 Feb 2018 09:02:12 +0000 (09:02 +0000)]
git-debrebase: intent re record-ffqrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: intent re record-ffrebase
Ian Jackson [Sat, 10 Feb 2018 18:31:27 +0000 (18:31 +0000)]
git-debrebase: intent re record-ffrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agotest suite: gbp2gdr: use -f<tag> rather than --force
Ian Jackson [Sat, 10 Feb 2018 18:15:00 +0000 (18:15 +0000)]
test suite: gbp2gdr: use -f<tag> rather than --force

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: provide -f<tag>
Ian Jackson [Sat, 10 Feb 2018 18:14:44 +0000 (18:14 +0000)]
git-debrebase: provide -f<tag>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: introduce any_fproblems (nfc)
Ian Jackson [Sat, 10 Feb 2018 17:55:22 +0000 (17:55 +0000)]
git-debrebase: introduce any_fproblems (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: introduce tags for fproblems, no use yet
Ian Jackson [Sat, 10 Feb 2018 17:54:32 +0000 (17:54 +0000)]
git-debrebase: introduce tags for fproblems, no use yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: more notes
Ian Jackson [Sat, 10 Feb 2018 17:50:12 +0000 (17:50 +0000)]
git-debrebase: more notes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: note re debrebase push?
Ian Jackson [Sat, 10 Feb 2018 17:40:51 +0000 (17:40 +0000)]
git-debrebase: note re debrebase push?

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: decide: make few pseudomerges, and preserve them
Ian Jackson [Sat, 10 Feb 2018 17:40:41 +0000 (17:40 +0000)]
git-debrebase: decide: make few pseudomerges, and preserve them

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: notes re psuedomerges
Ian Jackson [Sat, 10 Feb 2018 17:39:25 +0000 (17:39 +0000)]
git-debrebase: notes re psuedomerges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: notes
Ian Jackson [Sat, 10 Feb 2018 17:15:43 +0000 (17:15 +0000)]
git-debrebase: notes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: note that we have mostly done the gbp import
Ian Jackson [Sat, 10 Feb 2018 17:14:12 +0000 (17:14 +0000)]
git-debrebase: note that we have mostly done the gbp import

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: insist that breakwater merges are merges
Ian Jackson [Sat, 10 Feb 2018 15:27:56 +0000 (15:27 +0000)]
git-debrebase: insist that breakwater merges are merges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: introduce $claims_to_be_breakwater (nfc)
Ian Jackson [Sat, 10 Feb 2018 15:27:48 +0000 (15:27 +0000)]
git-debrebase: introduce $claims_to_be_breakwater (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: explain why breakwater bases must be merges
Ian Jackson [Sat, 10 Feb 2018 15:27:19 +0000 (15:27 +0000)]
git-debrebase: explain why breakwater bases must be merges

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