X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;fp=debian%2Fchangelog;h=1e3aaa801135259b9081b64bfb9fa79a7efa0bc6;hp=b76e2e1c084f1a65ab01542f068dec96c0098535;hb=cc82deecc83f936e98401aef4a2471da8988cb07;hpb=c2a1ff9bcb0420ce47b6d4663aa0b403feabf0a4 diff --git a/debian/changelog b/debian/changelog index b76e2e1c..1e3aaa80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,166 +1,53 @@ dgit (9.0~) unstable; urgency=medium - [ Ian Jackson ] - * changelog: start 8.6 - * dgit: rpush: Work in splitting quilt modes, again - * test suite: rpush-quilt: New test to check rpush with splitting - * dgit: Drop "dgit view: changes are required..." message - * dgit: split brain reorg: Always _needed in split brain quilt modss - * dgit: Move quiltify_splitbrain_needed into its one call site - * dgit: Separate out build_check_quilt_splitbrain - * dgit: dopush pseudomerge, break apart from quilt fixup - * dgit: quilt fixup: Move split brain branch creation out a bit - * dgit: rename unpack_playtree_mk_cd_work (from _mkwork) - * dgit: unpack_playtree_need_cd_work: Make idempotent - * dgit: quilt_need_fake_dsc: Make idempotent - * dgit: gdr linear quilt fixup: Do it in a playtree - * dgit: Move quilt_need_fake_dsc into the places that require it - * dgit: Write down quilt mode split brain plans in a comment - * dgit: split brain reorg: Check quilt cache iff $do_split_brain (1) - * dgit: split brain reorg: Check quilt cache iff $do_split_brain (2) - * dgit: Reject split brain quilt modes with single-debian-patch - * dgit: split brain reorg: Change an internal error die to confess - * dgit: split brain reorg: Move some split brain code further out. - * dgit: Add a comment about a bug we are about to eliminate. - * dgit: split brain reorg: Move do_split_brain setting - * dgit: Fix check for --include-dirty --quilt= - * dgit: split brain reorg: debug print quilt mode in XXX - * dgit: split brain reorg: Check $split_brain against $do_split_brain - * dgit: split brain reorg: Rename $made_split_brain - * dgit: split brain reorg: Slight internal error check improvements - * dgit: clean mode: Correctly reject bad modes from config - * dgit: Split out default_from_access_cfg - * dgit: When propagating pseudomerge error, strip leading \n - * dgit: Move git chedckout master out of quiltify - * dgit: quiltify: Go back to dgit-view if appropriate - * dgit: Fix --dgit-view-save option - * dgit: Do split brain cache and saving in build_maybe_quilt_fixup - * test suite: t-{unapplied,dpm}-pushed-good: set $suite - * test suite: break out t-splitbrain-rm-1-patch - * test suite: Drop all testing of old tag formats, and compatibility - * dgit: tag format: Add missing $protovsn comment re tagformat param - * dgit: Drop support for old tag format - * dgit: Tidying up after tag format: drop ..._can_splitbrain - * dgit: Drop $protovsn < 4; part of tidying up after tag format - * dgit: Introduce $protovsn 5; part of tidying up after tag format - * infra: Drop support for old tag name on server side - * dgit: Tidying up after tag format: Collapse $dodep14tag test - * dgit(1): Correct --always-dep14tag - * dgit(1): Tidying up after tag format: Drop qualifications - * Dgit.pm: Tidying up after tag format: Drop debiantag_old - * dgit: Tidying up after tag format: Drop debiantag - * dgit(1): Tidying up after tag format: Drop splitbrain conditional - * dgit: Introduce do_split_brain() - * dgit: Put !! inside do_split_brain() - * dgit: Crash if we forgot to set $do_split_brain - * dgit: Break out determine_whether_split_brain - * dgit: Move determine_whether_split_brain further up the file - * dgit: Reject dgit pull in split brain mode - * dgit: In code, rename splitbrain quilt modes to splitting - * dgit: Support split view in non-splitting quilt modes - * dgit: Reject split view with correct message - * test suite; New test forcesplit-overwrite - * test suite: forcesplit-overwrite: Check -pushed-good - * test suite: forcesplit-overwrite: Break out "try" - * test suite: forcesplit-overwrite: Test without --overwrite - * test suite: forcesplit-overwrite: Test with bare --overwrite - * test suite: new test forcesplit-linear - * docs: Document --split-view and change terminology (Closes: #926640) - * Dgit.pm: Move upstream_commitish_search from git-debrebase - * Dgit.pm: Move resolve_upstream_version from git-debrebase - * Dgit.pm: Move read-tree wrappers from git-debrebase - * Rename various *make_commit* to *hash_commit* - * Dgit.pm: Move make_commit (git-commit-tree wrapper) from gdr - * Dgit.pm: Move hash_commit from dgit - * git-debrebase: Replace one open-coded hash-object with hash_commit - * dgit: Make $format available in build_or_push_prep_modes - * dgit: Introduce $uhead and $uhead_whatshort - * Dgit.pm: resolve_upstream_version: Return a message too - * test suite: Add DEBORIG pseudo-dependency - * dgit: baredebian: Introduce --upstream-commitish - * dgit: baredebian: New quilt mode - * i18n: Add translator notes about ASCII art changes display - * test suite: baredebian setup, and a skeleton to run it - * test suite: baredebian-push: Actually test --quilt=baredebian - * dgit: baredebian: Note upstream version and commitish source - * dgit: baredebian: Provide $quilt_upstream_commitish_message - * dgit: baredebian: Note upstream commitish source in prose - * test suite: baredebian-push: Check that history is roughly right - * dgit: baredebian: Reject --clean=git - * test suite: baredebian-push: Test rejection of -wgf - * dgit(1): document --quilt=bareebian (Closes: #903392) - * dgit(1): split view: Talk about `your local git clone' - * test suite: t-setup-done: Arrange to save all DGIT_TEST_REAL_* - * test suite: baredebian-push: Add missing dependency DEBORIG - * test suite: lib: Add missing dependencies for git-deborig - * test suite: baredebian: Add missing dependency quil - * test suite: baredebian: break out lib-baredebian, baredebian-test - * dgit: Break out $quilt_options_re - * Dgit.pm: read_tree_*: Treat '' as meaning 'delete this' - * dgit: Break out import_tarball_tartrees - * dgit: Break out import_tarball_commits - * dgit: import_tarball_tartrees: Honour Path in dfis - * dgit: import_tarball_tartrees: Handle @dfi==1 case in caller - * dgit: import_tarball_tartrees: Provide OrigPart - * dgit: return $r1authline from import_tarball_commits - * test suite: lib-baredebian: Introduce $quiltmode - * test suite: baredebian: move setting of $quiltmode to lib - * test suite: lib-baredebian: Split up big function - * test suite: lib-baredebian: Break out $uv everywhere - * test suite: lib-baredebian: Break out $uvtag - * dgit: New quilt mode "baredebian+tarball" - * test suite: lib-baredebian: Tolerate uvtag not being set - * test suite: baredebian-tarball: New test - * test suite: baredebian: Break out baredebian-tarball-mode - * test suite: lib-baredebian: Machinery for multiple origs - * test suite: baredebian-multitar: New test - * test suite: lib-baredebian: Provide `origbase' - * test suite: baredebian-multitar: Check tarball import structure - * dgit(1): baredebian: Fix an editing error - * dgit(1): baredebian: Add caveat about not checking edits - * dgit(1): baredebian+tarball: Document new quilt mode (Closes: #931253) - * dgit: Do not translate import commit messages - - [ Sean Whitton ] - * dgit(1): expand on description of behaviour of --include-dirty - - [ Ian Jackson ] - * dgit(1): In --include-dirty caveat, use semantic newlines - * dgit(1): In --include-dirty caveat, mention --clean=dpkg-source - * dgit(1): In --include-dirty caveat, say "especially --clean=git" - (Closes: #930922) - * test suite: enumerate-tests: Break out allsedderies - * test suite: enumerate-tests: Drop duplicate dependencies - * test suite: enumerate-tests: include deps of t-import-* - * test suite: baredebian-*: Drop explicit list of implied deps - * test suite: baredebian: Break out baredebian-test-minimum - * dgit: baredebian: Honour baredebian+git alias for baredebian - * test suite: baredebian-plusgit: New test for baredebian+git - * dgit(1): baredebian+git: Document this alias - - [ Niko Tyni ] - * git-debrebase: fix convert-from-dgit-view argv handling (Closes: #930214) - * git-debrebase(1): typo fix (Closes: #930215) - - [ Sean Whitton ] - * dgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filter - (Closes: #930956) - - [ Ian Jackson ] - * dgit-maint-debrebase(7): Minor wording change apropos of #930956 - - [ Sean Whitton ] - * dgit-maint-{merge,debrebase}(7): Using untagged upstream commits - (Closes: #930964) - - [ Ian Jackson ] - * dgit-repos-policy-debian: Add a tiny bit of debugging output - * test suite: debpolicy-taintrm: New test (Closes: #929249) - * test suite: debpolicy-taintrm: Drop some xxx's - * changelog: Retarget at buster - * changelog: Document the change so far - * changelog: pseudo-finalise 8.6~ - * changelog: start 9.0 + dgit - low-impact incompatible change: + * Drop support for, and testing of, dgit versions which use old tag name + (debian/V; now that is maintainer view and dgit is archive/debian/V). + The new tags came in in dgit 2.0 in October 2016. No version of dgit + without them was in any Debian release. We don't expect there are any + sites using old servers which do not support the new format, or anyone + using a dgit client older than 2.x who cannot upgrade. + + git-debrebase fixes [Niko Tyni]: + * Fix `git-debrebase convert-from-dgit-view ', which + would crash due to an argument parser bug. Closes:#930214. + * git-debrebase(1): typo fix. Closes:#930215. + + dgit - new capabilities: + * Support split view with native packages, and with all quilt modes. + Now we distinguish "split view" (meaning separate dgit branch) from + "splitting quilt modes" (eg --quilt-unapplied). + [Prompted in part by enquiries from Sam Hartman] Closes:#926640. + * Support for bare debian/ directory (aka packaging-only) git branches + Ie, --quilt=baredebian[+tarball]. [Thanks for info from Shengjing + Zhu, and docs and UI contributions/review from Sean Whitton.] + Closes:#903392. Closes:#931253. + + dgit - bugfixes: + * Fix --dgit-view-save option alias, which never worked. + (--save-dgit-view worked, and still does, though.) + * i18n: Do not translate import commit messages. + + dgit - other documentation improvements [Sean Whitton]: + * Expand on description of --include-dirty. Closes:#930922. + * dgit-maint-*(7): Suggest --name-status --diff-filter. Closes:#930956. + * dgit-maint-*(7): Using untagged upstream commits. Closes:#930964. + + dgit - minor consequences of these other changes: + * Actually properly reject invalid quilt modes found in git config. + (Previously they might be accepted and then cause malfunctions.) + * Reject split brain quilt modes with single-debian-patch. + (Previously this would malfunction; now we reject it.) + * i18n: Add translator notes about ASCII art changes display. + * Drop "dgit view: changes are required..." message. + * Some other minor changes to quilt fixup error handling. + * Changes to debugging output related to quilt modes and split view. + * Introduce rpush protocol version 5. Minimum version is now 4. + * Considerable internal rearrangement of quilt fixup code. + * Considerable test suite work including new tests. + + dgit test suite: + * dgit-repos-policy-debian: Test taint removal. Closes:#929249. --