chiark / gitweb /
dgit.git
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

17 months agogit-debrebase: wip
Ian Jackson [Fri, 10 Mar 2017 15:35:04 +0000 (15:35 +0000)]
git-debrebase: wip

17 months agogit-debrebase: wip comments
Ian Jackson [Fri, 10 Mar 2017 15:35:01 +0000 (15:35 +0000)]
git-debrebase: wip comments

17 months agogit-debrebase: wip notes
Ian Jackson [Fri, 10 Mar 2017 15:34:48 +0000 (15:34 +0000)]
git-debrebase: wip notes

17 months agogit-debrebase: wip notes
Ian Jackson [Wed, 22 Feb 2017 18:35:02 +0000 (18:35 +0000)]
git-debrebase: wip notes

17 months agogit-debrebase: capture breakwater tip
Ian Jackson [Thu, 9 Feb 2017 00:16:47 +0000 (00:16 +0000)]
git-debrebase: capture breakwater tip

17 months agogit-debrebase: avoid rewrite better
Ian Jackson [Thu, 9 Feb 2017 00:11:51 +0000 (00:11 +0000)]
git-debrebase: avoid rewrite better

17 months agogit-debrebase: avoid rewrite
Ian Jackson [Wed, 8 Feb 2017 23:59:44 +0000 (23:59 +0000)]
git-debrebase: avoid rewrite

17 months agogit-debrebase: WIP command line comments
Ian Jackson [Wed, 8 Feb 2017 23:33:06 +0000 (23:33 +0000)]
git-debrebase: WIP command line comments

17 months agogit-debrebase: WIP, new new-upstream
Ian Jackson [Mon, 6 Feb 2017 17:49:27 +0000 (17:49 +0000)]
git-debrebase: WIP, new new-upstream

17 months agogit-debrebase: git-debrebase WIP minimal executable ?
Ian Jackson [Sun, 5 Feb 2017 23:04:45 +0000 (23:04 +0000)]
git-debrebase: git-debrebase WIP minimal executable ?

17 months agogit-debrebase: WIP
Ian Jackson [Sun, 5 Feb 2017 21:39:29 +0000 (21:39 +0000)]
git-debrebase: WIP

17 months agogit-debrebase: WIP
Ian Jackson [Sat, 4 Feb 2017 14:27:00 +0000 (14:27 +0000)]
git-debrebase: WIP

17 months agogit-debrebase: WIP
Ian Jackson [Fri, 3 Feb 2017 21:48:13 +0000 (21:48 +0000)]
git-debrebase: WIP

17 months agogit-debrebase: WIP
Ian Jackson [Sun, 29 Jan 2017 21:59:35 +0000 (21:59 +0000)]
git-debrebase: WIP

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agogit-debrebase: WIP classification core done?
Ian Jackson [Sun, 29 Jan 2017 18:46:13 +0000 (18:46 +0000)]
git-debrebase: WIP classification core done?

17 months agogit-debrebase: WIP before reorgs?
Ian Jackson [Sat, 28 Jan 2017 08:57:08 +0000 (08:57 +0000)]
git-debrebase: WIP before reorgs?

17 months agogit-debrebase: Stub script to prove config handling works
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>
17 months agoDgit: provide $ffq_refprefix, for git-debrebase
Ian Jackson [Thu, 15 Feb 2018 13:54:03 +0000 (13:54 +0000)]
Dgit: provide $ffq_refprefix, for git-debrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agoDgit: provide $git_null_obj
Ian Jackson [Thu, 15 Feb 2018 13:53:53 +0000 (13:53 +0000)]
Dgit: provide $git_null_obj

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agodgit: In quilt_fixup_multipatch, work around git checkout paths
Ian Jackson [Sat, 10 Feb 2018 14:14:03 +0000 (14:14 +0000)]
dgit: In quilt_fixup_multipatch, work around git checkout paths

git checkout paths does not delete files.
This is a hypothetical bug AFAIAA.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agoDgit.pm: When checking that the tree is clean, check the git index too.
Ian Jackson [Thu, 15 Feb 2018 18:49:17 +0000 (18:49 +0000)]
Dgit.pm: When checking that the tree is clean, check the git index too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agoDgit.pm: break out git_check_unmodified from dgit
Ian Jackson [Thu, 15 Feb 2018 18:45:17 +0000 (18:45 +0000)]
Dgit.pm: break out git_check_unmodified from dgit

We (have to) use just "git" rather than @git, but this is OK I think.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agoDgit.pm, dgit: Break $extra_orig_namepart_re out into Dgit.pm.
Ian Jackson [Mon, 22 Jan 2018 17:09:50 +0000 (17:09 +0000)]
Dgit.pm, dgit: Break $extra_orig_namepart_re out into Dgit.pm.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agoDgit.pm: "confess" when we die due to a warning, rather than symply dieing.
Ian Jackson [Sun, 22 Oct 2017 19:26:55 +0000 (20:26 +0100)]
Dgit.pm: "confess" when we die due to a warning, rather than symply dieing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
17 months agoDgit.pm: Break out git_get_symref
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>
17 months agoDgit.pm: git_cat_file: Introduce $etype parameter
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>
17 months agoDgit.pm: Move $playground global to dgit.
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>
19 months agochangelog: start 4.5~
Ian Jackson [Mon, 23 Apr 2018 12:28:39 +0000 (13:28 +0100)]
changelog: start 4.5~

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
19 months agofinalise 4.4 archive/debian/4.4 debian/4.4
Ian Jackson [Mon, 23 Apr 2018 12:19:11 +0000 (13:19 +0100)]
finalise 4.4

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
19 months agotest suite: bugfix: Use full key hash rather than short keyid.
Ian Jackson [Mon, 23 Apr 2018 12:06:37 +0000 (13:06 +0100)]
test suite: bugfix: Use full key hash rather than short keyid.

Closes:#896653.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
22 months agochangelog: start 4.4
Ian Jackson [Thu, 25 Jan 2018 00:41:11 +0000 (00:41 +0000)]
changelog: start 4.4

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
22 months agochangelog: finalise 4.3 archive/debian/4.3 debian/4.3
Ian Jackson [Thu, 25 Jan 2018 00:34:08 +0000 (00:34 +0000)]
changelog: finalise 4.3

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
22 months agochangelog: mention #887850 fix
Ian Jackson [Wed, 24 Jan 2018 23:49:44 +0000 (23:49 +0000)]
changelog: mention #887850 fix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
22 months agodgit-maint-merge(7): debian/source/patch-header not in format 1.0
Sean Whitton [Sat, 20 Jan 2018 16:32:56 +0000 (09:32 -0700)]
dgit-maint-merge(7): debian/source/patch-header not in format 1.0

Suggested-by: Matthew Vernon <matthew@debian.org>
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
22 months agochangelog: mention #884646
Ian Jackson [Wed, 24 Jan 2018 23:47:12 +0000 (23:47 +0000)]
changelog: mention #884646

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
22 months agodgit(7): Discuss git-unrepresentable properties of source trees.
Ian Jackson [Wed, 24 Jan 2018 23:46:33 +0000 (23:46 +0000)]
dgit(7): Discuss git-unrepresentable properties of source trees.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
22 months agodgit(7): Discuss file executability.
Ian Jackson [Wed, 24 Jan 2018 23:45:57 +0000 (23:45 +0000)]
dgit(7): Discuss file executability.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
22 months agodgit: archive-api-query: Avoid crashing due to lack of $isuite
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>
22 months agochangelog: start 4.3
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>
22 months agochangelog: finalise 4.2 archive/debian/4.2 debian/4.2
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>
23 months agochangelog: Set distribution to unstable
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>
23 months agochangelog: Document using dpkg-source to build source packages
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>
23 months agochangelog: Entry for push-source subcommand
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>
23 months agotest suite: push-source: new tests
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>
23 months agotest suite: Add library function t-push-was-source-only
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>