From aef653db307bc8e38f248e8dbec43ae3d2430413 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 29 Jul 2018 13:03:21 +0100 Subject: changelog: start 6.3~ Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 3e219b0..6124ea7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.3~) unstable; urgency=medium + + * + + -- + dgit (6.2) unstable; urgency=medium * dgit(1): Improve and correct --build-products-dir description. -- cgit v1.2.3 From a2adcd961613b1570dea721391e9f5c9665ba642 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 07:58:15 +0100 Subject: git-debrebase: keycommits: Pass correct argument to fail We got the array index wrong and would print HASH(0x55be4dba1f88) or whatever. Closes:#905003. Signed-off-by: Ian Jackson --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 6124ea7..9d22bed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dgit (6.3~) unstable; urgency=medium - * + * git-debrebase: breakwater: Fix error message for unprocessable + commits. Closes:#905003. -- -- cgit v1.2.3 From 0d90164505d26f733fde2482616ddbf18f782145 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 09:09:35 +0100 Subject: git-debrebase: new-upstream: Fix error message for new version with bad syntax Calling new Dpkg::Version , check => 1 does not die or anything if it's wrong; it just returns undef. The result is an error message about calling is_valid on an undefined value. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 9d22bed..be2d349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: breakwater: Fix error message for unprocessable commits. Closes:#905003. + * git-debrebase: new-upstream: Fix error message for new version + with bad syntax. -- -- cgit v1.2.3 From fd60a31ac3b7308570eee56f1e3c8e5ef0ffafe1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 09:13:55 +0100 Subject: test suite: gdr-unprocessable: new test Test git-debrebase messages about unprocessable commits. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index be2d349..41026cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ dgit (6.3~) unstable; urgency=medium commits. Closes:#905003. * git-debrebase: new-upstream: Fix error message for new version with bad syntax. + * git-debrebase test suite: Test messages about unprocessable commits. -- -- cgit v1.2.3 From ec2180ffff14c6e14703a70b4e68861312607f10 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 10:21:57 +0100 Subject: git-debrebase: new-upstream: Fix handling of epochs. Dpkg::Version->version() is only the middle part. ->epoch() doesn't have the colon. This is inconvenient enough that we convert it to a string and use a regexp :-/. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 41026cc..ef70f6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: new-upstream: Fix error message for new version with bad syntax. * git-debrebase test suite: Test messages about unprocessable commits. + * git-debrebase: new-upstream: Fix handling of epochs. -- -- cgit v1.2.3 From c83cc428208bee99de3b75158b9779449403ee1b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:16:53 +0100 Subject: git-debrebase: convert-from-gbp: Use same algorithm for finding upstream The version is in the changelog, and thus upstream commitish can then be found from as new-upstream. This also means we now give the same error message, which is much better than the one we had before. Closes:#905062. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index ef70f6e..4d6e50a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ dgit (6.3~) unstable; urgency=medium with bad syntax. * git-debrebase test suite: Test messages about unprocessable commits. * git-debrebase: new-upstream: Fix handling of epochs. + * git-debrebase: convert-from-gbp: Use same algorithm for finding + upstream commitish as new-upstream. Closes:#905062. -- -- cgit v1.2.3 From e5d430e4208757b874443779b75ca884a143aa6a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:28:41 +0100 Subject: git-debrebase: Improve error messages for bad options. * GetOptions calls warn(). So we need a wrapper which disables or $SIG{__WARN__} (which prints a stack trace). * Put the call to badusage in the wrapper. * Change the messages to be clearer about what is meant. * Add the program name to the badusage message. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 4d6e50a..dc87466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: new-upstream: Fix handling of epochs. * git-debrebase: convert-from-gbp: Use same algorithm for finding upstream commitish as new-upstream. Closes:#905062. + * git-debrebase: Improve error messages for bad options. -- -- cgit v1.2.3 From cd06cd0cf3b1190fde3862684a18a1d7d56a834e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:37:39 +0100 Subject: git-debrebase: Improve error message for convert-from-gbp upstream discrepancy Closes:#905078. I don't intend to print `small' diffs because I think that kind of dwim is probably more annoying than helpful. I don't intend to factor this kind of pattern out throughout because: The messages for these commands are generally not the actual diff rune dgit or gdr ran, for various reasons (notably that dgit/gdr often use object hashes). The result is that there is little duplication. So I think the situation now is OK. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index dc87466..3948db7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: convert-from-gbp: Use same algorithm for finding upstream commitish as new-upstream. Closes:#905062. * git-debrebase: Improve error messages for bad options. + * git-debrebase: Improve error message for convert-from-gbp + upstream discrepancy. Closes:#905078. -- -- cgit v1.2.3 From 0057ec1d2d864bbd40a5fcc32a5edeeb2bc90b4e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:52:03 +0100 Subject: git-debrebase(5): Add ILLEGAL OPERATIONS section. Re #905004. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 3948db7..6f5e155 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: Improve error messages for bad options. * git-debrebase: Improve error message for convert-from-gbp upstream discrepancy. Closes:#905078. + * git-debrebase(5): Add ILLEGAL OPERATIONS section. (Re#905004.) -- -- cgit v1.2.3 From fcff4f4b403b6dd53d6bc6b10d56baccd83dd144 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:55:28 +0100 Subject: git-debrebase(1): Warn against plain git rebase. Re #905004. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 6f5e155..2e1497d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: Improve error message for convert-from-gbp upstream discrepancy. Closes:#905078. * git-debrebase(5): Add ILLEGAL OPERATIONS section. (Re#905004.) + * git-debrebase(1): Warn against plain git rebase. (Re#905004.) -- -- cgit v1.2.3 From 99bfdd1686cd2870fce5a4d08d63b479fe4ef41f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 13:56:46 +0100 Subject: dgit-maint-debrebase(7): Warn more against plain git rebase. Specifically, - warn that pseudomerges must not be rebased over - warn and that git-rebase without a base should not be used - say to run gdr instead Closes:#905004. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 2e1497d..4cc32d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ dgit (6.3~) unstable; urgency=medium upstream discrepancy. Closes:#905078. * git-debrebase(5): Add ILLEGAL OPERATIONS section. (Re#905004.) * git-debrebase(1): Warn against plain git rebase. (Re#905004.) + * dgit-maint-debrebase(7): Warn more against plain git rebase. + Closes:#905004. -- -- cgit v1.2.3 From df9078a9e956ea6be6af328fcdbd2e22331077c1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Jul 2018 14:05:20 +0100 Subject: git-debrebase: Implement --help, providing a summary. Provide a usage message. I'm not convinced an option summary here is a good idea, mainly there aren't any really important options. (-f will be advertised when it is relevant.) So I have just summarised the most important operations. Closes:#904990. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 4cc32d2..dd97216 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase(1): Warn against plain git rebase. (Re#905004.) * dgit-maint-debrebase(7): Warn more against plain git rebase. Closes:#905004. + * git-debrebase: Implement --help, providing a summary. + Closes:#904990. -- -- cgit v1.2.3 From 6195748b77343d61f81ee4cdac2942fbbfcc3590 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 2 Aug 2018 03:46:24 +0100 Subject: changelog: finalise 6.3 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index dd97216..bae63cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (6.3~) unstable; urgency=medium +dgit (6.3) unstable; urgency=medium * git-debrebase: breakwater: Fix error message for unprocessable commits. Closes:#905003. @@ -18,7 +18,7 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: Implement --help, providing a summary. Closes:#904990. - -- + -- Ian Jackson Thu, 02 Aug 2018 03:45:40 +0100 dgit (6.2) unstable; urgency=medium -- cgit v1.2.3 From 87d482318c13dc6a4fd1cbc2c45643af4cafa44c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 2 Aug 2018 03:48:03 +0100 Subject: changelog: start 6.4 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index bae63cc..758f31f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.4~) unstable; urgency=medium + + * + + -- + dgit (6.3) unstable; urgency=medium * git-debrebase: breakwater: Fix error message for unprocessable -- cgit v1.2.3 From 8bfc1691211b345c319eed386e0442e1f579726a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 2 Aug 2018 07:39:12 +0100 Subject: git-debrebase(1): Fix typo "unappled". Closes:#905064. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 758f31f..ae86731 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (6.4~) unstable; urgency=medium - * + * git-debrebase(1): Fix typo "unappled". Closes:#905064. -- -- cgit v1.2.3 From d43a4766cefecd2dda1e66faf4f33cca716fe459 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 2 Aug 2018 08:24:52 +0100 Subject: changelog: finalise 6.4 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index ae86731..6d2afcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -dgit (6.4~) unstable; urgency=medium +dgit (6.4) unstable; urgency=medium * git-debrebase(1): Fix typo "unappled". Closes:#905064. - -- + -- Ian Jackson Thu, 02 Aug 2018 08:24:32 +0100 dgit (6.3) unstable; urgency=medium -- cgit v1.2.3 From fe665d943b9d35e8221893c7e6d95c3ec1ead778 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 2 Aug 2018 08:31:30 +0100 Subject: changelog: start 6.5 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 6d2afcc..2a00f3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.5~) unstable; urgency=medium + + * + + -- + dgit (6.4) unstable; urgency=medium * git-debrebase(1): Fix typo "unappled". Closes:#905064. -- cgit v1.2.3 From 89108c5f44ad57febbb24a28d605a5c6322d14c2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 3 Aug 2018 07:29:52 +0100 Subject: test suite: Add t-tstunt-parsechangelog to many gdr tests. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 2a00f3d..70e21d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (6.5~) unstable; urgency=medium - * + * test suite: Add t-tstunt-parsechangelog to many gdr tests. -- -- cgit v1.2.3 From 7bed50ebbcdf503896de776c0c70656b3dfeea7e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 3 Aug 2018 07:31:09 +0100 Subject: test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. By making the script a dependency of the .ok stamp file. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 70e21d5..cb9f3df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dgit (6.5~) unstable; urgency=medium * test suite: Add t-tstunt-parsechangelog to many gdr tests. + * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. -- -- cgit v1.2.3 From 12948968b9a6e48898a5a704a524930da170cd75 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 3 Aug 2018 07:59:34 +0100 Subject: dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. This name makes more sense. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index cb9f3df..4ea57ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dgit (6.5~) unstable; urgency=medium * test suite: Add t-tstunt-parsechangelog to many gdr tests. * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. + * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. -- -- cgit v1.2.3 From 51a3f746ef8525c1a24085b97e28cc36c85b1268 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 3 Aug 2018 12:18:00 +0100 Subject: dgit: Provide print-unapplied-treeish subcommand. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 4ea57ef..791066d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dgit (6.5~) unstable; urgency=medium * test suite: Add t-tstunt-parsechangelog to many gdr tests. * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. + * dgit: Provide print-unapplied-treeish subcommand. -- -- cgit v1.2.3 From 9b6abc0738dde6c9fd71cf33ead7262fc00c57f9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 3 Aug 2018 14:38:37 +0100 Subject: dgit: Improve error message for unknown suite, to suggest -d Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 791066d..491e80f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ dgit (6.5~) unstable; urgency=medium * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. * dgit: Provide print-unapplied-treeish subcommand. + * dgit: Improve error message for unknown suite, to suggest -d. -- -- cgit v1.2.3 From 32302c566f46426687ae9dcccec2f16ddeb56e4b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 10:35:58 +0100 Subject: git-debrebase: Properly reject bare dgit dsc imports A bare dgit dsc import is not a legal gdr branch, because the main merge contains debian/patches/. So it cannot be processed without conversion. Previously an attempt to launder such a branch would crash with a stack trace, although keycommits would falsely claim it was OK Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 491e80f..664a3d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dgit (6.5~) unstable; urgency=medium * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. * dgit: Provide print-unapplied-treeish subcommand. * dgit: Improve error message for unknown suite, to suggest -d. + * git-debrebase: Properly reject bare dgit dsc imports -- -- cgit v1.2.3 From 5026d3c30a7046299179ca3ba422fb21505cdf4d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 10:42:42 +0100 Subject: git-debrebase: Improve error message formatting from $bomb in walk The : and ; were messed up. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 664a3d1..742b752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dgit (6.5~) unstable; urgency=medium * dgit: Provide print-unapplied-treeish subcommand. * dgit: Improve error message for unknown suite, to suggest -d. * git-debrebase: Properly reject bare dgit dsc imports + * git-debrebase: Improve some error message formatting. -- -- cgit v1.2.3 From e5bae1c8621bb50925404c3ba70c83b037a5b74f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 10:44:59 +0100 Subject: test suite: gdr-import-dgitview: New test for dgit dsc imports So far this just tests the bugfixes I've just done. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 742b752..a64a06d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ dgit (6.5~) unstable; urgency=medium * dgit: Improve error message for unknown suite, to suggest -d. * git-debrebase: Properly reject bare dgit dsc imports * git-debrebase: Improve some error message formatting. + * test suite: gdr-import-dgitview: New test for dgit dsc imports. -- -- cgit v1.2.3 From 485a61ef66da7ad675e0495355b1f9f1df952bf5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 12:01:50 +0100 Subject: git-debrebase: Provide new convert-from-dgit-view operation. The output is, unavoidably, not very pretty. Closes:#905322. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index a64a06d..fd3f102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ dgit (6.5~) unstable; urgency=medium * git-debrebase: Properly reject bare dgit dsc imports * git-debrebase: Improve some error message formatting. * test suite: gdr-import-dgitview: New test for dgit dsc imports. + * git-debrebase: Provide new convert-from-dgit-view operation. + The output is, unavoidably, not very pretty. Closes:#905322. -- -- cgit v1.2.3 From b58f7c61452fc5b8b7d70f735283ecdc1b5e8ac3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 13:40:15 +0100 Subject: git-debrebase: New feature `scrap' Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index fd3f102..787cd2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ dgit (6.5~) unstable; urgency=medium * test suite: gdr-import-dgitview: New test for dgit dsc imports. * git-debrebase: Provide new convert-from-dgit-view operation. The output is, unavoidably, not very pretty. Closes:#905322. + * git-debrebase: New feature `scrap'. Closes:#905063. -- -- cgit v1.2.3 From bc3be36a946aeb6485259be594645c3c3d69550f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 14:28:16 +0100 Subject: git-debrebase: check for git-rebase in progress and abort most operations scrap should abort, but doesn't yet. status just prints a message. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 787cd2c..fdd5509 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ dgit (6.5~) unstable; urgency=medium * git-debrebase: Provide new convert-from-dgit-view operation. The output is, unavoidably, not very pretty. Closes:#905322. * git-debrebase: New feature `scrap'. Closes:#905063. + * git-debrebase: check for git-rebase in progress and abort most operations. -- -- cgit v1.2.3 From db9a52f723ee82e8f01a8de1b7822ee98ecf7a18 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 17:38:35 +0100 Subject: changelog: Categorise and reorder entries Signed-off-by: Ian Jackson --- debian/changelog | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index fdd5509..f2cce1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,24 @@ dgit (6.5~) unstable; urgency=medium - * test suite: Add t-tstunt-parsechangelog to many gdr tests. - * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. - * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. - * dgit: Provide print-unapplied-treeish subcommand. - * dgit: Improve error message for unknown suite, to suggest -d. + git-debrebase new features: + * git-debrebase: Provide new convert-from-dgit-view operation. + The output is, unavoidably, not very pretty. Closes:#905322. + * git-debrebase: New subcommand `scrap'. Closes:#905063. + + git-debrebase error handling improvements: * git-debrebase: Properly reject bare dgit dsc imports * git-debrebase: Improve some error message formatting. + * git-debrebase: Check for git-rebase in progress and abort most operations. + + dgit improvements: + * dgit: Improve error message for unknown suite, to suggest -d. + * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. + * dgit: Provide print-unapplied-treeish subcommand. + + Test suite changes: + * test suite: Add t-tstunt-parsechangelog to many gdr tests. + * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. * test suite: gdr-import-dgitview: New test for dgit dsc imports. - * git-debrebase: Provide new convert-from-dgit-view operation. - The output is, unavoidably, not very pretty. Closes:#905322. - * git-debrebase: New feature `scrap'. Closes:#905063. - * git-debrebase: check for git-rebase in progress and abort most operations. -- -- cgit v1.2.3 From adc50d1b8db1796f5d38743af1b18f1abda3b3cd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Aug 2018 17:54:07 +0100 Subject: changelog: finalise 6.5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index f2cce1d..df6dcdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (6.5~) unstable; urgency=medium +dgit (6.5) unstable; urgency=medium git-debrebase new features: * git-debrebase: Provide new convert-from-dgit-view operation. @@ -20,7 +20,7 @@ dgit (6.5~) unstable; urgency=medium * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. * test suite: gdr-import-dgitview: New test for dgit dsc imports. - -- + -- Ian Jackson Sat, 04 Aug 2018 17:53:57 +0100 dgit (6.4) unstable; urgency=medium -- cgit v1.2.3 From 486fcc0b7b82c9dcca4a4ad52af592e176ab8f18 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Aug 2018 10:19:11 +0100 Subject: changelog: Start 6.5 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index df6dcdd..1ca7cf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.6~) unstable; urgency=medium + + * + + -- + dgit (6.5) unstable; urgency=medium git-debrebase new features: -- cgit v1.2.3 From 75ca716a6e0a737795ab552a830ee277f8fda56c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Aug 2018 10:32:08 +0100 Subject: test suite: Fix gdr's calls to dgit when run formally in autopkgtest. We should not pass `--dgit='. That causes gdr to try to exec "". Affects gdr-import-dgitview. Signed-off-by: Ian Jackson --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 1ca7cf0..dce10bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dgit (6.6~) unstable; urgency=medium - * + * test suite: Fix gdr's calls to dgit when run formally in + autopkgtest. (Affects gdr-import-dgitview.) -- -- cgit v1.2.3 From 66d19f834577d2495c8255f042aff4d86d040049 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Aug 2018 10:42:15 +0100 Subject: changelog: finalise 6.6. Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index dce10bf..31cc533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -dgit (6.6~) unstable; urgency=medium +dgit (6.6) unstable; urgency=medium * test suite: Fix gdr's calls to dgit when run formally in autopkgtest. (Affects gdr-import-dgitview.) - -- + -- Ian Jackson Sun, 05 Aug 2018 10:42:01 +0100 dgit (6.5) unstable; urgency=medium -- cgit v1.2.3