summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Test suite: overwrite-splitbrains: New testIan Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* pseudomerge: Suppress checks in split brain mode with --overwriteIan Jackson2016-10-18
| | | | | | | | | | | | | | | If the user has specified an appropriate --overwrite (=VERSION with the archive's version, or without a version and the archive's version being in debian/changelog), do not do all the automatic checks. Instead, in this case, simply make the dgit view be a descendant of the archive, as instructed. Closes:#841101. When generating split brain pseudomerge with --overwrite Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* pseudomerge: When generating pseudomerge in quilt split brain mode due to ↵Ian Jackson2016-10-18
| | | | | | --overwrite, actually include the version number in the commit message. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: t-gbp-example-prep-no-ff: break out from t-gbp-example-prepIan Jackson2016-10-18
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* pseudomerge: Abolish confusing $dgitview variableIan Jackson2016-10-18
| | | | | | | | This seems mostly to have existed to avoid writing `my $cachekey' separately. It has no separate function from $dgithead AFAICT. Abolish it. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: ovewrite-junk: New testIan Jackson2016-10-18
| | | | | | Check that we can overwrite things even if the tags are broken. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: ovewrite-version: Add missing "echo ok."Ian Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* pseudomerge: In non-splitbrain, do not look at previous tagsIan Jackson2016-10-18
| | | | | | | | | | | We only want to know: is the current archive version what was specified in --overwrite=VERSION, or mentioned in the changelog with --overwrite (without VERSION). In that case we want to overwrite whatever it is, even if the tags are missing or broken. Prompted by #841101. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 2.3Ian Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.2debian/2.2Ian Jackson2016-10-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Detect SIGPIPE (and SIGCHLD) being blocked or ignored. Closes:#841085.Ian Jackson2016-10-17
| | | | | | | | In fact, it seems in my test that Perl resets SIGCHLD itself, printing something to stderr, so that trip does not actually fire. But it makes sense to keep it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian config; actually make split brain mode work. Closes:#841085.Ian Jackson2016-10-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.1archive/debian/2.1Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add test that #840989 is fixedIan Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Import handling Do not crash due in cloneIan Jackson2016-10-16
| | | | | | | | | | | Previously we failed to handle dpkg-parsechangelog SIGPIPE. Closes:#840989. Fixes: dgit: failed command: dpkg-parsechangelog --format rfc822 --all dgit: subprocess died due to fatal signal PIPE Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Filter out .../git-core from PATH so that we catch git-fooIan Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document git- prefix changesIan Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git- prefixes: Test suite: fix tests/tests/quiltIan Jackson2016-10-16
| | | | | | | Broken since 20ee7135bcbb "Test suite: quilt: Test that our patch makes it through dgit and gbp pq". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git- prefixes: Test suite: Fix t-gbp-example-prepIan Jackson2016-10-16
| | | | | | Broken ever since it was introduced. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git- prefixes: Fix dgit-repos-policy-debianIan Jackson2016-10-16
| | | | | | | | Use `git for-each-ref' instead of `git-for-each-ref'. Broken in 8a178bf100d4 "Tag change: Update dgit-repos-policy-debian". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git- prefixes: Change `git-foo' to `git foo' in messagesIan Jackson2016-10-16
| | | | | | No change other that to error messages, debug output, etc. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git- prefixes: Change `git-foo' to `git foo' in docs and commentsIan Jackson2016-10-16
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.0Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.0archive/debian/2.0Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Improve two error messages relating to .changes handling and sbuildIan Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Prepare for 2.0 (~~ right now)Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Do not fail when git requires --allow-unrelated-histories.Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: stunt parsechangelog: Some commented-out debuggingIan Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: tstunt-parsechangelog: Produce Timestamp fieldIan Jackson2016-10-15
| | | | | | Like official one does, nowadays. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: unset empty redacted pathsIan Jackson2016-10-15
| | | | | | Some programs might treat that as a path of implicitly ".". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Fix entirely-broken tstunt PERLLIB arrangementsIan Jackson2016-10-15
| | | | | | | | | | | | Specifically: * Properly dereference the variable when looking for the stunt dir to be there already * Do not add "." to the path if the path starts out empty. * Crash _with the right message_ in dpkg-parsechangelog if PERLLIB is unset. (PERLLIB mustn't be unset because we're trying to strip our own value from it.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: tstunt/dpkg-parsechangelog: Do not complain if PERLLIB is empty.Ian Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Minor tidying-upIan Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control: Add missing dependency on Text/Iconv.pmIan Jackson2016-10-15
| | | | | | | This was broken by 66a602dbe193 "dgit: When generating patch filenames from titles, first transliterate them (lossily) to ascii." Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control: Add missing dependencies to dgit-infrastructureIan Jackson2016-10-15
| | | | | | | | Now it doesn't Depend: dgit, it needs its own copies of these two. I have done git grep '^use' and it seems that these are the only ones that are needed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control: Add missing dependency on List::MoreUtilsIan Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Infra: dgit-infrastructure has, and uses, its own copies of the perl modulesIan Jackson2016-10-15
| | | | | | | | This avoids introducing a versioned dependency between dgit and dgit-infrastructure (and also makes it easier to test cross-version compatibility). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Infra: Introduce Debian::Dgit::InfraIan Jackson2016-10-15
| | | | | | | This is used by all the Perl in dgit-infrastructure.deb. So far it does nothing, so no functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add debhelper (>=8) to test suite's global Depends.Ian Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp: Check that we do not update user's HEADIan Jackson2016-10-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-splitbrains: Check that we do not update user's HEADIan Jackson2016-10-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Tidy up a bitIan Jackson2016-10-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit.1: Minor clarificationsIan Jackson2016-10-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Copyright: Actually provide copy of DCOIan Jackson2016-10-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Copyright: Mention, and provide copy of, DCOIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Copyright: Add notices to some more of the (larger) filesIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: When generating patch filenames from titles, first transliterate them ↵Ian Jackson2016-10-11
| | | | | | (lossily) to ascii. Closes:#834807. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Remove empty file - yay!Ian Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention that we don't set a fetch specIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Many BTS bugs now fixedIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 16:26:33 +0000