summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* dgit; dsc Dgit field handling: Properly resolve the commit in the dscIan Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: config debugging: do not print ARRAY(0x...)Ian Jackson2017-01-08
| | | | 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: 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>
* 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: 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>
* 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>
* 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>
* test suite: New test for history-rewritingIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.16~Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.15 (will not be uploaded)Ian Jackson2017-01-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge tag dgit/2.14 into `defence in dgit-repos-server' branchIan Jackson2017-01-05
|\ | | | | | | | | | | | | | | | | | | Fix up semantic conflict: the new git-fsck test (in 2.14) fails on the new broken commits (in the `defence in dgit-repos-server' branch). We need to disable this. Ideally we would make a tighter test, but that's too much to do in a merge. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 2.14debian/2.14archive/debian/2.14Ian Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Document changesIan Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: start 2.14Ian Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: start 2.14Ian Jackson2016-12-21
|/ | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.13debian/2.13archive/debian/2.13Ian Jackson2016-12-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: document dgit-sponsorship fixIan Jackson2016-12-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: document dgit-maint-gbp fixIan Jackson2016-12-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import fix: Switch back to unpa branch on patch import iterations.Ian Jackson2016-12-20
| | | | | | | In particular, do not fail utterly if dpkg-source and gbp disagree. Closes:#848843. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Improve "cannot represent change" messageIan Jackson2016-12-20
| | | | | | Print the git old and new modes too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* quilt fixup: Permit creation of patches which delete filesIan Jackson2016-12-20
| | | | | | | | | | | By psssing --include-removal to dpkg-source, and tolerating it when we do our quilt fixup analysis. dpkg-source has supported this since at least stretch. Closes:#848901. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.13Ian Jackson2016-12-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.12archive/debian/2.12Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd/git: Do not fail to import a .dsc containing patches to .git/ (!)Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd/git Do not fail to import certain weird .dscsIan Jackson2016-12-19
| | | | | | | | | | | | | | A .dsc containing patches which patch files multiple times would be rejected by dpkg-source due to #848611. Work around this by arranging for the patch of interest to never be the first patch, by introducing (and then evaporating) a dummy patch. Yuk. Closes:#848391. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Produce better error reporting when absurd git wrapper fails on a patchIan Jackson2016-12-19
| | | | | | | | | | | | | | | | | | | | | | | | during .dsc import. Apropos of #848391. gbp swallows the error from the first run (without --whitespace=fix). Previously only that first run would do anything useful; the second would complain about --whitespace=fix. So failures of dpkg-source would always produce a useless error message. Instead, tolerate (and ignore) the --whitespace=fix option which gbp passes during the second run. This means that the second run tries to do the actual work. This only does extra work if the first run failed, and since the first and second runs are now equivalent, that happens when the second run fails too. But in return for that extra work, we get a report which actually mentions something that unexpectedly went wrong. (The alternative would be to have absurd/git try to stash and then reproduce its previous error, or to make more fragile assumptions about gbp's behaviour.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Do not fail when cloning a package containing dangling symlinks.Ian Jackson2016-12-19
| | | | | | Closes:#848512. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* By default, generate a DEP-14 tag as well as a dgit archive/* tagIan Jackson2016-12-19
| | | | | | | | Even in non-split-view quilt modes. Closes:#844129. This breaks one of the test suite test cases, so disable it there. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Suppress some leftover debugging output from import-dsc. Closes:#847658.Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* If we cannot hardlink origs into our extraction area, use symlinks instead.Ian Jackson2016-12-19
| | | | | | Closes:#844570. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Give better advice if .dsc/.changes signing failsIan Jackson2016-12-19
| | | | | | | If no changes are needed to the package, user may indeed just debsign and dput. Closes:#844131. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention #844128Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document closure of #847987Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Slightly better message when .dsc not found.Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Version tags mangling: Protect dots, as per proposed update to DEP-14.Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention dgit-maint-merge changesIan Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Provide and use stunt lintian and debuildIan Jackson2016-12-19
| | | | | | | | | This avoids lintian complaining about our stupid test packages. We need the stunt debuild because debuild likes to launder the environment, removing our stunt lintian from PATH ! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>