chiark / gitweb /
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Ian Jackson [Sat, 10 Feb 2018 15:20:10 +0000 (15:20 +0000)]
git-debrebase: fix misdetection of breakwater declarations as other pseudomerges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 15:19:52 +0000 (15:19 +0000)]
git-debrebase: rework commit annotations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 14:21:12 +0000 (14:21 +0000)]
git-debrebase: list tags currently written
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 14:15:35 +0000 (14:15 +0000)]
test suite: git-debrebase: turn on debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 14:15:09 +0000 (14:15 +0000)]
git-debrebase: bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 12:21:57 +0000 (12:21 +0000)]
test suite: gbp2gdr: run gdr gbp2debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 12:21:39 +0000 (12:21 +0000)]
git-debrebase: wip gbp2debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 11:37:55 +0000 (11:37 +0000)]
test suite: initial git-debrebase setup attempts - bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 11:27:30 +0000 (11:27 +0000)]
test suite: initial git-debrebase setup attempts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 10 Feb 2018 11:27:05 +0000 (11:27 +0000)]
test suite: infrastructure for testing git-debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Feb 2018 12:04:15 +0000 (12:04 +0000)]
git-debrebase: Install it in /usr/bin
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Feb 2018 21:54:45 +0000 (21:54 +0000)]
git-debrebase: fix break out fproblem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Feb 2018 21:54:25 +0000 (21:54 +0000)]
git-debrebase: fix several calls to git_cat_file
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Feb 2018 21:51:04 +0000 (21:51 +0000)]
git-debrebase: in new-upstream-v0 tolerate planned upstream-combine commits which are not necessary *new* upstream (eg gbp import)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Feb 2018 21:50:24 +0000 (21:50 +0000)]
git-debrebase: break out fproblem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Feb 2018 21:49:54 +0000 (21:49 +0000)]
git-debrebase: some notes about gbp import
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 9 Feb 2018 21:49:49 +0000 (21:49 +0000)]
git-debrebase: some notes about gbp import
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 18:26:01 +0000 (18:26 +0000)]
git-debrebase: docs updates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 18:11:17 +0000 (18:11 +0000)]
git-debrebase: rename NOTES to be more generic
Ian Jackson [Wed, 31 Jan 2018 16:41:20 +0000 (16:41 +0000)]
git-debrebase: provide default rebase action
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 16:40:58 +0000 (16:40 +0000)]
git-debrebase: update_head_postlaunder: print a message, if anything changed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 16:34:06 +0000 (16:34 +0000)]
git-debrebase: new-upstream-v0: support passing git-rebase options
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:31:28 +0000 (15:31 +0000)]
git-debrebase: new-upstream-v0: use update_head_postlaunder
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:31:16 +0000 (15:31 +0000)]
git-debrebase: fix changelog manip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:31:02 +0000 (15:31 +0000)]
git-debrebase: break out update_head_postlaunder (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:13:04 +0000 (15:13 +0000)]
git-debrebase: whitespace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:12:54 +0000 (15:12 +0000)]
git-debrebase: new-upstream-v0: use make_commit another time (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:09:19 +0000 (15:09 +0000)]
git-debrebase: new-upstream-v0 break out make_commit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:02:56 +0000 (15:02 +0000)]
git-debrebase: new-upstream-v0 bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 14:57:57 +0000 (14:57 +0000)]
git-debrebase: break out dd (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 19:08:05 +0000 (19:08 +0000)]
git-debrebase: walk: print some more debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 19:07:48 +0000 (19:07 +0000)]
git-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 19:07:24 +0000 (19:07 +0000)]
git-debrebase: parsecommit: fix Ix to not be off-by-one
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 18:46:41 +0000 (18:46 +0000)]
git-debrebase: new-upstream-v0: fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 18:46:33 +0000 (18:46 +0000)]
git-debrebase: launder: print last upstream merge too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 18:46:20 +0000 (18:46 +0000)]
git-debrebase: drop d/patches from all laundered commits
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 18:30:56 +0000 (18:30 +0000)]
git-debrebase: new-upstream-v0: use last upstream merge in breakwater branch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 18:30:44 +0000 (18:30 +0000)]
git-debrebase: walk: return last upstream merge in breakwater branch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / dgit.git / log