From 73bf85dea847399dff4ebc147a9b3a3274d51951 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 25 Jan 2018 00:41:11 +0000 Subject: changelog: start 4.4 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 62093d5..eb11dc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (4.4~) unstable; urgency=low + + * + + -- + dgit (4.3) unstable; urgency=high Documentation improvements: -- cgit v1.2.3 From d09a683738804378dcb311d72476a62d09121a26 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 23 Apr 2018 13:06:37 +0100 Subject: test suite: bugfix: Use full key hash rather than short keyid. Closes:#896653. Signed-off-by: Ian Jackson --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eb11dc4..9a050ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (4.4~) unstable; urgency=low - * + Test suite bugfix: + * Use full key hash rather than short keyid. Closes:#896653. + [ report: Paul Gevers; fix: Chris Lamb ] -- -- cgit v1.2.3 From 1ca18c8e1414f44d919a0c22492ecc6fd103cdd6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 23 Apr 2018 13:19:11 +0100 Subject: finalise 4.4 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9a050ef..8c2cf4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -dgit (4.4~) unstable; urgency=low +dgit (4.4) unstable; urgency=high Test suite bugfix: * Use full key hash rather than short keyid. Closes:#896653. [ report: Paul Gevers; fix: Chris Lamb ] - -- + -- Ian Jackson Mon, 23 Apr 2018 13:18:51 +0100 dgit (4.3) unstable; urgency=high -- cgit v1.2.3 From 3e9cb86bb654846019aedc74db306934aabb4f93 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 23 Apr 2018 13:28:39 +0100 Subject: changelog: start 4.5~ Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8c2cf4c..ee9c4a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (4.5~) unstable; urgency=medium + + * + + -- + dgit (4.4) unstable; urgency=high Test suite bugfix: -- cgit v1.2.3 From 54a18d290527b6aa515592d27f90f35187757e8c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 24 Aug 2017 15:41:49 +0100 Subject: Dgit.pm: Move $playground global to dgit. It makes the interface to the playground functions confusing. No functional change. Signed-off-by: Ian Jackson --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee9c4a3..464a433 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dgit (4.5~) unstable; urgency=medium - * + Internal changes: + * Move $playground global to dgit. -- -- cgit v1.2.3 From 7ae49acddbd78c5e446f9e1fc5b02ef7d09ae925 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 25 Aug 2017 20:57:41 +0100 Subject: Dgit.pm: Break out git_get_symref Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 464a433..62d8eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dgit (4.5~) unstable; urgency=medium Internal changes: * Move $playground global to dgit. + * Break git_get_symref out into Dgit.pm. -- -- cgit v1.2.3 From 012a80b3779e6241c270b73771f1d5019c1ca196 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Oct 2017 20:26:55 +0100 Subject: Dgit.pm: "confess" when we die due to a warning, rather than symply dieing. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 62d8eed..8d830f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ dgit (4.5~) unstable; urgency=medium + Minor fixes: + * "confess" when we die due to a warning, rather than symply dieing. + Internal changes: * Move $playground global to dgit. * Break git_get_symref out into Dgit.pm. -- cgit v1.2.3 From 942637ea633f1c9dc0be2534a660296a76b87e27 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 22 Jan 2018 17:09:50 +0000 Subject: Dgit.pm, dgit: Break $extra_orig_namepart_re out into Dgit.pm. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8d830f0..e413454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ dgit (4.5~) unstable; urgency=medium Internal changes: * Move $playground global to dgit. - * Break git_get_symref out into Dgit.pm. + * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm. -- -- cgit v1.2.3 From d371437104d5a7a4ec623a2e0be716063c7dde92 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Feb 2018 18:49:17 +0000 Subject: Dgit.pm: When checking that the tree is clean, check the git index too. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e413454..91dd7c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ dgit (4.5~) unstable; urgency=medium + Bugfixes: + * When checking that the tree is clean, check the git index too. + Minor fixes: * "confess" when we die due to a warning, rather than symply dieing. -- cgit v1.2.3 From 384c846711061bebb4cda6567553bc0f910a69cf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Feb 2018 14:14:03 +0000 Subject: 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 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 91dd7c4..a340413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ dgit (4.5~) unstable; urgency=medium Bugfixes: * When checking that the tree is clean, check the git index too. + * In quilt_fixup_multipatch, work around git checkout paths + not deleting files. (Hypothetical bug AFAIAA.) Minor fixes: * "confess" when we die due to a warning, rather than symply dieing. -- cgit v1.2.3 From 32264794f3d4b03366998e469cdb42ddeb979a5a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Feb 2018 15:35:28 +0000 Subject: debian/control, git-debrebase: "use fnmatch;" We are going to want this for globbing in the ffq configuration. Signed-off-by: Ian Jackson --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 4405e14..3180c85 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev, libdigest-sha-perl, dput, curl, apt, libjson-perl, ca-certificates, libtext-iconv-perl, libtext-glob-perl -Recommends: ssh-client +Recommends: ssh-client, libfile-fnmatch-perl Suggests: sbuild Architecture: all Description: git interoperability with the Debian archive -- cgit v1.2.3 From d7c6dd14d94b5bcf12e4c4db72a5d4151825df09 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Feb 2018 19:20:24 +0000 Subject: test suite: gdr-edits: wip new test Signed-off-by: Ian Jackson --- debian/tests/control | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index f3d20f1..d0bad8b 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,6 +16,10 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only +Tests: gdr-edits +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl + Tests: gitattributes Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bsdgames, man-db, git-man -- cgit v1.2.3 From c53c58baf0425eaa76826725264dc909b46a4f7c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Feb 2018 15:48:06 +0000 Subject: git-debrebase: test suite: gdr-import-dgit: wip Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index d0bad8b..891c0c8 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-edits +Tests: gdr-edits gdr-import-dgit Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl -- cgit v1.2.3 From e26989680f3c7f3f219e799c3a64f1e4ee3808ee Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 19:23:58 +0000 Subject: git-debrebase: test suite: gdr-*: use faketime to control dch dates This means that the dgit- and gdr-generated commits with dates from changelogs are all adjusted. This makes the gitk in the gdr tests look more like a real one would, so we can see if it's pretty. (It also makes it easier to debug the tests.) Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index 891c0c8..05ea2db 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -18,7 +18,7 @@ Restrictions: x-dgit-intree-only x-dgit-git-only Tests: gdr-edits gdr-import-dgit Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime Tests: gitattributes Tests-Directory: tests/tests -- cgit v1.2.3 From d2a8f79a151407a01b1bf82bf84c44657a12c7ef Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 20:44:53 +0000 Subject: git-debrebase: test suite: gdr-viagit: new test Have verified with this: diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit index 55fe4d74..20576c23 100755 --- a/tests/tests/gdr-viagit +++ b/tests/tests/gdr-viagit @@ -17,6 +17,7 @@ git-debrebase) ;; cat <<'END' >$st #!/bin/sh set -x +export GIT_DIR=$PWD/`git-rev-parse --git-dir` exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@" END chmod +x $st that this would indeed spot at least some problems. Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index 05ea2db..b324377 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-edits gdr-import-dgit +Tests: gdr-edits gdr-import-dgit gdr-viagit Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime -- cgit v1.2.3 From 8059e776674823de7201dd917569034287249d3c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 22:19:49 +0000 Subject: git-debrebase: test suite: gdr-diverge-nmu: new test, not complete yet Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index b324377..9cfd823 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-edits gdr-import-dgit gdr-viagit +Tests: gdr-diverge-nmu gdr-edits gdr-import-dgit gdr-viagit Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime -- cgit v1.2.3 From 70e4369aa8239f967f89d0972e964b8dc9b2e3b5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 23:30:24 +0000 Subject: git-debrebase: test suite: gdr-diverge-nmu-dgit: new test Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index 9cfd823..c758c31 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-diverge-nmu gdr-edits gdr-import-dgit gdr-viagit +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-viagit Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime -- cgit v1.2.3 From 019f49c1c81145e61b1e066efe937e93e64fee7d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Feb 2018 14:15:03 +0000 Subject: git-debrebase: test suite: gdr-newupstream-v0: new test Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index c758c31..ff8ae85 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-viagit +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-newupstream-v0 gdr-viagit Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime -- cgit v1.2.3 From dc6bcd256e972c2bc8a65e077c27ed57745c76eb Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Apr 2018 22:14:55 +0100 Subject: git-debrebase: test suite: New test for subcommands Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index ff8ae85..ee9b7d7 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-newupstream-v0 gdr-viagit +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-newupstream-v0 gdr-subcommands gdr-viagit Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime -- cgit v1.2.3 From 15406403f564b23f44124fd6cad61cf143ce2f84 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 16 Jun 2018 13:47:26 +0100 Subject: exit status: Document in changelog. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a340413..b6c60f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (4.5~) unstable; urgency=medium Bugfixes: + * Fix the exit status of programs in dgit.deb, to avoid the + Perl misfeature which sometimes copies $! to the exit status. * When checking that the tree is clean, check the git index too. * In quilt_fixup_multipatch, work around git checkout paths not deleting files. (Hypothetical bug AFAIAA.) -- cgit v1.2.3 From bc95a2402f9e765113ef38d12d642a3340132049 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 23 Apr 2018 01:16:06 +0100 Subject: dgit: Bail if single-debian-patch needs committing with --quilt=nofix Also, if the user invokes dgit push with uncommitted debian/patches/. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b6c60f7..b0fbb92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dgit (4.5~) unstable; urgency=medium * When checking that the tree is clean, check the git index too. * In quilt_fixup_multipatch, work around git checkout paths not deleting files. (Hypothetical bug AFAIAA.) + * Respect --quilt=nofix even if single-debian-patch. Minor fixes: * "confess" when we die due to a warning, rather than symply dieing. -- cgit v1.2.3 From 11f0fbcd7d0697ac075931a4f86d83f2fc944cf7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 13:30:08 +0100 Subject: changelog: Document gdr, and bump to 5.0~ Signed-off-by: Ian Jackson --- debian/changelog | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b0fbb92..f5a4025 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,25 @@ -dgit (4.5~) unstable; urgency=medium +dgit (5.0~) unstable; urgency=low - Bugfixes: - * Fix the exit status of programs in dgit.deb, to avoid the - Perl misfeature which sometimes copies $! to the exit status. + Major new utility: + * git-debrebase, a new git workflow tool. + * dgit will now, when appropriate, check if it should call + git-debrebase. + + dgit bugfixes: + * Fix the exit status of programs in dgit.deb, to avoid the Perl + misfeature which sometimes copies $! to the exit status. * When checking that the tree is clean, check the git index too. * In quilt_fixup_multipatch, work around git checkout paths not deleting files. (Hypothetical bug AFAIAA.) * Respect --quilt=nofix even if single-debian-patch. - Minor fixes: + dgit minor fixes: * "confess" when we die due to a warning, rather than symply dieing. Internal changes: * Move $playground global to dgit. * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm. + * Changes to support git-debrebase. -- -- cgit v1.2.3 From 4eb11e3174340e9f7d4433343634ba41ec72d85b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 15:44:49 +0100 Subject: debian/rules: Refactor dgit-infrastructure perl arrangements We are going to want to do this for another package too. Signed-off-by: Ian Jackson --- debian/rules | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 9249f88..e51f893 100755 --- a/debian/rules +++ b/debian/rules @@ -31,25 +31,30 @@ override_dh_gencontrol: perl -i -pe "s/UNRELEASED/$$v/g if m/###substituted###/" usr/bin/dgit globalperl=/usr/share/perl5 -infraperl=/usr/share/dgit/infra/perl5 -override_dh_auto_install: +override_dh_auto_install: specpkg_install_infra make install prefix=/usr DESTDIR=debian/dgit - make install-infra prefix=/usr DESTDIR=debian/dgit-infrastructure \ - perldir=$(infraperl) -# # Most of the Perl modules in dgit-infrastructure live in -# # $(infraperl). The exception is Debian::Dgit::Infra, which -# # lives in $(globalperl) and adds $(infraperl) to @INC. + +specpkg_install_infra: p=dgit-infrastructure +specpkg_install_infra: pm=Infra + +specpkg_install_%: tok=$* +specpkg_install_%: specperl=/usr/share/dgit/$(tok)/perl5 +specpkg_install_%: + make install-$(tok) prefix=/usr DESTDIR=debian/$(p) perldir=$(specperl) +# # Most of the Perl modules in this package live in +# # $(specperl). The exception is Debian::Dgit::Infra, which +# # lives in $(globalperl) and adds $(specperl) to @INC. set -ex; \ - base=debian/dgit-infrastructure; \ - mod=Debian/Dgit/Infra.pm; \ - src=$${base}$(infraperl)/$${mod}; \ + base=debian/$(p); \ + mod=Debian/Dgit/$(pm).pm; \ + src=$${base}$(specperl)/$${mod}; \ dst=$${base}$(globalperl)/$${mod}; \ mkdir -p $${dst%/*}; \ mv -f $$src $$dst; \ perl -i -p -e 'next unless m/###substituted###/;' \ -e 'next unless s/^# (?=unshift \@INC,)//;' \ - -e 'die unless s{q\{\S+\}}{q{$(infraperl)}};' \ + -e 'die unless s{q\{\S+\}}{q{$(specperl)}};' \ $$dst debian/tests/control: tests/enumerate-tests debian/tests/control.in -- cgit v1.2.3 From 5eb634cbbf0b0a9281c7ded077990fbd9ec81235 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 16:18:20 +0100 Subject: test suite: enumerate-tests: Refactor dependencies, support NO-DEFAULT This will allow more flexibility in a moment. No users of NO-DEFAULT yet, and no functional change. Signed-off-by: Ian Jackson --- debian/tests/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control.in b/debian/tests/control.in index 960d3ef..b558a25 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -1,2 +1,2 @@ Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin +Depends: -- cgit v1.2.3 From 93c90551df21fc7df60ade835e29bdbe91f65744 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 15:18:55 +0100 Subject: git-debrebase: Split into its own package * Provide and use Debian::Dgit::GDR which does the same for @INC as Debian::Dgit:Infra, only for GDR. It's not *entirely* similar as its doc comment talks about ExitStatus too. * In Makefile, split off lots of GDR_* variables and the two targets install-gdr and installdirs-gdr We take no care that only the required manpages are built for each install target; instead, they all go in MANPAGES and `all'. * Add a control file stanza. git-debrebase takes over the dependenc on libfile-fnmatch-perl. We Recommend dgit and gbp. (Even though if you're working with neither the Debian archive nor `3.0 (quilt)', you need neither.) * In rules, add specpkg_install_gdr, to run the Makefile machinery. * In the test dependencies, GDR now means to ask for git-debrebase and also git-buildpackage (for make-patches). libfile-fnmatch-perl is handled via the dependencies of git-debrebase.deb. * Add a .gitignore for the staging area in debian/ Signed-off-by: Ian Jackson --- debian/control | 11 ++++++++++- debian/rules | 5 ++++- debian/tests/control | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3180c85..224e52a 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev, libdigest-sha-perl, dput, curl, apt, libjson-perl, ca-certificates, libtext-iconv-perl, libtext-glob-perl -Recommends: ssh-client, libfile-fnmatch-perl +Recommends: ssh-client Suggests: sbuild Architecture: all Description: git interoperability with the Debian archive @@ -26,6 +26,15 @@ Description: git interoperability with the Debian archive . dgit clone and dgit fetch construct git commits from uploads. +Package: git-debrebase +Depends: perl, git-core, libdpkg-perl, libfile-fnmatch-perl + ${misc:Depends} +Recommends: dgit, git-buildpackage +Architecture: all +Description: rebasing git workflow tool for Debian packaging + git-debrebase is a tool for representing in git, and manpulating, + Debian packages based on upstream source code. + Package: dgit-infrastructure Depends: ${misc:Depends}, perl, git-core, gpgv, chiark-utils-bin, libjson-perl, libdigest-sha-perl, libdbd-sqlite3-perl, sqlite3, diff --git a/debian/rules b/debian/rules index e51f893..baff8f8 100755 --- a/debian/rules +++ b/debian/rules @@ -32,9 +32,12 @@ override_dh_gencontrol: globalperl=/usr/share/perl5 -override_dh_auto_install: specpkg_install_infra +override_dh_auto_install: specpkg_install_gdr specpkg_install_infra make install prefix=/usr DESTDIR=debian/dgit +specpkg_install_gdr: p=git-debrebase +specpkg_install_gdr: pm=GDR + specpkg_install_infra: p=dgit-infrastructure specpkg_install_infra: pm=Infra diff --git a/debian/tests/control b/debian/tests/control index ee9b7d7..a72f1b8 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -18,7 +18,7 @@ Restrictions: x-dgit-intree-only x-dgit-git-only Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-newupstream-v0 gdr-subcommands gdr-viagit Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime Tests: gitattributes Tests-Directory: tests/tests -- cgit v1.2.3 From 13c1ffa10ca71511f1419372f07ef8c180b5aea4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 16:37:33 +0100 Subject: test suite: git-debrebase: Do some tests without dgit installed We provide a new psuedo-dependency NO-DGIT which throws away the usual default dependency list. We abolish NO-DEFAULT which could not be useful because the tests pretty much all depend on setup/gnupg which (currently, as a workaround for the gnupg2 races) requires chiark-utils-bin for with-lock-ex. There are two tests which don't actually need any interaction with the archive. Mark them accordingly. Signed-off-by: Ian Jackson --- debian/tests/control | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index a72f1b8..dcc40a7 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,10 +16,14 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-newupstream-v0 gdr-subcommands gdr-viagit +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-subcommands Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime +Tests: gdr-newupstream-v0 gdr-viagit +Tests-Directory: tests/tests +Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime + Tests: gitattributes Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bsdgames, man-db, git-man -- cgit v1.2.3 From 39ae9e0589506313a69abf7a85155085b1d1147b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 23:24:22 +0100 Subject: test suite: git-debrebase: Rename gdr-newupstream-v0 test Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index dcc40a7..595ee3f 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -20,7 +20,7 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-subcom Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime -Tests: gdr-newupstream-v0 gdr-viagit +Tests: gdr-newupstream gdr-viagit Tests-Directory: tests/tests Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime -- cgit v1.2.3 From 4a22b5da07de69c0b911784c8d51e98cef65a408 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 23:31:34 +0100 Subject: changelog: finalise 5.0 Signed-off-by: Ian Jackson --- debian/changelog | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f5a4025..52c4217 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ -dgit (5.0~) unstable; urgency=low +dgit (5.0) unstable; urgency=low - Major new utility: - * git-debrebase, a new git workflow tool. + Major new facility: + * git-debrebase, a new git workflow tool, in its own package. * dgit will now, when appropriate, check if it should call git-debrebase. + [ Thanks to Sean Whitton for much useful input, and for + dgit-maint-debrebase(7). ] + dgit bugfixes: * Fix the exit status of programs in dgit.deb, to avoid the Perl misfeature which sometimes copies $! to the exit status. @@ -21,7 +24,7 @@ dgit (5.0~) unstable; urgency=low * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm. * Changes to support git-debrebase. - -- + -- Ian Jackson Mon, 18 Jun 2018 00:29:44 +0100 dgit (4.4) unstable; urgency=high -- cgit v1.2.3 From 91fba49d952871ad085bbc6980cfb8c9c82f4fab Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 18 Jun 2018 00:34:29 +0100 Subject: changelog: start 5.1~ Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 52c4217..c49a0ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (5.1~) unstable; urgency=medium + + * + + -- + dgit (5.0) unstable; urgency=low Major new facility: -- cgit v1.2.3 From da6f19f4f54e84723e9d1435bcfd4f7db8e55986 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 18 Jun 2018 01:41:53 +0100 Subject: git-debrebase manpages: Fix typos and etc. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c49a0ab..a70ec38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (5.1~) unstable; urgency=medium - * + * git-debrebase manpages: Fix typos and etc. -- -- cgit v1.2.3 From 8417abd83a6d2659bd556476ddee0a232d579eca Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 19 Jun 2018 17:02:27 +0100 Subject: git-debrebase: new-upstream: fix ff check handling of multi-piece upstreams Multi-piece combine commits may have n or n+1 parents, depending on whether the previous new-upstream invocation was snag-free. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a70ec38..fc7aebb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (5.1~) unstable; urgency=medium * git-debrebase manpages: Fix typos and etc. + * git-debrebase: new-upstream: fix (this time for sure) ff check + handling of multi-piece upstreams. -- -- cgit v1.2.3 From 26efd7f35ef83d9bf28755a839e2ed9cb414afb6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 14:29:09 +0100 Subject: control file: Fix a typo in the git-debrebase description Signed-off-by: Ian Jackson --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 224e52a..42f68f6 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Depends: perl, git-core, libdpkg-perl, libfile-fnmatch-perl Recommends: dgit, git-buildpackage Architecture: all Description: rebasing git workflow tool for Debian packaging - git-debrebase is a tool for representing in git, and manpulating, + git-debrebase is a tool for representing in git, and manipulating, Debian packages based on upstream source code. Package: dgit-infrastructure -- cgit v1.2.3 From 9f4a5f045e36edddb3ffd23667a52f4ee319c675 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 18 Jun 2018 12:00:57 +0100 Subject: test suite: Trigger on indirect dependencies As discussed on debian-ci. Bug report to request documentation for this in the autopkgtest spec is TBD. Signed-off-by: Ian Jackson --- debian/tests/control | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index 595ee3f..1da95fa 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -28,6 +28,11 @@ Tests: gitattributes Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bsdgames, man-db, git-man +Tests: hint-testsuite-triggers +Tests-Directory: tests/tests +Depends: gnupg, patch, diffutils +Restrictions: hint-testsuite-triggers + Tests: defdistro-mirror mirror mirror-debnewgit mirror-private Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, rsync -- cgit v1.2.3 From 53389b4ddc2d290f83e439fe36081e2d3e8d4b4c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 16:35:20 +0100 Subject: git-debrebase: suppress gbp pq export output Except in case of error. Closes:#901809. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fc7aebb..c49b783 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dgit (5.1~) unstable; urgency=medium * git-debrebase manpages: Fix typos and etc. * git-debrebase: new-upstream: fix (this time for sure) ff check handling of multi-piece upstreams. + * git-debrebase: suppress gbp pq export output, except in + case of error. Closes:#901809. -- -- cgit v1.2.3 From fd7c08fe358f93a822974ea64ff012ae0ee3ca25 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 16:47:41 +0100 Subject: changelog: document changes so far Signed-off-by: Ian Jackson --- debian/changelog | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c49b783..0dfe7b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,22 @@ dgit (5.1~) unstable; urgency=medium - * git-debrebase manpages: Fix typos and etc. - * git-debrebase: new-upstream: fix (this time for sure) ff check - handling of multi-piece upstreams. - * git-debrebase: suppress gbp pq export output, except in - case of error. Closes:#901809. + dgit gitattributes handling: + * Squash the working-tree-encoding attribute too. + * Update an existing `dgit-defuse-attrs' macro in .git/info/attributes. + * Test the working-tree-encoding attribute squashing properly. + Closes:#901900. + + git-debrebase fixes: + * new-upstream: fix (this time for sure) ff check handling + of multi-piece upstreams. + * Suppress gbp pq export output, except in case of error. + Closes:#901809. + * Manpages: Fix typos and etc. + * Fix a typo in the package description. + + Test suite: + * Triger ci.debian.net autopkgtests on: gnupg diffutils patch. + (A dummy test is used to add to Testsuite-Triggers.) -- -- cgit v1.2.3 From 3a05780783d8c93088ec43d850f2fd46fae49d2c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 23:21:40 +0100 Subject: changelog: finalise 5.1 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0dfe7b1..ad1fb8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (5.1~) unstable; urgency=medium +dgit (5.1) unstable; urgency=medium dgit gitattributes handling: * Squash the working-tree-encoding attribute too. @@ -18,7 +18,7 @@ dgit (5.1~) unstable; urgency=medium * Triger ci.debian.net autopkgtests on: gnupg diffutils patch. (A dummy test is used to add to Testsuite-Triggers.) - -- + -- Ian Jackson Wed, 20 Jun 2018 23:20:57 +0100 dgit (5.0) unstable; urgency=low -- cgit v1.2.3 From a33bd8086c3de3b6ec61fe65aefab59243b58cf7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 23:51:04 +0100 Subject: changelog: start 5.2~ Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ad1fb8e..b4bdce5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (5.2~) unstable; urgency=medium + + * + + -- + dgit (5.1) unstable; urgency=medium dgit gitattributes handling: -- cgit v1.2.3 From 10d3925a7aebac484e09aa2d636ceae1cbffeb10 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 18:29:36 +0100 Subject: dgit(1): Mention under `dgit build' that it uses the network. Part of the fix for #883340. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b4bdce5..4be989d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (5.2~) unstable; urgency=medium - * + * dgit(1): Mention under `dgit build' that it uses the network. -- -- cgit v1.2.3 From 831a6e07cc5599fdd616dc1eddbabb6d6b5a87a9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 18:30:50 +0100 Subject: dgit build: Better message when network is offline. When build fails because the archive access fails, mention that this was tried because --since-version was not specified. Closes:#883340. Signed-off-by: Ian Jackson --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4be989d..68ec24e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ dgit (5.2~) unstable; urgency=medium * dgit(1): Mention under `dgit build' that it uses the network. + dgit: + * When build fails because the network is offline, mention + that this is because --since-version was not specified. + Closes:#883340. + -- dgit (5.1) unstable; urgency=medium -- cgit v1.2.3 From bb9383075fe99dc1a7cb30282f7ae46a967f6e63 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 20 Jun 2018 23:47:54 +0100 Subject: dgit: commit_quilty_patch: Handle other file statuses too In particular, R can occur if all Debian changes have been removed in a package with single-debian-patch, in which case we would fail to commit the patch queue removal. I don't think dpkg-source will remove files in other cases, so this is probably the only actually buggy case. I don't think the other letters are particularly likely but if they occur they should be committed too. I have deliberately excluded U which should definitely not occur. Closes:#893263. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 68ec24e..da73430 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dgit (5.2~) unstable; urgency=medium * dgit(1): Mention under `dgit build' that it uses the network. dgit: + * When all Debian changes vanish with single-debian-patch, + do not fail to commit the patch queue removal. Closes:#877036. * When build fails because the network is offline, mention that this is because --since-version was not specified. Closes:#883340. -- cgit v1.2.3 From 1dd14bbf4f9cb4b6e973aa2813070c0847d71c31 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 00:34:03 +0100 Subject: dgit: Improve message for discrepant quilt fixup When quilt fixup fails because of discrepancies, print a git diff rune which will show them. Closes:#865446. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da73430..3216e4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ dgit (5.2~) unstable; urgency=medium * When build fails because the network is offline, mention that this is because --since-version was not specified. Closes:#883340. + * When quilt fixup fails because of discrepancies, print a + git diff rune which will show them. Closes:#865446. -- -- cgit v1.2.3 From 1967603885cd0fe76230fdfa9c026238da6c12a9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 01:00:41 +0100 Subject: dgit: Non-noop git fetch is not available with --dry-run, so fail When fetch or push wants git fetch (other than in a situation where it happes to be a noop) but --dry-run was specified, we would loop with a false coplaint about git fetch. False, because we didn't actually run git fetch so of course it didn't do anything. Instead, fail with an explanation. Closes:#871317. This does not occur, and we do not fail, if git-fetch would be a no-op. We can tell when this is the case, because we use git-ls-remote too. This leads to one suggestion for a workaround for the user, which is to do a not --dry-run fetch first. Signed-off-by: Ian Jackson --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3216e4a..2c30556 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,10 @@ dgit (5.2~) unstable; urgency=medium Closes:#883340. * When quilt fixup fails because of discrepancies, print a git diff rune which will show them. Closes:#865446. + * When fetch or push wants git fetch (other than in a situation where it + happes to be a noop) but --dry-run was specified, fail with an + explanation, rather than looping with a false coplaint about git + fetch. Closes:#871317. -- -- cgit v1.2.3 From c0df25cd65b0172d5130e01a73aa610c3b0dd105 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 01:10:38 +0100 Subject: test suite: Use nproc(1) rather than Sys::CPU. This is more portable and does not depend on libsys-cpu-perl being installed. Closes:888496. Signed-off-by: Ian Jackson --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2c30556..b34b4a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ dgit (5.2~) unstable; urgency=medium explanation, rather than looping with a false coplaint about git fetch. Closes:#871317. + test suite: + * Use nproc(1) rather than Sys::CPU. This is more portable and does not + depend on libsys-cpu-perl being installed. Closes:888496. + -- dgit (5.1) unstable; urgency=medium -- cgit v1.2.3 From c4a96d7a9ed9f83abed11a84f7fe068e27dee2b1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 01:20:01 +0100 Subject: dgit: --overwrite now no longer crashes if there is no $archive_hash Ie there is nothing to overwrite (eg, when used with --new). Instead, it is simply ignored, as it is ignored in situations where the push is fast forward. Closes:#863576. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b34b4a0..437bd53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ dgit (5.2~) unstable; urgency=medium happes to be a noop) but --dry-run was specified, fail with an explanation, rather than looping with a false coplaint about git fetch. Closes:#871317. + * --overwrite now no longer crashes if there is nothing to overwrite + (eg, when used with --new). Instead, it is simply ignored, as it is + ignored in situations where the push is fast forward. Closes:#863576. test suite: * Use nproc(1) rather than Sys::CPU. This is more portable and does not -- cgit v1.2.3 From 00c7c161dc66c4db4645b2cfd90d810a17a08f46 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 01:22:24 +0100 Subject: dgit(1): Clarify that --overwrite does nothing if not needed. Closes:#863578. Related to #863576 too. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 437bd53..df25a84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (5.2~) unstable; urgency=medium * dgit(1): Mention under `dgit build' that it uses the network. + * dgit(1): Clarify that --overwrite does nothing if not needed. + Closes:#863578. dgit: * When all Debian changes vanish with single-debian-patch, -- cgit v1.2.3 From 905125d5dcfe02f8dd0aa7fb411765f09b545b0c Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 21 Jun 2018 13:27:41 +0100 Subject: dgit-user(7): Suggest sbuild-debian-developer-setup(1) This will only create the chroot for building packages for the machine's architecture, because sbuild-debian-developer-setup(1) does not have an --architecture option, so sbuild-createchroot(1) will be needed too, hence the 'and'. The nice thing about sbuild-debian-developer-setup(1) is that does fiddly things that a non-expert might forget about, like adding the current user to the sbuild group. So it is still worth recommending even though it does not have an --architecture option. Closes:#895779. Signed-off-by: Sean Whitton --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index df25a84..2bd9883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dgit (5.2~) unstable; urgency=medium * dgit(1): Mention under `dgit build' that it uses the network. * dgit(1): Clarify that --overwrite does nothing if not needed. Closes:#863578. + * dgit-user(7): Recommend sbuild-debian-developer-setup. + [ Sean Whitton. ] Closes:895779. dgit: * When all Debian changes vanish with single-debian-patch, -- cgit v1.2.3 From 7882b0f7e4eb0d54d51e11a1bc9fb9c510896f5a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 14:05:26 +0100 Subject: dgit: Provide `update-vcs-git' subcommand This is for creating and adjusting the vcs-git remote url. Useful for transition from alioth to salsa. Closes:#902006. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2bd9883..6bc6173 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ dgit (5.2~) unstable; urgency=medium * --overwrite now no longer crashes if there is nothing to overwrite (eg, when used with --new). Instead, it is simply ignored, as it is ignored in situations where the push is fast forward. Closes:#863576. + * Provide `update-vcs-git' subcommand, for creating and adjusting the + vcs-git remote url. Useful for transition from alioth to salsa. + Closes:#902006. test suite: * Use nproc(1) rather than Sys::CPU. This is more portable and does not -- cgit v1.2.3 From 6be5332d24efc7a21c9b5c57ad30193badb16ff2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 14:11:10 +0100 Subject: dgit: warn if vcs-git seems out of date Print a warning to stderr on `dgit fetch sid', if your vcs-git remote url disagrees with what's in sid's .dsc. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6bc6173..2efcc9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ dgit (5.2~) unstable; urgency=medium * Provide `update-vcs-git' subcommand, for creating and adjusting the vcs-git remote url. Useful for transition from alioth to salsa. Closes:#902006. + * Print a warning to stderr on `dgit fetch sid', if your vcs-git + remote url disagrees with what's in sid's .dsc. test suite: * Use nproc(1) rather than Sys::CPU. This is more portable and does not -- cgit v1.2.3 From 3405b073420845d4e72202577537e013d91abd25 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 22 Jun 2018 16:48:05 +0100 Subject: dgit: git-debrebase interop: Add a missing debugcmd debugging print. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2efcc9c..8f093d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ dgit (5.2~) unstable; urgency=medium Closes:#902006. * Print a warning to stderr on `dgit fetch sid', if your vcs-git remote url disagrees with what's in sid's .dsc. + * git-debrebase interop: Add a missing debugcmd debugging print. test suite: * Use nproc(1) rather than Sys::CPU. This is more portable and does not -- cgit v1.2.3 From 866feb162b8f7e84039ed80e206c0df0def5f6c5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 22 Jun 2018 16:48:21 +0100 Subject: dgit: git-debrebase interop: Actually tolerate git-debrebase status 7 make-patches exiting with status 7 causes $?==7*256, not 7. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8f093d4..009e19f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ dgit (5.2~) unstable; urgency=medium * Print a warning to stderr on `dgit fetch sid', if your vcs-git remote url disagrees with what's in sid's .dsc. * git-debrebase interop: Add a missing debugcmd debugging print. + * git-debrebase interop: Actually tolerate git-debrebase make-patches + exiting with status 7. test suite: * Use nproc(1) rather than Sys::CPU. This is more portable and does not -- cgit v1.2.3 From 4f3269edb8a99fca1862c59bdad1a2a4f90b3099 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 22 Jun 2018 17:36:08 +0100 Subject: test suite: dgit/gdr interop: test make-patches exiting 7 Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/control b/debian/tests/control index 1da95fa..378cf4c 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-subcommands +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-makepatches7 gdr-subcommands Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime -- cgit v1.2.3 From 152ccd540c3f7809d8235d0907eb0142aed792f4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 24 Jun 2018 23:33:52 +0100 Subject: changelog: finalise 5.2 Signed-off-by: Ian Jackson --- debian/changelog | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 009e19f..d6ce19e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,6 @@ -dgit (5.2~) unstable; urgency=medium +dgit (5.2) unstable; urgency=medium - * dgit(1): Mention under `dgit build' that it uses the network. - * dgit(1): Clarify that --overwrite does nothing if not needed. - Closes:#863578. - * dgit-user(7): Recommend sbuild-debian-developer-setup. - [ Sean Whitton. ] Closes:895779. - - dgit: + dgit bugfixes: * When all Debian changes vanish with single-debian-patch, do not fail to commit the patch queue removal. Closes:#877036. * When build fails because the network is offline, mention @@ -21,20 +15,31 @@ dgit (5.2~) unstable; urgency=medium * --overwrite now no longer crashes if there is nothing to overwrite (eg, when used with --new). Instead, it is simply ignored, as it is ignored in situations where the push is fast forward. Closes:#863576. + + dgit/git-debrebase interop bugfixes: + * git-debrebase interop: Add a missing debugcmd debugging print. + * git-debrebase interop: Actually tolerate git-debrebase make-patches + exiting with status 7. + + dgit vcs-git handling improvements: * Provide `update-vcs-git' subcommand, for creating and adjusting the vcs-git remote url. Useful for transition from alioth to salsa. Closes:#902006. * Print a warning to stderr on `dgit fetch sid', if your vcs-git remote url disagrees with what's in sid's .dsc. - * git-debrebase interop: Add a missing debugcmd debugging print. - * git-debrebase interop: Actually tolerate git-debrebase make-patches - exiting with status 7. + + documentation: + * dgit(1): Mention under `dgit build' that it uses the network. + * dgit(1): Clarify that --overwrite does nothing if not needed. + Closes:#863578. + * dgit-user(7): Recommend sbuild-debian-developer-setup. + [ Sean Whitton. ] Closes:895779. test suite: * Use nproc(1) rather than Sys::CPU. This is more portable and does not depend on libsys-cpu-perl being installed. Closes:888496. - -- + -- Ian Jackson Sun, 24 Jun 2018 23:33:28 +0100 dgit (5.1) unstable; urgency=medium -- cgit v1.2.3