summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* changelog: Documentation changes and finalise 6.11debian/6.11archive/debian/6.11Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): Formatting & wording tweaksSean Whitton2018-08-26
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): Avoid some uses of =itemSean Whitton2018-08-26
| | | | | | | | Commands for the user to type into their shell should have empty lines above and below them; this ensures that. Admittedly while making the POD source harder to read. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-debrebase(7): demote "Inspecting the history"Sean Whitton2018-08-26
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* Drop obsolete local-pod-man script, now replaced by make %.viewIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Makefile: Adjust scope of dgit(7) pod ruleIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.11Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 6.10debian/6.10archive/debian/6.10Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Tidy up, preparatory to releaseIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Run gbp-dchIan Jackson2018-08-26
| | | | | | Needs tidying up. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Pass --no-source to sbuild (always)Ian Jackson2018-08-26
| | | | | | Closes: #904966. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit build --build=Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build-*: Cope with new-style --build= specificationsIan Jackson2018-08-26
| | | | | | Previously, we would generally bomb out. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: build-modes-*: Provide stunt dpkg-deb to pass -ZnoneIan Jackson2018-08-26
| | | | | | This speeds it up from about 105 seconds to about 90, on my laptop. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tstunt debchange: Use execIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit build with bpdIan Jackson2018-08-26
| | | | | | It's not expected to work. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build: Squash $buildproductsdirIan Jackson2018-08-26
| | | | | | | | | | Things malfunction, because some things end up in .. and some in bpd. Overriding this at least makes `dgit build' produce correct results, albeit in the wrong place. Closes: #906786. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: break out build-modes-sourceIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: build-products-dir: Check nothing in ../Ian Jackson2018-08-26
| | | | | | If bpd was set then .. shouldn't have this kind of junk in it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: sbuild-gitish: Do not use build-products-dirIan Jackson2018-08-26
| | | | | | | | The runes in the manpage assume it's not set, and we run sbuild directly anyway. We are about to check that nothing ends up in .. which is not true for this test. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gdr-fresh: Honour $bpdIan Jackson2018-08-26
| | | | | | | Nothing depends on this right now, but I don't want to leave this latent bug. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: run-all: Understand `:' speciallyIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: run-all: Move setting of TESTSCRIPTSIan Jackson2018-08-26
| | | | | | NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: run-all: Honour DGIT_TESTS_TMPDIRIan Jackson2018-08-26
| | | | | | | | | | | If this variable is set, tests/tmp will be made a symlink to a real subdirectory under $DGIT_TESTS_TMPDIR. The real subdirectory will be removed and recreated as tests/tmp would otherwise be. I set it to /run/user/`id -u`/dgit-tests-tmp Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: run-all: Without --progressive, rm and recreate tests/tmpIan Jackson2018-08-26
| | | | | | | | | This arranges to rerun tests/setup/ scripts, which wouldn't otherwise happen; that is IMO a bug. While we are here, introduce $tmpdir. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Work if $tmp is on a different filesystem.Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-makepatches7: use t-make-origIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-fresh: use t-make-origIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: t-make-orig: Pass -1 to gzipIan Jackson2018-08-26
| | | | | | This makes everything faster. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-gdr: Factor out t-make-origIan Jackson2018-08-26
| | | | | | NFC, overall. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): Add runes for inspecting historyIan Jackson2018-08-26
| | | | | | | | | I'm not sure if this is the right place but I wanted to publish this information sooner rather than later. Closes: #907190. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-new-upstream: Test updating existing clog entryIan Jackson2018-08-26
| | | | | | This is the test case for #905888. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Use debchange for new-upstream changelog entryIan Jackson2018-08-26
| | | | | | Closes: #905888. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Update date to one with nontrivial DST in Europe/LondonIan Jackson2018-08-26
| | | | | | This may make more things fail for me if they have timezone bugs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: debchange: Work around faketime TZ bugIan Jackson2018-08-26
| | | | | | | | | faketime's CLI does not permit correct unparsing of times in arbitrary timezones. So we must save and restore TZ. See #907264. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: debchange: Freeze timeIan Jackson2018-08-26
| | | | | | | Use faketime's advanced format. Otherwise if debchange takes too long, the timestamp generated by debchange is not what we expected. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: dch: Always use tstunt/debchangeIan Jackson2018-08-26
| | | | | | | | | | | | | | We are going to make this more sophisticated, so use it everywhere to avoid duplication. We need to soup up tstunt/debchange so that it does not depend on DGIT_TEST_REAL_DEBCHANGE. If it hasn't been put on the PATH by t-tstunt, that isn't set, and we can just run debchange from PATH. This makes faketime a test dependency for all the tests which don't have NO-DEFAULT. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-new-upstream: Break out clog-check-[12]Ian Jackson2018-08-26
| | | | | | NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-new-upstream: Use new branch rather than resetIan Jackson2018-08-26
| | | | | | | | | This makes it slightly easier to see what's going on, and to extend the test. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-newupstream: Add more dividersIan Jackson2018-08-26
| | | | | | NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Prepare for calling debchangeIan Jackson2018-08-26
| | | | | | | * Add it to the .deb dependencies * Add tstunt/debchange to the gdr tests Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Provide tstunt/debchangeIan Jackson2018-08-26
| | | | | | | | This uses faketime to get the date right, like t-dch does. It has to be requested with t-tstunt debchange, which nothing does yet, so NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-new-upstream: Check changelog is exactly rightIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: gdr-merge-conflicts: Call git merge --no-editIan Jackson2018-08-26
| | | | | | The default seems different in my sid chroot. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: test-list-uptodate: Drop imports and dependenciesIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-fresh: Drop use of git-deborig and fix dependenciesIan Jackson2018-08-26
| | | | | | | | | | | | | | | | | | | | b765388a4cea "test suite: Test dgit calling git-debrebase on new debianisation" failed to update the test dependencies, and does not work in a formal autopkgtest run because dgit is not installed. Additionally, Because scripts in devscripts have their own individual dependencies, and the dependencies for git-deborig differ between stretch and sid, It is not reasonably possible to write a dependency which allows git-deborig to work. This is another reason why this test does not work in a formal run (this time, failing only on sid/buster). So, drop use of git-deborig, and the resulting dependency on devscripts. (dgit and git-debrebase pull in devscripts anyway, so that is academic.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): Document new understanding of debrebase-lastIan Jackson2018-08-25
| | | | | | | | | | | Bug #907208 shows that the previous statement wasn't true. debrebase-last is still marginally useful: we use it for deciding what hints to print in some error messages; detecting and rejecting attempts to convert already-converted branches; and in `git-debrebase status'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: branch_is_gdr: Add a cautionary commentIan Jackson2018-08-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit calling git-debrebase on new debianisationIan Jackson2018-08-25
| | | | | | | | | | | | | | | Now all the cases in dgit's branch_is_gdr history walker are tested: DGIT_TEST_DEBUG=-DD tests/using-intree tests/run-all cat tests/tmp/*.log |perl -ne 'next unless s/^branch_is_gdr \w+ //; print' |sort -u |less Produces the same list as: git-grep 'branch_is_gdr ' | perl -pe 's/^^dgit:\s+//' |sort |less (With the list of gdr commit annotations the same as in the source.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebse: merge handling: Handle absence of patches via $anyIan Jackson2018-08-25
| | | | | | | This saves testing for $seriesfile existence and makes the code slightly less tangled. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>