chiark / gitweb /
Ian Jackson [Wed, 31 Jan 2018 16:40:58 +0000 (16:40 +0000)]
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)]
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)]
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)]
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)]
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)]
whitespace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Jan 2018 15:12:54 +0000 (15:12 +0000)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
bugfix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Jan 2018 18:29:58 +0000 (18:29 +0000)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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)]
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 [Mon, 22 Jan 2018 17:09:50 +0000 (17:09 +0000)]
dgit, Dgit: Break $extra_orig_namepart_re out into Dgit.pm.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 25 Oct 2017 17:37:29 +0000 (18:37 +0100)]
launder: debug print why rewriting if out-of-order
Ian Jackson [Wed, 25 Oct 2017 17:33:36 +0000 (18:33 +0100)]
bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Oct 2017 19:30:09 +0000 (20:30 +0100)]
launder: print working tip too
Ian Jackson [Sun, 22 Oct 2017 19:29:58 +0000 (20:29 +0100)]
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)]
fix final diff check
Ian Jackson [Sun, 22 Oct 2017 19:29:23 +0000 (20:29 +0100)]
fix parents in generated commits (!)
Ian Jackson [Sun, 22 Oct 2017 19:29:04 +0000 (20:29 +0100)]
fix Mixed handling
Ian Jackson [Sun, 22 Oct 2017 19:28:54 +0000 (20:28 +0100)]
when dieing due to bad commit, print differs
Ian Jackson [Sun, 22 Oct 2017 19:28:40 +0000 (20:28 +0100)]
in classify, call get_differs with args in right oder
Ian Jackson [Sun, 22 Oct 2017 19:28:01 +0000 (20:28 +0100)]
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)]
call setup_sigwarn
Ian Jackson [Fri, 25 Aug 2017 19:58:19 +0000 (20:58 +0100)]
launder: fix
Ian Jackson [Fri, 25 Aug 2017 19:58:09 +0000 (20:58 +0100)]
introduce update_head_checkout
Ian Jackson [Fri, 25 Aug 2017 10:26:31 +0000 (11:26 +0100)]
downstream-rebase-launder-v0 first cut
Ian Jackson [Fri, 25 Aug 2017 10:11:08 +0000 (11:11 +0100)]
classificaton generates Changelog type
Ian Jackson [Fri, 25 Aug 2017 10:06:39 +0000 (11:06 +0100)]
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)]
classify: tolerate backwards breakwater merges
Ian Jackson [Fri, 25 Aug 2017 09:44:04 +0000 (10:44 +0100)]
classify: introduce $prevbrw (nfc)
Ian Jackson [Thu, 24 Aug 2017 14:55:19 +0000 (15:55 +0100)]
wip fixes for new no global $playground
Ian Jackson [Thu, 24 Aug 2017 14:24:07 +0000 (15:24 +0100)]
wip, before abolish Dgit.pm's global
Ian Jackson [Tue, 18 Jul 2017 20:44:46 +0000 (21:44 +0100)]
WIP FOUND
Ian Jackson [Fri, 14 Jul 2017 14:30:45 +0000 (15:30 +0100)]
fixes
Ian Jackson [Fri, 14 Jul 2017 14:30:36 +0000 (15:30 +0100)]
git-debrebase; get_commit: use new $etype
Ian Jackson [Fri, 14 Jul 2017 14:10:05 +0000 (15:10 +0100)]
fixes
Ian Jackson [Fri, 14 Jul 2017 11:23:31 +0000 (12:23 +0100)]
wip debug, fixes etc.
Ian Jackson [Fri, 14 Jul 2017 10:43:47 +0000 (11:43 +0100)]
wip fixes
Ian Jackson [Sun, 9 Jul 2017 13:55:37 +0000 (14:55 +0100)]
finish get_differs ?
Ian Jackson [Sun, 9 Jul 2017 13:37:10 +0000 (14:37 +0100)]
wip
Ian Jackson [Sun, 9 Jul 2017 13:04:27 +0000 (14:04 +0100)]
move --name-only
Ian Jackson [Sun, 9 Jul 2017 13:02:41 +0000 (14:02 +0100)]
allow opts
Ian Jackson [Sun, 9 Jul 2017 13:01:38 +0000 (14:01 +0100)]
avoid renames
Ian Jackson [Sun, 9 Jul 2017 12:47:30 +0000 (13:47 +0100)]
wip
Ian Jackson [Fri, 7 Jul 2017 10:49:22 +0000 (11:49 +0100)]
wip
Ian Jackson [Wed, 28 Jun 2017 12:40:52 +0000 (13:40 +0100)]
WIP FOUND
Ian Jackson [Wed, 21 Jun 2017 20:44:35 +0000 (21:44 +0100)]
rebase fixes
Ian Jackson [Wed, 21 Jun 2017 20:40:24 +0000 (21:40 +0100)]
rebase: go back to my $build
We never don't have exactly one parent
Ian Jackson [Wed, 14 Jun 2017 23:20:02 +0000 (00:20 +0100)]
fixes
Ian Jackson [Wed, 14 Jun 2017 23:18:12 +0000 (00:18 +0100)]
introduce build_start
Ian Jackson [Wed, 14 Jun 2017 23:14:29 +0000 (00:14 +0100)]
abolish recursion
Ian Jackson [Wed, 14 Jun 2017 22:39:29 +0000 (23:39 +0100)]
rewrite in brw_cl too
Ian Jackson [Wed, 14 Jun 2017 22:38:01 +0000 (23:38 +0100)]
rename @upp_cl @brw_cl $wantbrwonly
Ian Jackson [Wed, 14 Jun 2017 20:50:55 +0000 (21:50 +0100)]
wip
Ian Jackson [Mon, 5 Jun 2017 18:00:25 +0000 (19:00 +0100)]
wip rebase fixes
Ian Jackson [Mon, 5 Jun 2017 17:28:56 +0000 (18:28 +0100)]
wip found
Ian Jackson [Wed, 24 May 2017 17:26:09 +0000 (18:26 +0100)]
pseudocode typo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 May 2017 21:37:45 +0000 (22:37 +0100)]
wip, redoing origin handling
Ian Jackson [Sun, 14 May 2017 20:49:45 +0000 (21:49 +0100)]
wip import handling etc.
Ian Jackson [Fri, 28 Apr 2017 19:56:34 +0000 (20:56 +0100)]
fix README typo
Ian Jackson [Fri, 28 Apr 2017 19:52:43 +0000 (20:52 +0100)]
git-debrebase fixes
Ian Jackson [Fri, 28 Apr 2017 19:34:50 +0000 (20:34 +0100)]
git-debrebase fixes
Ian Jackson [Fri, 28 Apr 2017 19:30:55 +0000 (20:30 +0100)]
git-debrebase fixes
Ian Jackson [Fri, 28 Apr 2017 17:47:41 +0000 (18:47 +0100)]
sort out report, and walk, allegedly
Ian Jackson [Fri, 28 Apr 2017 16:43:17 +0000 (17:43 +0100)]
abolish $pseudos_must_overwrite_this
Ian Jackson [Fri, 28 Apr 2017 16:42:20 +0000 (17:42 +0100)]
spelling
Ian Jackson [Fri, 28 Apr 2017 16:41:38 +0000 (17:41 +0100)]
wip pseudomerge handling
Ian Jackson [Fri, 28 Apr 2017 13:13:37 +0000 (14:13 +0100)]
wip found
Ian Jackson [Wed, 5 Apr 2017 20:46:27 +0000 (21:46 +0100)]
wip
Ian Jackson [Wed, 5 Apr 2017 17:20:03 +0000 (18:20 +0100)]
abolish abbrev thing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 5 Apr 2017 17:14:24 +0000 (18:14 +0100)]
found
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 31 Mar 2017 18:04:13 +0000 (19:04 +0100)]
README.git-debrebase: diagrams of how to handle imports
Ian Jackson [Fri, 31 Mar 2017 17:33:06 +0000 (18:33 +0100)]
README tidy up
Ian Jackson [Fri, 31 Mar 2017 17:24:56 +0000 (18:24 +0100)]
README.git-debrebase: both emails
Ian Jackson [Fri, 31 Mar 2017 17:23:18 +0000 (18:23 +0100)]
wip: README
Ian Jackson [Fri, 31 Mar 2017 17:23:10 +0000 (18:23 +0100)]
wip
Ian Jackson [Fri, 31 Mar 2017 15:07:17 +0000 (16:07 +0100)]
wip, found
Ian Jackson [Fri, 10 Mar 2017 18:03:47 +0000 (18:03 +0000)]
wip, launder rm patches
Ian Jackson [Fri, 10 Mar 2017 17:51:08 +0000 (17:51 +0000)]
wip gitattrs dealt with
Ian Jackson [Fri, 10 Mar 2017 17:34:22 +0000 (17:34 +0000)]
remove an xxx
~ianmdlvl / dgit.git / log