summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* dgit: make $need_split_build_invocation always trueSean Whitton2018-07-26
| | | | | | | | | | | | | | | | | dgit will always build the source package. One minor consequence is that dgit will usualliy generate *_multi.changes rather than *_$arch.changes, so we need to update the one test that makes the contrary assumption. Bump the dgit major version number as this is quite a significant change in implementation and also a behavioural change. This change makes a lot of code dead. Removing that is left as a task for the future. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Move WANTSRC_* definitions up the fileIan Jackson2018-07-26
| | | | | | We are going to want these a bit earlier. NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Disregard *_multi.changes for .changes ambiguity purposesIan Jackson2018-07-26
| | | | | | | | | | | | | | | | | | | | | | The changes file ambiguity problem arises because dgit does not know what architecture changes file the build is going to generate. (To know that it would have to delve even more into the command line options the user is passing through dgit to the builder.) dgit --always-split-build generally makes a _multi.changes file, because it merges source changes with binaries from the build. We are going to make --always-split-build the only way things are done. This would result in lots more situations where --rm-old-changes is needed. However, actually, we can assume that the builder does not generate a *_multi.changes. That will allow us to spot the builder-generated changes file even if there is already a dgit-generated *_multi.changes file from a previous build. So: disregard _multi.changes, both when pre-checking for confusing files, and when actually figuring out what the build produced. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: push-source dies if user tried to include uncommitted changesSean Whitton2018-07-26
| | | | | | | This does not make sense because you cannot dgit push uncommitted changes. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: don't let the user pass --include-dirty in split brain modeSean Whitton2018-07-26
| | | | | | | It is not supported. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Rename --ignore-dirty to --include-dirtyIan Jackson2018-07-26
| | | | | | Leaving the old name supported as a deprecated alias. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: linkorigs: Fix error handling when bpd missingIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: bpd_abs(): Fix return value when bpd is absolute.Ian Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: massage_dbp_args: Make names for $wantsrc valuesIan Jackson2018-07-25
| | | | | | | | | | | | | | | | 0 - source will NOT need to be built separately by caller +1 - source will need to be built separately by caller +2 - source will need to be built separately by caller AND So: 0 => WANTSRC_BUILDER +1 => WANTSRC_SOURCE | WANTSRC_BUILDER +2 => WANTSRC_SOURCE No functional change except to debugging output. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document some recent changesIan Jackson2018-07-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rename $ignoredirty -> $includedirtySean Whitton2018-07-25
| | | | | | This better reflects the effects that the option has. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: rename two quilt_fixup_ functionsSean Whitton2018-07-25
| | | | | | | | They are useful for doing things other than quilt fixup. No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: actually respect $buildproductsdir in many placesSean Whitton2018-07-25
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Provide $bpd_globIan Jackson2018-07-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: add dgit.default.build-products-dir git configuration keySean Whitton2018-07-25
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* messages: Be a lot more friendly about NEW in particularIan Jackson2018-07-25
| | | | | | And also add a couple of `please's. Closes:#904448. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* apt-get method: when apt does not update release files, print hintIan Jackson2018-07-23
| | | | | | | | | | | | Unconditionally print hint about noatime. This problem seems to occur quite rarely (noatime is out of fashion nowadays, and I haven't seen any other causes) so it doesn't seem worth fiddling about writing code to determine the mount options. Instead, print a hint and let the user investigate. Closes:#851873. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: unset VISUAL, which interferes.Ian Jackson2018-07-23
| | | | | | Closes:#904308. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.11Ian Jackson2018-07-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.10debian/5.10archive/debian/5.10Ian Jackson2018-07-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* infrastructure: Run git gc --auto before mirroring. Closes:#841414.Ian Jackson2018-07-14
| | | | | | | | | | | | This would not have avoided the trouble reported here https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841414#74 Empirically, I managed to work around the problem by running `git gc' (rather than `git gc --auto') and then rsyncing the result to the mirror. I will request that DSA increase the RAM (or swap) size on the relevant host. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Drop a couple of useless test log output lines.Ian Jackson2018-07-14
| | | | | | | We don't need these (((((((((( )))))))))) now that it's just one line inside them. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: rework for merging experimental tests into masterIan Jackson2018-07-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.9+exp4debian/5.9+exp4archive/debian/5.9+exp4Ian Jackson2018-07-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tar up the artifacts, and name the tarball after the testIan Jackson2018-07-13
| | | | | | | | | | | | | | | Naming the output after the test works around #903696. tarring the whole lot up turns out to make it a lot smaller. Before: $ du -sk ; du -sk --apparent-size 1640 . 853 . After: 236 . 235 . Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: chmod a+r $AUTOPKGTEST explicitly.debian/5.9+exp3archive/debian/5.9+exp3Ian Jackson2018-07-13
|
* test suite: Do not save non-world-readable artifactsdebian/5.9+exp2archive/debian/5.9+exp2Ian Jackson2018-07-13
| | | | | | | | | Save things to $AUTOPKGTEST_ARTIFACTS without preserving access control information. Works around #903680. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.9+exp1debian/5.9+exp1archive/debian/5.9+exp1Ian Jackson2018-07-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Save much stuff to $AUTOPKGTEST_ARTIFACTS.Ian Jackson2018-07-12
| | | | | | | | | We take some care to make this of reasonable size. In particular, we delete raw tarballs (typically, IMPORT) and .git's sample hooks. And, we git gc the git trees. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Introduce playtree-save-refsIan Jackson2018-07-12
| | | | | | | | | Arranges for all the refs in each playtree to be saved in the parent's ref namespace. This is going to be used when running git-gc when saving artifacts. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Drop t-ok from setup/*Ian Jackson2018-07-12
| | | | | | | | | t-ok is going to save artifacts, which we don't want these to do. It is not actually needed. All it does that is useful is the fsck, which the actual tests will do. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Use dch -r -D sid '' not dch -r sid.Ian Jackson2018-07-12
| | | | | | | | | | | | | | | | | Bizarrely, dch -r [-D suite] runs $EDITOR but dch -r [-D suite] weevils ignores `weevils' but does not run $EDITOR. This is #903598. Apparently, this is well known, and convention is to pass ''. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903598#8. So use that. Closes:#903441. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Factor out t-dch-commit-rIan Jackson2018-07-12
| | | | | | | | The pattern `dch -r sid' is actually wrong and we will want to change it. See #903441 and #903598. For future-proofing, factor this out before we fix it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.9+exp1Ian Jackson2018-07-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.9debian/5.9archive/debian/5.9Ian Jackson2018-07-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): Suggest `gitk -- :.' tooIan Jackson2018-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): Document best gitk options. Closes:#901927.Ian Jackson2018-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): Add new subsection DISCUSSIONIan Jackson2018-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* NOTES.dgit-downstream-dsc.7.pod: WIP for #810829Ian Jackson2018-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-downstream-dsc(7): New manpage.Ian Jackson2018-07-09
| | | | | | Closes:#842643,#851194. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document reorganisationsIan Jackson2018-07-09
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-convert-gbp: drop --overwriteIan Jackson2018-07-09
| | | | | | With #903132 properly fixed, this is no longer needed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase convert-from-gbp: Add ffq checkIan Jackson2018-07-09
| | | | | | | | | 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. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase convert-from-gbp: Make it ff of dgit view, if we can.Ian Jackson2018-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | Look for dgit-generated tags so we can usually make the new branch ff of the dgit view. Specifically, we fish the most recent released version out of debian/changelog and look for a DISTRO/VSN tag and a corresponding archive/DISTRO/VSN tag. If this all looks good, we declare ff of archive/. This should avoid the need for dgit push --overwrite in most cases. We do not check the DISTRO name. In principle dgit could find the distro name from the suite name, but that makes the software layering quite complicated. (For example, we would have to provide a way to tell gdr what program to run for dgit, for the benefit of the test suite.) I think the current approach is good enough; there are not likely to be any tag pairs that look like the right kind of thing but are in fact something else entirely, so we're not likely to accidentally trash some wanted changes. Closes:#903132. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Set $|Ian Jackson2018-07-09
| | | | | | | | This will avoid pepeering everything with calls to flush. Without it some messages from ffq_check, say, can arrive after the stderr output from a subsequent snags_maybe_bail, which is quite confusing. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Provide snags_maybe_bail_earlyIan Jackson2018-07-09
| | | | | | No callers yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Replace `die badusage' with `badusage'.Ian Jackson2018-07-09
| | | | | | | | | badusage contains a call to finish. So the die is redundant and never gets called. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: ffq_check: Move defaults for $ff and $notff into subIan Jackson2018-07-09
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Move debinatag_maintview from dgitIan Jackson2018-07-08
| | | | | | | git-debrebase is about to want this for convert-from-gbp dgit split brain fixup. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Break out parsechangelog_loop from dgitIan Jackson2018-07-08
| | | | | | | | git-debrebase is going to want this. No functional change except to some debugging messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 04:56:39 +0000