X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=6f5e15575e60df1deade92d3fa8085483b9ef26e;hp=4209e71a43ee3ab9ac69b1943f8848806458ae4a;hb=0057ec1d2d864bbd40a5fcc32a5edeeb2bc90b4e;hpb=b363aeb4b0228eff6ad85229946feeb3b4d92b77 diff --git a/debian/changelog b/debian/changelog index 4209e71a..6f5e1557 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,383 @@ +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. + * 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. + * 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.) + + -- + +dgit (6.2) unstable; urgency=medium + + * dgit(1): Improve and correct --build-products-dir description. + * dgit: Minor code cleanup. + * dgit build: Warn if --build-products-dir is not `..'. Closes:#904859. + * test suite: Test dgit import-dsc --build-products-dir. + + [Sean Whitton] + * manpages: alioth->salsa + * manpages: add references to pbuilder and cowbuilder + * dgit-maint-gbp(7): discuss dgit.default.build-products-dir + * dgit-maint-gbp(7): update references to --*-dirty + * dgit-sponsorship(7): add references to push-source + * dgit-maint-debrebase(7): fix command to just launder + + -- Ian Jackson Sun, 29 Jul 2018 12:57:26 +0100 + +dgit (6.1) unstable; urgency=medium + + New feature: + * 'pbuilder' and 'cowbuilder' subcommands (Closes: #844125). + - Suggest sbuild | pbuilder | cowbuilder. + + Minor fixes: + * Fix an error message to refer to the build products dir instead of + just the parent directory. + + -- Sean Whitton Sat, 28 Jul 2018 20:14:23 +0800 + +dgit (6.0) unstable; urgency=medium + + New features [Sean Whitton]: + * Introduce dgit.default.build-products-dir git configuration key. + Closes:#857316. + * Die earlier, and with a more helpful message, if the user tries to + include dirty changes when building a source package in split brain + mode. + + dgit behavioural changes: + * dgit: Always build the source package ourselves, rather than + sometimes leaving that to the builder command. dgit will now + usually generate *_multi.changes rather than *_$arch.changes. + * dgit: Build source packages in a private directory, except when + the user passes --include-dirty [Sean Whitton]. + - dgit push-source no longer cleans the tree [Sean Whitton]. + * dgit: Rename --ignore-dirty to --include-dirty (leaving the old + name supported as a deprecated alias). + + Test suite improvements: + * test suite: unset VISUAL, which interferes. Closes:#904308. + * Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild + tests. + * Support tests/run-all --progressive. + * Drop now-obsolete *-asplit tests. + + Other improvements: + * apt-get method: when apt does not update release files, + unconditionally print hint about noatime. Closes:#851873. + * messages: Be a lot more friendly about NEW in particular, + and also add a couple of `please's. Closes:#904448. + * Make --build-products-dir (and the new config key) actually work. + Closes:#863582. [ Ian and Sean. ] + * dgit: Many important internal rearrangemnts relating to source + package production and building. + + -- Ian Jackson Thu, 26 Jul 2018 14:43:47 +0100 + +dgit (5.10) unstable; urgency=medium + + * Merge the experimental branch. + * test suite: Drop a couple of useless test log output lines. + * infrastructure: Run git gc --auto before mirroring. Closes:#841414. + + -- Ian Jackson Sat, 14 Jul 2018 18:07:02 +0100 + +dgit (5.9+exp4) experimental; urgency=medium + + * test suite: Use dch -r -D sid '' not dch -r sid. Closes:#903441. + * test suite: Save a tarball of much of the working area of each test + in $AUTOPKGTEST_ARTIFACTS. + * Separate changelog entries for the following test attempts + in experimental have been elided: + dgit (5.9+exp3) experimental; urgency=medium + dgit (5.9+exp2) experimental; urgency=medium + dgit (5.9+exp1) experimental; urgency=medium + + -- Ian Jackson Thu, 12 Jul 2018 13:45:07 +0100 + +dgit (5.9) unstable; urgency=medium + + * git-debrebase convert-from-gbp: Look for dgit-generated tags so we can + usually make the new branch ff of the dgit view. Closes:#903132. + * git-debrebase convert-from-gbp: Check that the result will not + count as having diverged. This will usually turn failures to make + the ff pseudomerge into -fdiverged. Related to #903132. + * git-debrebase, Dgit.pm, git: some internal reorganisation to + support git-debrebase changes. + * dgit-downstream-dsc(7): New manpage. Closes:#842643,#851194. + * git-debrebase(5): Document best gitk options. Closes:#901927. + + -- Ian Jackson Thu, 12 Jul 2018 13:37:12 +0100 + +dgit (5.8) unstable; urgency=medium + + Bugfixes: + * dgit, git-debrebase: Properly make patches even if an awkward + .gitignore ignores the things in debian/patches. Closes:#903130. + * git-debrebase status: Fix commit reporting. Closes:903131. + * git-debrebase new-upstream: Add a -1 revision if the user + didn't supply one. Closes:#903127. + * git-debrebase: Improve grammar if one blocking snag. + * dgit(1): Unscramble push[-source] descriptions. Closes:#903116. + + -- Ian Jackson Sun, 08 Jul 2018 11:42:41 +0100 + +dgit (5.7) unstable; urgency=medium + + New feature: + * dgit checkout: new subcommand. Closes:#878443. + * dgit: Check that entirely-new uploads to Debian are not + source-only-uploads, as those are REJECTed. Closes:#801435. + + Bugfixes: + * dgit(7): Mention git-debrebase and gbp pq alongside git-dpm, + in the comment about handling patch stacks. + * dgit update-vcs-git: Honour --package properly. + * test suite: Always pass LC_COLLATE=C to sort(1). Closes:#903006. + * test suite: Fix trustingpolicy-replay & dput-ng. Closes:#903007. + * test suite: Test dput-ng compatibility. + + -- Ian Jackson Thu, 05 Jul 2018 15:02:21 +0100 + +dgit (5.6) unstable; urgency=medium + + * Merge the experimental branch containing the fianl + version of the test suite gnupg workarounds. Empirically, + - The tests now pass (most of the time, at least) in + current Debian unstable, whereas 5.5's fail utterly. + - There is still occasional lossage. So when running tests + in a loop (eg to test ever commit), it is still good to set + DGIT_TEST_RETRY_COUNT=3 (say). + + * test suite: Test that manpages format with only expected warnings. + + -- Ian Jackson Sun, 01 Jul 2018 00:41:20 +0100 + +dgit (5.5+exp9) experimental; urgency=medium + + * test suite: Explicitly start/stop the gnupg agent, around + each call to gnupg. Apropos of #902316 (and #868550). + + * Separate changelog entries for the following test attempts + in experimental have been elided: + dgit (5.5+exp8) experimental; urgency=medium + dgit (5.5+exp7) experimental; urgency=medium + dgit (5.5+exp6) experimental; urgency=medium + dgit (5.5+exp5) experimental; urgency=medium + dgit (5.5+exp4) experimental; urgency=medium + dgit (5.5+exp3) experimental; urgency=medium + dgit (5.5+exp2) experimental; urgency=medium + dgit (5.4+exp1) experimental; urgency=medium + + -- Ian Jackson Sat, 30 Jun 2018 19:03:00 +0100 + +dgit (5.5) unstable; urgency=medium + + * Add missing comma in debian/control. Closes:#902578. + * dgit(1): Fix a wrong reference to \fp, which should be \fP. + + -- Ian Jackson Thu, 28 Jun 2018 13:25:21 +0100 + +dgit (5.4) unstable; urgency=medium + + Improvements: + * dgit(1): Better description of --overwrite. Somewhat + apropos of discussion in #902534. + + Bugfixes: + * test suite: gdr-viagit, gdr-newupstream: Do not spuriously + fail if gnupg not serendipitously installed. Closes:#902559. + * Fix bug ref to #865444 in previous changelog entry. + + -- Ian Jackson Wed, 27 Jun 2018 23:13:42 +0100 + +dgit (5.3) unstable; urgency=medium + + Bugfixes: + * dgit: Do not introduce duplicate origs in .changes files, + eg if the .changes already has that orig. Closes:#869146. + * Honour GIT_REFLOG_ACTION everywhere. Closes:#901935. + * git-debrebase new-upstream: Provide better reflog entries + by setting GIT_REFLOG_ACTION. Closes:#901925. + + Improvements: + * Better message formatting when --overwrite may be needed, + and a note about first dgit push in dgit(1). Closes:891031. + * dgit(7): Add discussion of quilt fixup error messages, + and add cross-references to dgit(1) and the actual error. + Somewhat apropos of #865444. + + -- Ian Jackson Wed, 27 Jun 2018 14:00:31 +0100 + +dgit (5.2) unstable; urgency=medium + + 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 + 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. + * 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. + * --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. + + 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 + + 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.) + + -- Ian Jackson Wed, 20 Jun 2018 23:20:57 +0100 + +dgit (5.0) unstable; urgency=low + + 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. + * 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. + + 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. + + -- Ian Jackson Mon, 18 Jun 2018 00:29:44 +0100 + +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 + + Documentation improvements: + * dgit(7): Discuss file executability. Closes:#886444. + * dgit(7): Discuss git-unrepresentable properties of source trees. + * dgit-maint-merge(7): Don't suggest using debian/source/patch-header + for 1.0 source format. Closes:#887850. [Sean Whitton] + + Bugfixes: + * dgit archive-api-query: Avoid crashing due to lack of $isuite. + This breaks the infrastructure. Closes:#886592. + + -- Ian Jackson Thu, 25 Jan 2018 00:33:56 +0000 + +dgit (4.2) unstable; urgency=low + + * Upload dgit 4.x series to unstable. + + New features [Sean Whitton]: + * New 'push-source' subcommand for source-only uploads. Closes:#848931 + * When dgit builds a source package, such as in the 'build-source' + subcommand, it now bypasses dpkg-buildpackage and invokes dpkg-source + directly. This avoids a _source.buildinfo file in the .changes, which + doesn't make sense when using dgit. See + . + + Documentation improvements: + * dgit(1): Add a bit more rationale (polemic, even). Closes:#874221. + * Recommend mk-build-deps rather than apt-get build-dep. + Suggestion from Nikolaus Rath. Closes:#863361. + * dgit-maint-merge(7): many updates. [Sean Whitton] + Closes:#864873,#878433. + * dgit-*(7): Mention first upload trick. [Andrew Shadura, + Sean Whitton] Closes:#856402. + + Minor fixes: + * When source discrepancy involves file mode changes, report them + specially. Closes:#886442. + * In split brain mode, with unexpected diffs, print dgit view + commitid in suggested diff rune. (HEAD is wrong.) Closes:#886443. + * Fix message about missing quilt cache entry to refer to + HEAD rather than tree, since dgit needs a commit. Closes:#884646. + * Fix grammar error in 4.1 changelog entry. [Sean Whitton] + * Remove some whitespace "errors". [Sean Whitton] + + Packaging: + * Remove dependency alternative on realpath (package last existed in + Debian wheezy). Closes:#877552. + + Test suite: + * dpkgsourceignores-docs: Correct restriction (so autopkgtest + won't try to run it). + * Additional workarounds for gnupg races (#868550) including + retrying each individual test once, and more sophisticated + wrapper for gpg (with locking and, sometimes saves stdin). + * oldnewtagalt: Fix regression when running outside git tree, + introduced in 4.1. + + -- Ian Jackson Sun, 07 Jan 2018 21:45:29 +0000 + dgit (3.13) unstable; urgency=high Important bugfixes to dgit: @@ -9,6 +389,52 @@ dgit (3.13) unstable; urgency=high -- Ian Jackson Sun, 22 Oct 2017 17:51:12 +0100 +dgit (4.1) experimental; urgency=medium + + Important improvements to dgit: + * Support for `git worktree' worktrees. There may still be + bugs; the tests for this are not very comprehensive. And + worktrees on different filesystems may not work; that's a + matter for the future. Closes:#868515. + * Change the dpkg-source -i argument to exclude exactly the right + set of things. (Sadly this is not a simple rune.) + + Other improvements to dgit: + * New print-dpkg-source-ignores option to print the big rune + you need to pass to dpkg-source to make it work exactly right. + * Properly shell-quote the --git-builder argument to gbp. + + Documentation: + * dgit-user(7): Provide information about how to use sbuild. + Quite ugly due to #868527. Closes:#868526. + * dgit-user(7): Fixed example rune to use curl (which prints + to stdout, as the rune expects). [reported by Simon Tatham] + + Minor improvements: + * Do not leave many clog-* files in .git/dgit. + + Internal changes: + * using-these: New script to help with ad-hoc-testing. + * Refactoring in preparation for push-source [Sean Whitton]. + + Test suite: + * sbuild-gitish: New test case to check running sbuild from git + * Work around gnupg agent connection races by having our stunt + gpg wrapper simply try running gpg again, once, if it exits 2. + This does not fully suppress the bug but it does significantly reduce + the probability. + * Other tests for new features. + * Various refactoring. + + -- Ian Jackson Mon, 14 Aug 2017 09:31:03 +0100 + +dgit (4.0) experimental; urgency=low + + * dgit: --deliberately-not-fast-forward works properly in + split view quilt modes (suppressing the pseudomerge). + + -- Ian Jackson Sun, 12 Feb 2017 22:22:31 +0000 + dgit (3.12) unstable; urgency=high Important bugfixes to dgit: