chiark / gitweb /
Ian Jackson [Tue, 17 Nov 2015 01:23:35 +0000 (01:23 +0000)]
quilt fixup: When using git-reset, pass -q
Ian Jackson [Sat, 7 Nov 2015 15:45:53 +0000 (15:45 +0000)]
dgit-repos-policy-debian: better error message when git-cat-file produces unexpected output
Ian Jackson [Sat, 7 Nov 2015 13:41:15 +0000 (13:41 +0000)]
dgit sbuild no longer deletes extranious .changes files; instead we rely on --rm-old-changes, or failing that, fail early.
Ian Jackson [Sat, 7 Nov 2015 13:13:59 +0000 (13:13 +0000)]
No longer tolerate a multitude of .changes files when doing push.
Instead, insist on a single one. This eliminates a potential for a
variety of surprises, where dgit would upload something different to
the user expected.
We no longer need to behave this way because nowadays the sbuild build
(which was the real use case, because it would generate a .source and
a .ARCH changes as well as the final .multi) renames the intermediate
changes files.
Also --rm-old-changes helps.
Ian Jackson [Sat, 7 Nov 2015 13:13:00 +0000 (13:13 +0000)]
Remove any pre-existing _source.changes file before building source, as a safety check.
Ian Jackson [Sat, 7 Nov 2015 15:46:25 +0000 (15:46 +0000)]
Tests: Use --rm-old-changes in build-mode tests
Soon, we are going to be stricter about detecting ambiguity about
which .changes file is intended when different build modes have been
used.
Ian Jackson [Sat, 7 Nov 2015 13:09:56 +0000 (13:09 +0000)]
Introduce --rm-old-changes to delete previous builds' changes files.
Ian Jackson [Sat, 7 Nov 2015 12:59:49 +0000 (12:59 +0000)]
dgit(1): Document the dgit-distro.DISTRO.quilt-mode config setting.
Ian Jackson [Sat, 7 Nov 2015 11:10:39 +0000 (11:10 +0000)]
Break out changespat (no functional change)
Ian Jackson [Fri, 6 Nov 2015 16:10:51 +0000 (16:10 +0000)]
When running dpkg-buildpackage, cope if user specified -g or -G.
Ian Jackson [Fri, 6 Nov 2015 14:32:03 +0000 (14:32 +0000)]
sbuild: Check that the binary .changes file doesn't contain a .dsc.
Ian Jackson [Fri, 6 Nov 2015 14:23:18 +0000 (14:23 +0000)]
sbuild: Rename the used-up .changes files to `.inmulti'
This avoids accidental use of the wrong one (by software, or by users).
Ian Jackson [Fri, 6 Nov 2015 14:21:54 +0000 (14:21 +0000)]
sbuild:: check that we have the right number of .changes files
Check that the set of .changes files found is as we expect, before
calling mergechanges.
Ian Jackson [Fri, 21 Aug 2015 15:40:37 +0000 (16:40 +0100)]
Test suite: Test quilt single-debian-patch
Ian Jackson [Sat, 7 Nov 2015 15:49:05 +0000 (15:49 +0000)]
Increase sqlite_busy_timeout in debpolicy-dbretry
zealot is very slow and we need to give the other processes time to
rollback and release the lock.
Ian Jackson [Sun, 6 Dec 2015 22:36:39 +0000 (22:36 +0000)]
test suite: Remove spurious .debs from example_1.0.tar
Ian Jackson [Fri, 1 Jul 2016 22:37:55 +0000 (23:37 +0100)]
Set GIT_COMMITTER_DATE and GIT_AUTHOR_DATE
This avoids most date dependencies: unless other measures are taken,
the commits and tags are identical iff they are constructed
identically. This makes the test suite more deterministic.
In drs-push-rejects test, increment them explicitly, so as to make all
of mktag's tags distinct objects.
Otherwise it can generate identical tags (now, always; previously,
only sometimes on fast computers), causing spurious variations in
behaviour (eg, things not being rejected because they do not represent
any change).
Ian Jackson [Thu, 30 Jun 2016 18:57:53 +0000 (19:57 +0100)]
build_source: Fix bad Perl poetry style
Pass --ch:* and -v options to dpkg-buildpackage when building source.
Fixes bad Perl poetry syntax. Closes:#829121.
Ian Jackson [Sun, 22 May 2016 14:45:13 +0000 (15:45 +0100)]
Properly substitute $changesfile in one of the `You can retry' messages. Closes:#800078.
Ian Jackson [Sun, 22 May 2016 14:28:18 +0000 (15:28 +0100)]
Print better error message (with `fail' rather than `die') if `dgit clone' cannot create the destination directory.
Ian Jackson [Sun, 22 May 2016 14:27:08 +0000 (15:27 +0100)]
Do not call "warn" on failure of cleanup handler in END block (since warn has been made fatal and aborts the cleanup chain).
Ian Jackson [Sun, 22 May 2016 14:24:08 +0000 (15:24 +0100)]
When cleaning up after failed clone, stat the to-be-cleaned-up directory before running rmtree on it. Closes:#796773.
Ian Jackson [Fri, 1 Jul 2016 21:33:55 +0000 (22:33 +0100)]
Put --no-arch-all in build-modes-sbuild act, not only its real_act
Cosmetic change only.
Ian Jackson [Fri, 1 Jul 2016 21:32:53 +0000 (22:32 +0100)]
Test suite: When sbuild fails, do not crash
... due to sed not finding the log file. Instead, simply tolerate the
absence of the log file.
Ian Jackson [Fri, 1 Jul 2016 21:28:29 +0000 (22:28 +0100)]
sbuild; Do not pass -A
Incompatible change:
* dgit sbuild does not pass -A to sbuild. Consequently the default
build is now simply sbuild's default. With older sbuilds it was
possible to override dgit's -A by passing another option. But this
has been changed recently and now this default setting is very
awkward to change for the dgit user.
Ian Jackson [Sat, 22 Aug 2015 14:31:07 +0000 (15:31 +0100)]
finalise 1.4
Ian Jackson [Sat, 22 Aug 2015 12:20:28 +0000 (13:20 +0100)]
changelog: Improve
Ian Jackson [Sat, 22 Aug 2015 10:22:12 +0000 (11:22 +0100)]
quilt-fixup checks that the git tree is clean, as for build-prep.
Ian Jackson [Sat, 22 Aug 2015 12:22:30 +0000 (13:22 +0100)]
Test suite: run quilt-fixup with -wgf in distropatches-reject, so that we don't need build-depends.
Ian Jackson [Sat, 22 Aug 2015 10:12:59 +0000 (11:12 +0100)]
forbidden files: check them properly
Ian Jackson [Fri, 21 Aug 2015 16:36:25 +0000 (17:36 +0100)]
With dgit sbuild, pass our -d before the user's arguments, so that the user can override it. Closes:#796019.
Ian Jackson [Fri, 21 Aug 2015 16:34:22 +0000 (17:34 +0100)]
quilt fixup: single-debian-patch is still broken in wheezy
Because dpkg-source -b breaks with single-debian-patch when the .pc is
missing, so this depends on split execution of the source package
build.
Ian Jackson [Fri, 21 Aug 2015 15:39:37 +0000 (16:39 +0100)]
quilt fixup: A few more progress messages
Ian Jackson [Fri, 21 Aug 2015 15:39:17 +0000 (16:39 +0100)]
Reject debian/source/local-patch-header
Ian Jackson [Fri, 21 Aug 2015 15:38:26 +0000 (16:38 +0100)]
quilt fixup: quilt_fixup_linkorigs more debugging output
Ian Jackson [Fri, 21 Aug 2015 12:11:28 +0000 (13:11 +0100)]
Cope properly with `3.0 (quilt)' with single-debian-patch. Closes:#796016.
Ian Jackson [Fri, 21 Aug 2015 12:09:08 +0000 (13:09 +0100)]
quilt fixup: Break out quilt_fixup_delete_pc (nfc)
Ian Jackson [Fri, 21 Aug 2015 12:08:23 +0000 (13:08 +0100)]
quilt fixup: Break out quilt_fixup_linkorigs (nfc)
Ian Jackson [Fri, 21 Aug 2015 12:08:02 +0000 (13:08 +0100)]
quilt fixup: Break out quilt_fixup_mkwork (nfc)
Ian Jackson [Fri, 21 Aug 2015 12:06:31 +0000 (13:06 +0100)]
quilt fixup: break out quilt_fixup_multipatch ready for quilt_fixup_singlepatch
Functional change: bomb out with die if single-debian-patch, rather than going wrong
Ian Jackson [Fri, 21 Aug 2015 11:51:39 +0000 (12:51 +0100)]
In --dry-run mode, _do_ actually run dpkg-source --commit so that we actually do construct the quilt fixup commit; instead, honour --dry-run by avoiding pulling it back to your HEAD.
Ian Jackson [Fri, 21 Aug 2015 09:37:11 +0000 (10:37 +0100)]
get_source_format returns the debian/source/options, too (nfc since no users yet)
Ian Jackson [Thu, 20 Aug 2015 13:00:42 +0000 (14:00 +0100)]
Copy debian/source/options into fake dsc
Ian Jackson [Thu, 20 Aug 2015 12:52:26 +0000 (13:52 +0100)]
Refactor coping with maybe-existing files in fake dsc
Ian Jackson [Wed, 19 Aug 2015 15:35:51 +0000 (16:35 +0100)]
Detect and reject git trees containing debian/source/local-options.
Ian Jackson [Tue, 18 Aug 2015 15:18:34 +0000 (16:18 +0100)]
In dgit(7), discuss binaries and documentation present in upstream but removed by rules clean.
Ian Jackson [Tue, 18 Aug 2015 15:18:09 +0000 (16:18 +0100)]
When quilt linearisation fails, print the right information in the error message. (This has been broken forever.)
Ian Jackson [Tue, 18 Aug 2015 14:35:17 +0000 (15:35 +0100)]
When running git-add in commit-quilty-patch, use -f and sometimes -A, so as to avoid being broken by any .gitignore, etc.
Ian Jackson [Tue, 18 Aug 2015 14:30:07 +0000 (15:30 +0100)]
When running git-add in commit-quilty-patch, properly escape filenames (which git-add treats as glob patterns).
Ian Jackson [Tue, 18 Aug 2015 14:15:15 +0000 (15:15 +0100)]
Unbreak --dry-run (`exiting subroutine via next', broken in
ac221d67, bug released in 0.22).
Ian Jackson [Tue, 18 Aug 2015 14:15:06 +0000 (15:15 +0100)]
changelog: start 1.4
Ian Jackson [Sun, 16 Aug 2015 16:51:55 +0000 (17:51 +0100)]
changelog: finalise 1.3
Ian Jackson [Sun, 16 Aug 2015 15:50:27 +0000 (16:50 +0100)]
Test suite: Fix t-restriction-x-dgit-schroot-build not to print to stdout when it succeeds
Ian Jackson [Sun, 16 Aug 2015 15:42:07 +0000 (16:42 +0100)]
Infrastructure: Improve an error message in dgit-repos-policy-debian.
Ian Jackson [Sun, 16 Aug 2015 15:01:57 +0000 (16:01 +0100)]
Test suite: Fix t-restriction-x-dgit-schroot-build in non-adt mode.
Ian Jackson [Sun, 16 Aug 2015 15:01:17 +0000 (16:01 +0100)]
Test suite: in enumerate-tests, massage multi-line whynot
Ian Jackson [Sun, 16 Aug 2015 14:16:00 +0000 (15:16 +0100)]
Prep 1.3~~ for testing
Ian Jackson [Sun, 16 Aug 2015 14:15:44 +0000 (15:15 +0100)]
Properly quote package name when constructing regexp in complete_file_from_dsc. Closes:#795736. Also, grep the code for likely similar problems elsewhere and improve a (harmless) instance in dgit-repos-server.
Ian Jackson [Sun, 16 Aug 2015 12:30:01 +0000 (13:30 +0100)]
If a .orig in .. is a symlink, hardlink the link target into our private unpack directory, rather than the link itself (since latter won't work if the symlink is relative).
Ian Jackson [Sun, 16 Aug 2015 12:04:03 +0000 (13:04 +0100)]
In option parser test `@ARGV' not `length @ARGV'. Closes:#795710.
Ian Jackson [Sun, 16 Aug 2015 12:02:49 +0000 (13:02 +0100)]
changelog: start 1.3
Ian Jackson [Fri, 14 Aug 2015 17:27:30 +0000 (18:27 +0100)]
changelog: finalise 1.2
Ian Jackson [Fri, 14 Aug 2015 17:27:14 +0000 (18:27 +0100)]
changelog: tidy up
Ian Jackson [Fri, 14 Aug 2015 17:11:44 +0000 (18:11 +0100)]
Add missing close of #793060 to changelog for version 1.1. pass -nc. Closes:#793060.
Ian Jackson [Fri, 14 Aug 2015 13:34:27 +0000 (14:34 +0100)]
Finish dealing with uncuddled options
Ian Jackson [Fri, 14 Aug 2015 13:29:48 +0000 (14:29 +0100)]
Convert to defvalopt: -k
Ian Jackson [Fri, 14 Aug 2015 13:26:29 +0000 (14:26 +0100)]
Convert to defvalopt: -C
Ian Jackson [Fri, 14 Aug 2015 13:25:25 +0000 (14:25 +0100)]
Convert to defvalopt: -c
Ian Jackson [Fri, 14 Aug 2015 13:23:11 +0000 (14:23 +0100)]
Convert to defvalopt: --quilt=
Ian Jackson [Fri, 14 Aug 2015 13:21:31 +0000 (14:21 +0100)]
Convert to defvalopt: --clean
Ian Jackson [Fri, 14 Aug 2015 13:19:20 +0000 (14:19 +0100)]
Convert to defvalopt: --build-products-dir
Ian Jackson [Fri, 14 Aug 2015 13:18:07 +0000 (14:18 +0100)]
Convert to defvalopt: --initiator-tempdir
Ian Jackson [Fri, 14 Aug 2015 13:17:27 +0000 (14:17 +0100)]
Reformat defvalopt calls table (nfc)
Ian Jackson [Fri, 14 Aug 2015 13:16:40 +0000 (14:16 +0100)]
Use defvalopt scalar ref (no overall functional change)
Ian Jackson [Fri, 14 Aug 2015 13:13:11 +0000 (14:13 +0100)]
Permit defvalopt $fn to be a scalar ref instead (nfc, since no users)
Ian Jackson [Fri, 14 Aug 2015 13:10:15 +0000 (14:10 +0100)]
Convert to defvalopt: --existing-package
Ian Jackson [Fri, 14 Aug 2015 13:07:21 +0000 (14:07 +0100)]
Convert to defvalopt: --distro, -d
Ian Jackson [Fri, 14 Aug 2015 13:04:37 +0000 (14:04 +0100)]
Break out $valopt (nfc)
Ian Jackson [Fri, 14 Aug 2015 12:31:04 +0000 (13:31 +0100)]
Introduce defvalopt, new approach for options taking values
Ian Jackson [Fri, 14 Aug 2015 11:30:04 +0000 (12:30 +0100)]
In manpage move dgit.default.* to main CONFIGURATION section.
Ian Jackson [Fri, 14 Aug 2015 17:15:26 +0000 (18:15 +0100)]
Honour *.clean-mode configuration setting for --clean= mode.
Ian Jackson [Fri, 14 Aug 2015 11:13:49 +0000 (12:13 +0100)]
Do defaulting for $cleanmode just before invoking main $fn->() (nfc)
Ian Jackson [Fri, 14 Aug 2015 11:14:36 +0000 (12:14 +0100)]
Break out $cleanmode_re (nfc)
Ian Jackson [Fri, 14 Aug 2015 11:04:04 +0000 (12:04 +0100)]
Document that tags are in DEP-14 format, and that they are used for authenticating pushes.
Ian Jackson [Fri, 14 Aug 2015 11:02:12 +0000 (12:02 +0100)]
Fix manpage typo `sourcefull'.
Ian Jackson [Fri, 14 Aug 2015 11:01:50 +0000 (12:01 +0100)]
Correct manpage cross-reference to point to browse.d.d.o.
Ian Jackson [Fri, 14 Aug 2015 11:01:04 +0000 (12:01 +0100)]
Fix manpage typo `dig' for `dgit'.
Ian Jackson [Mon, 27 Jul 2015 16:59:46 +0000 (17:59 +0100)]
Start changelog for 1.2
Ian Jackson [Mon, 27 Jul 2015 15:35:03 +0000 (16:35 +0100)]
Finalise 1.1
Ian Jackson [Mon, 27 Jul 2015 14:29:39 +0000 (15:29 +0100)]
Test suite: build-modes tests: Use gbp-build, not git-build, in tests
Ian Jackson [Mon, 27 Jul 2015 14:29:15 +0000 (15:29 +0100)]
Cope with new git-buildpackage which provides gbp, rather than the eponymous command, on PATH.
Ian Jackson [Mon, 27 Jul 2015 14:28:24 +0000 (15:28 +0100)]
When invoking git-buildpackage via dgit gbp-build, consider our command line arguments when massaging the dpkg-buildpackage arguments, so that we don't end up giving dpkg-buildpackage contradictory instructions.
Ian Jackson [Mon, 27 Jul 2015 14:26:34 +0000 (15:26 +0100)]
Test suite: build-modes tests: Clean the tree ourselves before each test
Ian Jackson [Mon, 27 Jul 2015 14:26:06 +0000 (15:26 +0100)]
When exec fails, always print the program name in the error message.
Ian Jackson [Mon, 27 Jul 2015 14:25:12 +0000 (15:25 +0100)]
Dgit.pm: Provide executable_on_path (avoids loading File::Which which is rather more heavyweight) (no callers yet)
Ian Jackson [Mon, 27 Jul 2015 12:35:53 +0000 (13:35 +0100)]
Organise debian/changelog
Ian Jackson [Mon, 27 Jul 2015 12:20:15 +0000 (13:20 +0100)]
fixup! Test suite: Provide tests which check that
Ian Jackson [Mon, 27 Jul 2015 12:17:44 +0000 (13:17 +0100)]
Run debian/rules debian/tests/control
Ian Jackson [Mon, 27 Jul 2015 11:32:41 +0000 (12:32 +0100)]
Test suite: build-modes tests: Do extra clean mode tests with build-source
Ian Jackson [Mon, 27 Jul 2015 11:32:20 +0000 (12:32 +0100)]
Test suite: build-modes tests: Generate id rather than using counter