summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: finalise 10.0debian/10.1archive/debian/10.1Ian Jackson2022-11-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes since 10.0Ian Jackson2022-11-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: quilt-splitbrains: Test that we gen cache if neededIan Jackson2022-11-11
| | | | | | Have tested that this fails before the previous fix. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push-build: Populate the split brain cache if necessaryIan Jackson2022-11-11
| | | | | | Closes: #1019454 Reported-by: Simon McVittie <smcv@debian.org> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: gdr-import-dgitview: Test conversion mismatchIan Jackson2022-11-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: convert-from-dgit-view: Bail if output is wrongIan Jackson2022-11-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: gdr-import-dgitview: Make tree good before failing testIan Jackson2022-11-11
| | | | | | | Otherwise the check we're about to add spots the problem before the error we are checking for occurs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: conversion: bail a little earlier on snagsIan Jackson2022-11-11
| | | | | | | This avoids printing more messages that aren't going to be very helpful. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Fix "stripeoch" typoIan Jackson2022-11-11
| | | | | | | | Fixes messages like this from git-debrebase convert-from-dgit-view Can't locate object method "stripeoch" via package "3.41" (perhaps you forgot to load "3.41"?) at /home/ian/things/Dgit/dgit/git-debrebase line 2754. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Remove obsolete documentation of dgit-tag-formatIan Jackson2022-11-11
| | | | | | This was removed in 2019. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* add --pretty example for generating hash tagsPhilip Hands2022-11-11
| | | | | Signed-off-by: Philip Hands <phil@hands.com> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Soften message about source-only uploads to NEWIan Jackson2022-11-11
| | | | | | | Prompted by #983056. A proper fix would involve encoding more precise knowledge about Debian archive policy. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Retrospectively xref to #950612 to entry for 9.11Ian Jackson2022-11-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Be more encouraging about --newIan Jackson2022-11-11
| | | | | | | Thanks to Sean for digging this out from having been lost. Closes: #941323 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Fix handling of tag during convert-from-dgitIan Jackson2022-11-11
| | | | | | We need Commit to point to a commit, not a tag object or something. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* infra: get-dm-txt: Handle abolition of archive-query-tls-curl-ca-argsIan Jackson2022-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Fix misindented line in entry for 9.11Ian Jackson2022-09-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 10.1~Ian Jackson2022-09-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 10.0debian/10.0archive/debian/10.0Ian Jackson2022-09-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes since 9.16Ian Jackson2022-09-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: This is going to be 10.xIan Jackson2022-09-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push: Add a test that we can make it mean push-sourceIan Jackson2022-09-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Add caveats to --dry-run and --damp-runIan Jackson2022-09-04
| | | | | Closes: #973896 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Demote --dry-run and --damp-runIan Jackson2022-09-04
| | | | | | Code motion. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* docs: Update for changes to dgit push-*, and recommend push-sourceIan Jackson2022-09-04
| | | | | | | | | | | | | In command line runes and examples, generally change to "dgit push-source". In running text whwere we talk about "push or push-source", change to "push-built or push-source". In running text where we talk loosely about "push", leave it that way. Closes: #992606 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* docs: dgit(7): Update for change to dgit push-*Ian Jackson2022-09-04
| | | | | | | We speak here of "dgit push-*" when we mean "push-source or push-built or push". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push: Update testsIan Jackson2022-09-04
| | | | | | | | | | | | Change the global test git config to reject plain "git push". Update almost all tests to use "push-built". In some cases, change to using "push-source". In one case (chosen essentially arbitrarily), use the config override and continue using push to mean push-built. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push: Make it warn (by default)Ian Jackson2022-09-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push-*: Provide push-built; make push be an aliasIan Jackson2022-09-04
| | | | | | | | | | No overall chagne in behaviour since in this commit the default configuration is "built". However, the documentation already anticipates the change to add the warning. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* quiltify_trees_differ: Fix comment to reflect what we do nowIan Jackson2022-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: unrepresentable check: Restrict occurrence of LATE:Ian Jackson2022-09-03
| | | | | | | | | This represents a poor outcome which happily no longer occurs unless the user is using the deprecated-by-us "single-debian-patch" features. For more discussion see comments in quilt_fixup_dpkgsource_singlepatch. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: unrepresentable check: Remove BUILD: outcome caseIan Jackson2022-09-03
| | | | | | This represents a poor outcome which happily no longer occurs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* docs: No longer recommend single-debian-patch anywhereIan Jackson2022-09-03
| | | | | | See #1018984. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Provide --quilt=singleIan Jackson2022-09-03
| | | | | | | This is to replace single-debian-patch. Closes: #1018984 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit; Pass --include-removal to dpkg-source -bIan Jackson2022-09-03
| | | | | | | Now, with single-debian-patch, we can still handle file removals. (This may fix other corner cases too.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: unrepresentable check: Don't tolerate symlink creationIan Jackson2022-09-03
| | | | | | | | | | | | git diff can represent changes to symlinks, but dpkg-source uses diff(1) to apply changes, and git diff cannot. The result if we permit them is that we end up making source packages that can't be built, or aren't treesame to our HEAD. Reject this early. This resolves the error handling regression in dgit: quilt fixup: Don't use dpkg-source --commit, but git diff Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: unrepresentable check: Normalise the mode for execIan Jackson2022-09-03
| | | | | | | | | | | | | Now we use git diffs, which can represent changes to the executability of files. dpkg-source uses diff(1) to apply these. So it all works. Handle this by normalising the +x bits before seeing if the mode changed. Now we properly support executable files. Closes: #995056 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt fixup: Remove some now-unneeded "git checkout"Ian Jackson2022-09-03
| | | | | | | | | quiltify_make_dpkg_patch now uses git diff which doesn't require us to update the working tree. We still need to do it at the end, because the next steps expect it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt fixup: Don't use dpkg-source --commit, but git diffIan Jackson2022-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | There are many things that dpkg-source can successfully extract, but which it can't create. (This is because dpkg-source largely delegates application to diff(1), and diff can do many more things nowadays.) Most real packages were made with git-format-patch or equivalent nowadays, so use of these features is common. (Hence #949675 and #995056, where even glibc has patches that dpkg-source cannot make.) Right now the practical consequences are: * Creating an executable file is fixed. This actually completes the work for #949675. * Creating a symlink has a regression in the error handling. Previously, dpkg-source --commit failed during quilt fixup. Now, we happily git diff which generates a patch that dpkg-source can't apply. We're going to fix this soon by aligning the representable change checking with reality. * It's faster and less complicated. Closes: #1018143 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quiltify_make_dpkg_patch: Pass git treeish'sIan Jackson2022-09-03
| | | | | | It will need these for running git diff. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quiltify_make_dpkg_patch: RenameIan Jackson2022-09-03
| | | | | | This is going to stop using dpkg-source. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: unrepresentable: Add test case for adding executable fileIan Jackson2022-09-03
| | | | | | | | | | | | | | | | | | A test case like this was removed in a0ac573f8359 dgit: tolerate making quilt patches creating +x files That removal was a mistake. We should have changed the test outcome. In fact, right now the test outcome is that we can't in fact make new patches like this, because dpkg-source can't. When we try, we createa source package which doesn't represent our git tree. However, dpkg-source can *apply* such patches if they already exist. In #949675, there was an *existing* patch with this property. We don't test for this separately, and never have. Instead, I propose to make all dpkg-source-applicable patches creatable by dgit. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt_fixup_dpkgsource_singlepatch: Add bug commentaryIan Jackson2022-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Test dpkg-source debian-single-patch with strange changesIan Jackson2022-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: unrepresentable: Prep for richer bahvioursIan Jackson2022-09-03
| | | | | | | | | | | | | We are going to want to run these tests in different modes, and the results might vary between mode. So encode the expected results in the *arguments* to the sub-test finish subroutine (which we rename). The filenames go on the sub-test start subroutine. finish is going to gain features. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Rename quilt_fixup_dpkgsource_singlepatch and add commentIan Jackson2022-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: commentary: improve a diagramIan Jackson2022-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out quiltify_check_unrepresentableIan Jackson2022-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Dpkg::Source::Package: Fix require_valid_signature optionIan Jackson2022-09-03
| | | | | | | | | Dpkg::Source::Package::new takes both %opts and `options`, one nested within the other. Closes: #964286 Suggested-by: Guillem Jover <guillem@debian.org> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dry run: Improve a message - fixupIan Jackson2022-08-25
| | | | | | Fix for "invalid variable interpolation" in i18n. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 00:33:41 +0000