summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* dgit build: Warn if --build-products-dir is not `..'.Ian Jackson2018-07-29
| | | | | | Closes:#904859. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Improve and correct --build-products-dir description.Ian Jackson2018-07-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit import-dsc --build-products-dir.Ian Jackson2018-07-29
| | | | | | | Add t-buildproductsdir-config to import-nonnative, which will do as a test I think. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-import-chk: Honour $bpdIan Jackson2018-07-29
| | | | | | No functional change because none of the import tests set this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Remove // from inside conditionalsIan Jackson2018-07-29
| | | | | | | | | | | This idiom is terse, but quite confusing. Instead, handle the undef case explicitly. While we are editing these: * Change two internal errors from die to confess * Fix a die in git-debrebase which ought to be badusage Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.2Ian Jackson2018-07-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 6.1debian/6.1archive/debian/6.1Sean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: close bug requesting pbuilder supportSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit(1): replace use of 'recalled'Sean Whitton2018-07-28
| | | | | Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit(1): don't have pbuilder description refer to sbuild descriptionSean Whitton2018-07-28
| | | | | Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: add stubbed test for pbuilder subcommandSean Whitton2018-07-28
| | | | | | | pbuilder requires root, but we want to be able to test the subcommand outside of autopkgtest too. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: add t-pushed-good-check-changesSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: add t-push-includedSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* debian: suggest sbuild | pbuilder | cowbuilderSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit(1): document new pbuilder and cowbuilder subcommandsSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: move cmd_sbuildSean Whitton2018-07-28
| | | | | | No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: new 'pbuilder' and 'cowbuilder' subcommandsSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: remove dead $need_split_build_invocation code pathSean Whitton2018-07-28
| | | | | | No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: factor out build_with_binary_builder()Sean Whitton2018-07-28
| | | | | | The pbuilder and cowbuilder subcommands will reuse this code. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: fix a reference to parent directorySean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: set $dscfn in build_or_push_prep_early()Sean Whitton2018-07-28
| | | | | | No functional change. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: opts_opt_multi_cmd: New @$extra featureIan Jackson2018-07-28
| | | | | | Adjust the existing call sites. NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Update copyright yearsSean Whitton2018-07-27
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.1Ian Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 6.0, and document remaining thingsdebian/6.0archive/debian/6.0Ian Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: categorise, and add a few missing thingsSean Whitton2018-07-26
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Abolish move_dsc_to_bpdIan Jackson2018-07-26
| | | | | | | | | | | | | This subroutine only has one caller. It also contains a bit of duplication both within itself and compared to its caller - the calls to mv and its error handling - which is annoying to remove as it is. Instead, put its code into build_source, and break out a private subroutine $mv for the rename. No functional change other than to messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add t-buildproductsdir-config to some sbuild testsIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Revert "dgit: Move up $sourcechanges"Ian Jackson2018-07-26
| | | | | | This reverts commit 07437a3fe514da7990300b2fd594adff49685de5. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Move cmd_push_source down the fileIan Jackson2018-07-26
| | | | | | Pure code motion. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add a couple of t-buildproductsdir-configIan Jackson2018-07-26
| | | | | | | | Add t-buildproductsdir-config to all build-modes tests and to push-source. This will probably catch almost all of the ../ bugs (#863582). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Use $bpd in several places where it is neededIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Provide a gbp.conf which sets --export-dir to $bpdIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Introduce $bpd variable (nfc)Ian Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite lib: add t-buildproductsdir-configSean Whitton2018-07-26
| | | | | | | No users yet so NFC. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: push_source no longer cleans the tree.Ian Jackson2018-07-26
| | | | | | This is no longer needed because we always build in a playtree. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build_source mostly uses a playtree, not $maindirIan Jackson2018-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, it uses a playtree unless we are trying to include uncommitted changes in the source package (which is not supported in split brain mode). This change allows build_source to respect $buildproductsdir. It will also enable, later, building a source package from HEAD, or arbitrary git ref, when the working tree is dirty. This change also requires modifying build_prep to only conditionally clean $maindir. It should clean $maindir only when it's $maindir that we're packing into a source package, or when we are running any builder in $maindir. When we are using a playtree we must build the changes file there too, because dpkg-genchanges cannot be persuaded to look for the .dsc anywhere but ../. Right now build-source still cleans the tree needlessly. We need to change the test suite to not expect a clean unless running a builder: dgit now cleans the tree only when including uncommitted changes in a source package, and when running a builder in $maindir. The code in lib-build-modes does not test the including of uncommitted changes in a source package. Thus, it should expect the tree to be cleaned only when running a builder. Also, we need to not expect a clean with sbuild, for the same reason. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Drop alwayssplit testsIan Jackson2018-07-26
| | | | | | | | | | Since dgit: make $need_split_build_invocation always true this option has had no effect, so these tests are redundant. And change the comment in dgit near the option parsing. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: quilt-splitbrains: Drop non-wgf dpm test of gbp packageIan Jackson2018-07-26
| | | | | | | | | Soon, dgit push-source will no longer clean the tree. So this test will be of no use. Also, it will fail because the error message changes. Delete it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build_prep: Provide it with $wantsrcIan Jackson2018-07-26
| | | | | | No functional change yet as it doesn't use it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build_source: drop call to build_prepIan Jackson2018-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | We want the callers to do this so they can control it better. They mostly already do. In detail: * cmd_push_source This one is most complicated. It already calls prep_push, which does a variety of things which overlap with build_prep. The things which are in build_prep but not in prep_push are: - notpushing (via build_prep_early), which seems to be a mistake - clean_tree(), which is needed, so we add it (for now...) - build_maybe_quilt_fixup, which is needed, so we add it - remove old changes, which is not actually needed * cmd_build, cmd_gbp_build build_prep was already called by the if arm which didn't call build_source; so we can just move it up outside the if. No functional change here. * cmd_build_source, cmd_sbuild We need to replace the call. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build_source: Drop call to build_prep_earlyIan Jackson2018-07-26
| | | | | | | | | build_prep starts with a call to build_prep_early so this is redundant (and confusing). Effect is to sometimes no longer duplicate some effort. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Abolish build_source_for_pushIan Jackson2018-07-26
| | | | | | | | | This sub has only one caller and the indirection is not really helpful IMO. NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build_source_for_push does not try to unapply patchesSean Whitton2018-07-26
| | | | | | | | build_source_for_push should now always build in a worktree, so patches should never be applied dirtily to $maindir. Die if it turns out they were. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: Move up $sourcechangesIan Jackson2018-07-26
| | | | | | | | This is not really ideal, but cmd_push_source needs it. For now do it like this. I may move cmd_push_source further down the file, later, and then we can revert this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Support run-all -p, DGIT_TESTS_PROGRESSIVEIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Drop dependency arrangement for tests/tmpIan Jackson2018-07-26
| | | | | | | | run-all makes the directory now adays so this is not needed. It's going to be harmful for --progressive, since it would make make want to rerun things every time tests/tmp/ is updated. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: run-all: Minor refactoring etc.Ian Jackson2018-07-26
| | | | | | | | | | | * Makefile: Move the DGIT_TEST_RETRY_COUNT if/else into the rule. This removes a small amount of duplication. * run-all: Document the option to pass explicitly list of scripts. * run-all: Add an option parser, which currently supports no options. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the ↵Ian Jackson2018-07-26
| | | | | | sbuild tests. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 11:26:29 +0000