chiark / gitweb /
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
Ian Jackson [Fri, 10 Mar 2017 15:35:04 +0000 (15:35 +0000)]
wip
Ian Jackson [Fri, 10 Mar 2017 15:35:01 +0000 (15:35 +0000)]
wip comments
Ian Jackson [Fri, 10 Mar 2017 15:34:48 +0000 (15:34 +0000)]
wip notes
Ian Jackson [Wed, 22 Feb 2017 18:35:02 +0000 (18:35 +0000)]
wip notes
Ian Jackson [Thu, 9 Feb 2017 00:16:47 +0000 (00:16 +0000)]
capture breakwater tip
Ian Jackson [Thu, 9 Feb 2017 00:11:51 +0000 (00:11 +0000)]
avoid rewrite better
Ian Jackson [Wed, 8 Feb 2017 23:59:44 +0000 (23:59 +0000)]
avoid rewrite
Ian Jackson [Wed, 8 Feb 2017 23:33:06 +0000 (23:33 +0000)]
WIP command line comments
Ian Jackson [Mon, 6 Feb 2017 17:49:27 +0000 (17:49 +0000)]
WIP, new new-upstream
Ian Jackson [Sun, 5 Feb 2017 23:04:45 +0000 (23:04 +0000)]
git-debrebase WIP minimal executable ?
Ian Jackson [Sun, 5 Feb 2017 21:39:29 +0000 (21:39 +0000)]
WIP
Ian Jackson [Sat, 4 Feb 2017 14:27:00 +0000 (14:27 +0000)]
WIP
Ian Jackson [Fri, 3 Feb 2017 21:48:13 +0000 (21:48 +0000)]
WIP
Ian Jackson [Fri, 3 Feb 2017 16:36:27 +0000 (16:36 +0000)]
WIP
Ian Jackson [Sun, 29 Jan 2017 21:59:35 +0000 (21:59 +0000)]
WIP
Ian Jackson [Sun, 29 Jan 2017 18:46:13 +0000 (18:46 +0000)]
WIP classification core done?
Ian Jackson [Sat, 28 Jan 2017 08:57:08 +0000 (08:57 +0000)]
WIP before reorgs?
Ian Jackson [Sun, 22 Oct 2017 19:26:55 +0000 (20:26 +0100)]
Dgit: "confess" when we die due to a warning, rather than symply dieing.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 25 Jan 2017 21:25:11 +0000 (21:25 +0000)]
git-debrebase: Stub script to prove config handling works
Tested with
PATH=$PWD:$PATH git -c wombat.foo.bar=23 -c wombat.foo.bar=37 debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 25 Aug 2017 19:57:41 +0000 (20:57 +0100)]
Dgit.pm: Break out git_get_symref
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Jul 2017 13:12:47 +0000 (14:12 +0100)]
Dgit.pm: git_cat_file: Introduce $etype parameter
No functional change for existing callers.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 24 Aug 2017 14:41:49 +0000 (15:41 +0100)]
Dgit.pm: Move $playground global to dgit.
It makes the interface to the playground functions confusing.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jan 2018 23:10:04 +0000 (23:10 +0000)]
dgit: archive-api-query: Avoid crashing due to lack of $isuite
Otherwise:
Use of uninitialized value $isuite in concatenation (.) or string at dgit line 705.
This breaks the infrastructure. Closes:#886592.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jan 2018 21:53:31 +0000 (21:53 +0000)]
changelog: start 4.3
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Jan 2018 21:49:55 +0000 (21:49 +0000)]
changelog: finalise 4.2
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Sun, 31 Dec 2017 21:07:48 +0000 (21:07 +0000)]
changelog: Set distribution to unstable
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Sean Whitton [Thu, 7 Dec 2017 18:04:04 +0000 (11:04 -0700)]
changelog: Document using dpkg-source to build source packages
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Mon, 13 Feb 2017 14:14:26 +0000 (07:14 -0700)]
changelog: Entry for push-source subcommand
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Sat, 4 Feb 2017 22:36:15 +0000 (15:36 -0700)]
test suite: push-source: new tests
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Sun, 12 Feb 2017 23:55:21 +0000 (16:55 -0700)]
test suite: Add library function t-push-was-source-only
No functional change.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Fri, 4 Aug 2017 13:47:16 +0000 (09:47 -0400)]
Update some copyright info
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / dgit.git / log