chiark / gitweb /
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>
Ian Jackson [Tue, 30 Jan 2018 18:30:13 +0000 (18:30 +0000)]
git-debrebase: bugfix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 18:29:58 +0000 (18:29 +0000)]
git-debrebase: BUG due to some evidently unfinished code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 17:00:05 +0000 (17:00 +0000)]
git-debrebase: syntax fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Jan 2018 15:58:40 +0000 (15:58 +0000)]
git-debrebase: wip new-upstream, ready for testing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Jan 2018 17:09:07 +0000 (17:09 +0000)]
git-debrebase: new-upstream wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Jan 2018 16:35:30 +0000 (16:35 +0000)]
git-debrebase: new-upstream wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Jan 2018 16:35:10 +0000 (16:35 +0000)]
git-debrebase: add --force option (no users, so nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Jan 2018 16:34:25 +0000 (16:34 +0000)]
git-debrebase: break out read_tree_subdir (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Jan 2018 16:30:45 +0000 (16:30 +0000)]
git-debrebase: break out rm_subdir_cached (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Jan 2018 17:32:29 +0000 (17:32 +0000)]
git-debrebase: wip new-upstream
before needing to unpick multi-upstream
also realise need to parse breakwater to check we are not ff only due to combination merge
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Jan 2018 15:20:02 +0000 (15:20 +0000)]
git-debrebase: fix: document that breakwater merges always have single parent
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Jan 2018 15:19:33 +0000 (15:19 +0000)]
git-debrebase: break out parsecommit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Jan 2018 15:19:20 +0000 (15:19 +0000)]
git-debrebase: document that breakwater merges always have single parent
multi-orig upstreams will get a separate commit merging the upstream stuff
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 25 Oct 2017 17:37:29 +0000 (18:37 +0100)]
git-debrebase: launder: debug print why rewriting if out-of-order
Ian Jackson [Wed, 25 Oct 2017 17:33:36 +0000 (18:33 +0100)]
git-debrebase: bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Oct 2017 19:30:09 +0000 (20:30 +0100)]
git-debrebase: launder: print working tip too
Ian Jackson [Sun, 22 Oct 2017 19:29:58 +0000 (20:29 +0100)]
git-debrebase: fix rm of debian/patches not to mind if there aren't any
Ian Jackson [Sun, 22 Oct 2017 19:29:32 +0000 (20:29 +0100)]
git-debrebase: fix final diff check
Ian Jackson [Sun, 22 Oct 2017 19:29:23 +0000 (20:29 +0100)]
git-debrebase: fix parents in generated commits (!)
Ian Jackson [Sun, 22 Oct 2017 19:29:04 +0000 (20:29 +0100)]
git-debrebase: fix Mixed handling
Ian Jackson [Sun, 22 Oct 2017 19:28:54 +0000 (20:28 +0100)]
git-debrebase: when dieing due to bad commit, print differs
Ian Jackson [Sun, 22 Oct 2017 19:28:40 +0000 (20:28 +0100)]
git-debrebase: in classify, call get_differs with args in right oder
Ian Jackson [Sun, 22 Oct 2017 19:28:01 +0000 (20:28 +0100)]
git-debrebase: get_differs tolerates addition of debian/series as well as appending to it
Ian Jackson [Sun, 22 Oct 2017 19:27:28 +0000 (20:27 +0100)]
git-debrebase: call setup_sigwarn
Ian Jackson [Fri, 25 Aug 2017 19:58:19 +0000 (20:58 +0100)]
git-debrebase: launder: fix
Ian Jackson [Fri, 25 Aug 2017 19:58:09 +0000 (20:58 +0100)]
git-debrebase: introduce update_head_checkout
Ian Jackson [Fri, 25 Aug 2017 10:26:31 +0000 (11:26 +0100)]
git-debrebase: downstream-rebase-launder-v0 first cut
Ian Jackson [Fri, 25 Aug 2017 10:11:08 +0000 (11:11 +0100)]
git-debrebase: classificaton generates Changelog type
Ian Jackson [Fri, 25 Aug 2017 10:06:39 +0000 (11:06 +0100)]
git-debrebase: introduce DS_DEB
differentiate changelog from other diffs in get_differ
no change to classification output
also fix a $_ eq m{...} bug!
Ian Jackson [Fri, 25 Aug 2017 09:45:29 +0000 (10:45 +0100)]
git-debrebase: classify: tolerate backwards breakwater merges
Ian Jackson [Fri, 25 Aug 2017 09:44:04 +0000 (10:44 +0100)]
git-debrebase: classify: introduce $prevbrw (nfc)
Ian Jackson [Thu, 24 Aug 2017 14:55:19 +0000 (15:55 +0100)]
git-debrebase: wip fixes for new no global $playground
Ian Jackson [Thu, 24 Aug 2017 14:24:07 +0000 (15:24 +0100)]
git-debrebase: wip, before abolish Dgit.pm's global
Ian Jackson [Tue, 18 Jul 2017 20:44:46 +0000 (21:44 +0100)]
git-debrebase: WIP FOUND
Ian Jackson [Fri, 14 Jul 2017 14:30:45 +0000 (15:30 +0100)]
git-debrebase: fixes
Ian Jackson [Fri, 14 Jul 2017 14:30:36 +0000 (15:30 +0100)]
git-debrebase: git-debrebase; get_commit: use new $etype
Ian Jackson [Fri, 14 Jul 2017 14:10:05 +0000 (15:10 +0100)]
git-debrebase: fixes
Ian Jackson [Fri, 14 Jul 2017 11:23:31 +0000 (12:23 +0100)]
git-debrebase: wip debug, fixes etc.
Ian Jackson [Fri, 14 Jul 2017 10:43:47 +0000 (11:43 +0100)]
git-debrebase: wip fixes
Ian Jackson [Sun, 9 Jul 2017 13:55:37 +0000 (14:55 +0100)]
git-debrebase: finish get_differs ?
Ian Jackson [Sun, 9 Jul 2017 13:37:10 +0000 (14:37 +0100)]
git-debrebase: wip
Ian Jackson [Sun, 9 Jul 2017 13:04:27 +0000 (14:04 +0100)]
git-debrebase: move --name-only
Ian Jackson [Sun, 9 Jul 2017 13:02:41 +0000 (14:02 +0100)]
git-debrebase: allow opts
Ian Jackson [Sun, 9 Jul 2017 13:01:38 +0000 (14:01 +0100)]
git-debrebase: avoid renames
Ian Jackson [Sun, 9 Jul 2017 12:47:30 +0000 (13:47 +0100)]
git-debrebase: wip
Ian Jackson [Fri, 7 Jul 2017 10:49:22 +0000 (11:49 +0100)]
git-debrebase: wip
Ian Jackson [Wed, 28 Jun 2017 12:40:52 +0000 (13:40 +0100)]
git-debrebase: WIP FOUND
~ianmdlvl / dgit.git / log