summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Dgit.pm: git_cat_file: clarify scalar context semanticsIan Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git fetching: Use basedistro for lrfetchrefsIan Jackson2017-01-08
| | | | | | | These do not need to vary with the suite, because the refs are named, within this namespace, after the corresponding refs on the server. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git fetching: Move lrfetch* down in the fileIan Jackson2017-01-08
| | | | | | Code motion only. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git fetching: Break out git_lrfetch_saneIan Jackson2017-01-08
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: dsc Dgit field handling: Break out resolve_dsc_field_commitIan Jackson2017-01-08
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: dsc Dgit field handling: Parse additional dataIan Jackson2017-01-08
| | | | | | | So far we don't do much with it, so this akes no change except to messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Dgit parsing: Move @ourdscfield loop into parse_dsc_fieldIan Jackson2017-01-08
| | | | | | | This gives it the $dsc. Also it means that import-dsc will understand very old .dscs with Vcs-Dgit-Master. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Enforce a syntax for nominal distrosIan Jackson2017-01-08
| | | | | | | | These appear in various interchange output like tags. They should be sane. They're going to appear in Dgit: too where people will need to use them. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Dgit parsing: Refactor into parse_dsc_fieldIan Jackson2017-01-08
| | | | | | No functional change other than changes to messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Protocol change: Add distro info to Dgit fieldIan Jackson2017-01-08
| | | | | | | | | | | | Downstream clients may need this to get the relevant git commits. Worse, with the new rewrite functionality, they may get the _wrong_ commits because they may not be rewritten. For now we implement the publication side. The reader side is theoretically straightforward, but probably not so simple in reality, and certainly fiddly to test. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Option parsing: Move notpushing call in fetch/pullIan Jackson2017-01-08
| | | | | | We should use the calculated $idistro and $isuite Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Option parsing: combine parseopts_late_defaults and finalise_opts_optsIan Jackson2017-01-08
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Option parsing: Move parseopts_late_defaults textuallyIan Jackson2017-01-08
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Option parsing: Fix distro/suite reference bugsIan Jackson2017-01-08
| | | | | | | | | | | | | | | By moving parseopts_late_defaults call. This is conceptually the same as finalise_late_opts, so do it there. We have to add a missing call to build_prep_early, as otherwise we call massage_dbp_args too soon. Also move a nopushing() call until after $isuite is set All of this means that we now honour $isuite (and sometimes $idistro) much better. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Option parsing: Make function parseopts_late_defaultsIan Jackson2017-01-08
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Option parsing: Provide call to build_prep_early in build_sourceIan Jackson2017-01-08
| | | | | | This means $isuite is set a bit earlier, etc. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Option parsing: quilt-fixup: Use build_prep_earlyIan Jackson2017-01-08
| | | | | | | | This means $isuite is set early enough. As a side-effect, we correctly reject -p. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Allow overriding of -dtest-dummy dgit argumentIan Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-reprepro: Allow configuring for another distroIan Jackson2017-01-08
| | | | | | | | | We can now make a second `distro' this way, with some additional optional arguments. No functional change for existing call sites. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-reprepro: Add a couple of commentsIan Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Refactor lib-repreproIan Jackson2017-01-08
| | | | | | | | | * Break out t-reprepro-cfg. * Introduce the variables `mir' and `etcapt' to many functions. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add t-stunt-parsechangelog to a few tests which were missing it.Ian Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Parse Dgit: field properly (look for initial \w+ only)Ian Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: import-dsc: Parse `Dgit:' field properly, using only \w+Ian Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gbp-orig: Add a missing -mIan Jackson2017-01-08
| | | | | | Without this, it would run an editor if stdout was a tty (!) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Do not investigate symrefsIan Jackson2017-01-08
| | | | | | | | | Closes:#850547. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> dgit-badcommit-fixup: * Do not investigate symrefs. Closes:#850547.
* test suite: lib-orig-include-exclude Strip block count out of find -lsIan Jackson2017-01-08
| | | | | | | | | | | | | | | | | | This is unstable! I have just seen it vary spontaneously in the middle of a test run, resulting in this: ++ diff -u ../before ../after --- ../before 2017-01-08 21:39:48.176033763 +0000 +++ ../after 2017-01-08 21:39:48.208033833 +0000 @@ -1,2 +1,2 @@ - 208380 4 -rw-rw-r-- 9 ian ian 236 Nov 6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig-docs.tar.gz - 208381 4 -rw-rw-r-- 8 ian ian 373 Nov 6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig.tar.gz + 208380 4 -rw-rw-r-- 10 ian ian 236 Nov 6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig-docs.tar.gz + 208381 4 -rw-rw-r-- 9 ian ian 373 Nov 6 20:49 /home/ian/things/Dgit/2dgit/tests/tmp/orig-include-exclude-chkquery/mirror/pool/main/example_1.0.orig.tar.gz + test 1 = 0 + t-report-failure Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-orig-include-exclude: Introduce origs_findlsIan Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Arrange to pass --debug-quick-random to gpg-agent.Ian Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* badcommit-rewrite: Fix operation using installed version of fixup.Ian Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Generalise DGIT_TEST_REAL_<FOO> handlingIan Jackson2017-01-08
| | | | | | No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tests/run-all: Use a bit more cpuIan Jackson2017-01-08
| | | | | | Make allowance for tests that do a bit of downloading or whatever. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.17~ (again)Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.16.2debian/2.16.2archive/debian/2.16.2Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup; In --check mode, exit status 2 if things are not fineIan Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Fix crash when running for 2nd time in bare repo.Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.17~ (again)Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.16.1Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: New mode --check which is readonly.Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.17~Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.16debian/2.16archive/debian/2.16Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Put our version in our rewrite map commit messageIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Skip our own output refsIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Instructions commentIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Shell bug: avoid local=$(....) as it defeats set -eIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: badcommit-rewrite: Check HEAD manipulation is rightIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Do not detach HEAD - this is not neededIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: New test for history-rewritingIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Now seems to workIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Debugging (commented out)Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>