chiark / gitweb /
dgit.git
17 months agogit-debrebase: rename NOTES to be more generic
Ian Jackson [Wed, 31 Jan 2018 18:11:17 +0000 (18:11 +0000)]
git-debrebase: rename NOTES to be more generic

17 months agogit-debrebase: provide default rebase action
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>
17 months agogit-debrebase: update_head_postlaunder: print a message, if anything changed
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>
17 months agogit-debrebase: new-upstream-v0: support passing git-rebase options
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>
17 months agogit-debrebase: new-upstream-v0: use update_head_postlaunder
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>
17 months agogit-debrebase: fix changelog manip
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>
17 months agogit-debrebase: break out update_head_postlaunder (nfc)
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>
17 months agogit-debrebase: whitespace
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>
17 months agogit-debrebase: new-upstream-v0: use make_commit another time (nfc)
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>
17 months agogit-debrebase: new-upstream-v0 break out make_commit
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>
17 months agogit-debrebase: new-upstream-v0 bugfixes
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>
17 months agogit-debrebase: break out dd (nfc)
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>
17 months agogit-debrebase: walk: print some more debug
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>
17 months agogit-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify
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>
17 months agogit-debrebase: parsecommit: fix Ix to not be off-by-one
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>
17 months agogit-debrebase: new-upstream-v0: fixes
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>
17 months agogit-debrebase: launder: print last upstream merge too
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>
17 months agogit-debrebase: drop d/patches from all laundered commits
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>
17 months agogit-debrebase: new-upstream-v0: use last upstream merge in breakwater branch
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>
17 months agogit-debrebase: walk: return last upstream merge in breakwater branch
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>
17 months agogit-debrebase: bugfix
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>
17 months agogit-debrebase: BUG due to some evidently unfinished code
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>
17 months agogit-debrebase: syntax fixes
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>
17 months agogit-debrebase: wip new-upstream, ready for testing
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>
17 months agogit-debrebase: new-upstream wip
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>
17 months agogit-debrebase: new-upstream wip
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>
17 months agogit-debrebase: add --force option (no users, so nfc)
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>
17 months agogit-debrebase: break out read_tree_subdir (nfc)
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>
17 months agogit-debrebase: break out rm_subdir_cached (nfc)
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>
17 months agogit-debrebase: wip new-upstream
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>
17 months agogit-debrebase: fix: document that breakwater merges always have single parent
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>
17 months agogit-debrebase: break out parsecommit
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>
17 months agogit-debrebase: document that breakwater merges always have single parent
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>
17 months agogit-debrebase: launder: debug print why rewriting if out-of-order
Ian Jackson [Wed, 25 Oct 2017 17:37:29 +0000 (18:37 +0100)]
git-debrebase: launder: debug print why rewriting if out-of-order

17 months agogit-debrebase: bugfixes
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>
17 months agogit-debrebase: launder: print working tip too
Ian Jackson [Sun, 22 Oct 2017 19:30:09 +0000 (20:30 +0100)]
git-debrebase: launder: print working tip too

17 months agogit-debrebase: fix rm of debian/patches not to mind if there aren't any
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

17 months agogit-debrebase: fix final diff check
Ian Jackson [Sun, 22 Oct 2017 19:29:32 +0000 (20:29 +0100)]
git-debrebase: fix final diff check

17 months agogit-debrebase: fix parents in generated commits (!)
Ian Jackson [Sun, 22 Oct 2017 19:29:23 +0000 (20:29 +0100)]
git-debrebase: fix parents in generated commits (!)

17 months agogit-debrebase: fix Mixed handling
Ian Jackson [Sun, 22 Oct 2017 19:29:04 +0000 (20:29 +0100)]
git-debrebase: fix Mixed handling

17 months agogit-debrebase: when dieing due to bad commit, print differs
Ian Jackson [Sun, 22 Oct 2017 19:28:54 +0000 (20:28 +0100)]
git-debrebase: when dieing due to bad commit, print differs

17 months agogit-debrebase: in classify, call get_differs with args in right oder
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

17 months agogit-debrebase: get_differs tolerates addition of debian/series as well as appending...
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

17 months agogit-debrebase: call setup_sigwarn
Ian Jackson [Sun, 22 Oct 2017 19:27:28 +0000 (20:27 +0100)]
git-debrebase: call setup_sigwarn

17 months agogit-debrebase: launder: fix
Ian Jackson [Fri, 25 Aug 2017 19:58:19 +0000 (20:58 +0100)]
git-debrebase: launder: fix

17 months agogit-debrebase: introduce update_head_checkout
Ian Jackson [Fri, 25 Aug 2017 19:58:09 +0000 (20:58 +0100)]
git-debrebase: introduce update_head_checkout

17 months agogit-debrebase: downstream-rebase-launder-v0 first cut
Ian Jackson [Fri, 25 Aug 2017 10:26:31 +0000 (11:26 +0100)]
git-debrebase: downstream-rebase-launder-v0 first cut

17 months agogit-debrebase: classificaton generates Changelog type
Ian Jackson [Fri, 25 Aug 2017 10:11:08 +0000 (11:11 +0100)]
git-debrebase: classificaton generates Changelog type

17 months agogit-debrebase: introduce DS_DEB
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!

17 months agogit-debrebase: classify: tolerate backwards breakwater merges
Ian Jackson [Fri, 25 Aug 2017 09:45:29 +0000 (10:45 +0100)]
git-debrebase: classify: tolerate backwards breakwater merges

17 months agogit-debrebase: classify: introduce $prevbrw (nfc)
Ian Jackson [Fri, 25 Aug 2017 09:44:04 +0000 (10:44 +0100)]
git-debrebase: classify: introduce $prevbrw (nfc)

17 months agogit-debrebase: wip fixes for new no global $playground
Ian Jackson [Thu, 24 Aug 2017 14:55:19 +0000 (15:55 +0100)]
git-debrebase: wip fixes for new no global $playground

17 months agogit-debrebase: wip, before abolish Dgit.pm's global
Ian Jackson [Thu, 24 Aug 2017 14:24:07 +0000 (15:24 +0100)]
git-debrebase: wip, before abolish Dgit.pm's  global

17 months agogit-debrebase: WIP FOUND
Ian Jackson [Tue, 18 Jul 2017 20:44:46 +0000 (21:44 +0100)]
git-debrebase: WIP FOUND

17 months agogit-debrebase: fixes
Ian Jackson [Fri, 14 Jul 2017 14:30:45 +0000 (15:30 +0100)]
git-debrebase: fixes

17 months agogit-debrebase: git-debrebase; get_commit: use new $etype
Ian Jackson [Fri, 14 Jul 2017 14:30:36 +0000 (15:30 +0100)]
git-debrebase: git-debrebase; get_commit: use new $etype

17 months agogit-debrebase: fixes
Ian Jackson [Fri, 14 Jul 2017 14:10:05 +0000 (15:10 +0100)]
git-debrebase: fixes

17 months agogit-debrebase: wip debug, fixes etc.
Ian Jackson [Fri, 14 Jul 2017 11:23:31 +0000 (12:23 +0100)]
git-debrebase: wip debug, fixes etc.

17 months agogit-debrebase: wip fixes
Ian Jackson [Fri, 14 Jul 2017 10:43:47 +0000 (11:43 +0100)]
git-debrebase: wip fixes

17 months agogit-debrebase: finish get_differs ?
Ian Jackson [Sun, 9 Jul 2017 13:55:37 +0000 (14:55 +0100)]
git-debrebase: finish get_differs ?

17 months agogit-debrebase: wip
Ian Jackson [Sun, 9 Jul 2017 13:37:10 +0000 (14:37 +0100)]
git-debrebase: wip

17 months agogit-debrebase: move --name-only
Ian Jackson [Sun, 9 Jul 2017 13:04:27 +0000 (14:04 +0100)]
git-debrebase: move --name-only

17 months agogit-debrebase: allow opts
Ian Jackson [Sun, 9 Jul 2017 13:02:41 +0000 (14:02 +0100)]
git-debrebase: allow opts

17 months agogit-debrebase: avoid renames
Ian Jackson [Sun, 9 Jul 2017 13:01:38 +0000 (14:01 +0100)]
git-debrebase: avoid renames

17 months agogit-debrebase: wip
Ian Jackson [Sun, 9 Jul 2017 12:47:30 +0000 (13:47 +0100)]
git-debrebase: wip

17 months agogit-debrebase: wip
Ian Jackson [Fri, 7 Jul 2017 10:49:22 +0000 (11:49 +0100)]
git-debrebase: wip

17 months agogit-debrebase: WIP FOUND
Ian Jackson [Wed, 28 Jun 2017 12:40:52 +0000 (13:40 +0100)]
git-debrebase: WIP FOUND

17 months agogit-debrebase: rebase fixes
Ian Jackson [Wed, 21 Jun 2017 20:44:35 +0000 (21:44 +0100)]
git-debrebase: rebase fixes

17 months agogit-debrebase: rebase: go back to my $build
Ian Jackson [Wed, 21 Jun 2017 20:40:24 +0000 (21:40 +0100)]
git-debrebase: rebase: go back to my $build

We never don't have exactly one parent

17 months agogit-debrebase: fixes
Ian Jackson [Wed, 14 Jun 2017 23:20:02 +0000 (00:20 +0100)]
git-debrebase: fixes

17 months agogit-debrebase: introduce build_start
Ian Jackson [Wed, 14 Jun 2017 23:18:12 +0000 (00:18 +0100)]
git-debrebase: introduce build_start

17 months agogit-debrebase: abolish recursion
Ian Jackson [Wed, 14 Jun 2017 23:14:29 +0000 (00:14 +0100)]
git-debrebase: abolish recursion

17 months agogit-debrebase: rewrite in brw_cl too
Ian Jackson [Wed, 14 Jun 2017 22:39:29 +0000 (23:39 +0100)]
git-debrebase: rewrite in brw_cl too

17 months agogit-debrebase: rename @upp_cl @brw_cl $wantbrwonly
Ian Jackson [Wed, 14 Jun 2017 22:38:01 +0000 (23:38 +0100)]
git-debrebase: rename @upp_cl @brw_cl $wantbrwonly

17 months agogit-debrebase: wip
Ian Jackson [Wed, 14 Jun 2017 20:50:55 +0000 (21:50 +0100)]
git-debrebase: wip

17 months agogit-debrebase: wip rebase fixes
Ian Jackson [Mon, 5 Jun 2017 18:00:25 +0000 (19:00 +0100)]
git-debrebase: wip rebase fixes

17 months agogit-debrebase: wip found
Ian Jackson [Mon, 5 Jun 2017 17:28:56 +0000 (18:28 +0100)]
git-debrebase: wip found

17 months agogit-debrebase: pseudocode typo
Ian Jackson [Wed, 24 May 2017 17:26:09 +0000 (18:26 +0100)]
git-debrebase: pseudocode typo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: wip, redoing origin handling
Ian Jackson [Sun, 14 May 2017 21:37:45 +0000 (22:37 +0100)]
git-debrebase: wip, redoing origin handling

17 months agogit-debrebase: wip import handling etc.
Ian Jackson [Sun, 14 May 2017 20:49:45 +0000 (21:49 +0100)]
git-debrebase: wip import handling etc.

17 months agogit-debrebase: fix README typo
Ian Jackson [Fri, 28 Apr 2017 19:56:34 +0000 (20:56 +0100)]
git-debrebase: fix README typo

17 months agogit-debrebase: git-debrebase fixes
Ian Jackson [Fri, 28 Apr 2017 19:52:43 +0000 (20:52 +0100)]
git-debrebase: git-debrebase fixes

17 months agogit-debrebase: git-debrebase fixes
Ian Jackson [Fri, 28 Apr 2017 19:34:50 +0000 (20:34 +0100)]
git-debrebase: git-debrebase fixes

17 months agogit-debrebase: git-debrebase fixes
Ian Jackson [Fri, 28 Apr 2017 19:30:55 +0000 (20:30 +0100)]
git-debrebase: git-debrebase fixes

17 months agogit-debrebase: sort out report, and walk, allegedly
Ian Jackson [Fri, 28 Apr 2017 17:47:41 +0000 (18:47 +0100)]
git-debrebase: sort out report, and walk, allegedly

17 months agogit-debrebase: abolish $pseudos_must_overwrite_this
Ian Jackson [Fri, 28 Apr 2017 16:43:17 +0000 (17:43 +0100)]
git-debrebase: abolish $pseudos_must_overwrite_this

17 months agogit-debrebase: wip pseudomerge handling
Ian Jackson [Fri, 28 Apr 2017 16:41:38 +0000 (17:41 +0100)]
git-debrebase: wip pseudomerge handling

17 months agogit-debrebase: wip found
Ian Jackson [Fri, 28 Apr 2017 13:13:37 +0000 (14:13 +0100)]
git-debrebase: wip found

17 months agogit-debrebase: wip
Ian Jackson [Wed, 5 Apr 2017 20:46:27 +0000 (21:46 +0100)]
git-debrebase: wip

17 months agogit-debrebase: abolish abbrev thing
Ian Jackson [Wed, 5 Apr 2017 17:20:03 +0000 (18:20 +0100)]
git-debrebase: abolish abbrev thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: found
Ian Jackson [Wed, 5 Apr 2017 17:14:24 +0000 (18:14 +0100)]
git-debrebase: found

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: README.git-debrebase: diagrams of how to handle imports
Ian Jackson [Fri, 31 Mar 2017 18:04:13 +0000 (19:04 +0100)]
git-debrebase: README.git-debrebase: diagrams of how to handle imports

17 months agogit-debrebase: README tidy up
Ian Jackson [Fri, 31 Mar 2017 17:33:06 +0000 (18:33 +0100)]
git-debrebase: README tidy up

17 months agogit-debrebase: README.git-debrebase: both emails
Ian Jackson [Fri, 31 Mar 2017 17:24:56 +0000 (18:24 +0100)]
git-debrebase: README.git-debrebase: both emails

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: wip: README
Ian Jackson [Fri, 31 Mar 2017 17:23:18 +0000 (18:23 +0100)]
git-debrebase: wip: README

17 months agogit-debrebase: wip
Ian Jackson [Fri, 31 Mar 2017 17:23:10 +0000 (18:23 +0100)]
git-debrebase: wip

17 months agogit-debrebase: wip, found
Ian Jackson [Fri, 31 Mar 2017 15:07:17 +0000 (16:07 +0100)]
git-debrebase: wip, found

17 months agogit-debrebase: wip, launder rm patches
Ian Jackson [Fri, 10 Mar 2017 18:03:47 +0000 (18:03 +0000)]
git-debrebase: wip, launder rm patches

17 months agogit-debrebase: wip gitattrs dealt with
Ian Jackson [Fri, 10 Mar 2017 17:51:08 +0000 (17:51 +0000)]
git-debrebase: wip gitattrs dealt with

17 months agogit-debrebase: remove an xxx
Ian Jackson [Fri, 10 Mar 2017 17:34:22 +0000 (17:34 +0000)]
git-debrebase: remove an xxx