chiark / gitweb /
dgit.git
4 years agoPrint better error message (with `fail' rather than `die') if `dgit clone' cannot...
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.

4 years agoDo not call "warn" on failure of cleanup handler in END block (since warn has been...
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).

4 years agoWhen cleaning up after failed clone, stat the to-be-cleaned-up directory before runni...
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.

4 years agoPut --no-arch-all in build-modes-sbuild act, not only its real_act
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.

4 years agoTest suite: When sbuild fails, do not crash
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.

4 years agosbuild; Do not pass -A
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.

5 years agofinalise 1.4 debian/1.4
Ian Jackson [Sat, 22 Aug 2015 14:31:07 +0000 (15:31 +0100)]
finalise 1.4

5 years agochangelog: Improve
Ian Jackson [Sat, 22 Aug 2015 12:20:28 +0000 (13:20 +0100)]
changelog: Improve

5 years agoquilt-fixup checks that the git tree is clean, as for build-prep.
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.

5 years agoTest suite: run quilt-fixup with -wgf in distropatches-reject, so that we don't need...
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.

5 years agoforbidden files: check them properly
Ian Jackson [Sat, 22 Aug 2015 10:12:59 +0000 (11:12 +0100)]
forbidden files: check them properly

5 years agoWith dgit sbuild, pass our -d before the user's arguments, so that the user can overr...
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.

5 years agoquilt fixup: single-debian-patch is still broken in wheezy
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.

5 years agoquilt fixup: A few more progress messages
Ian Jackson [Fri, 21 Aug 2015 15:39:37 +0000 (16:39 +0100)]
quilt fixup: A few more progress messages

5 years agoReject debian/source/local-patch-header
Ian Jackson [Fri, 21 Aug 2015 15:39:17 +0000 (16:39 +0100)]
Reject debian/source/local-patch-header

5 years agoquilt fixup: quilt_fixup_linkorigs more debugging output
Ian Jackson [Fri, 21 Aug 2015 15:38:26 +0000 (16:38 +0100)]
quilt fixup: quilt_fixup_linkorigs more debugging output

5 years agoCope properly with `3.0 (quilt)' with single-debian-patch. Closes:#796016.
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.

5 years agoquilt fixup: Break out quilt_fixup_delete_pc (nfc)
Ian Jackson [Fri, 21 Aug 2015 12:09:08 +0000 (13:09 +0100)]
quilt fixup: Break out quilt_fixup_delete_pc (nfc)

5 years agoquilt fixup: Break out quilt_fixup_linkorigs (nfc)
Ian Jackson [Fri, 21 Aug 2015 12:08:23 +0000 (13:08 +0100)]
quilt fixup: Break out quilt_fixup_linkorigs (nfc)

5 years agoquilt fixup: Break out quilt_fixup_mkwork (nfc)
Ian Jackson [Fri, 21 Aug 2015 12:08:02 +0000 (13:08 +0100)]
quilt fixup: Break out quilt_fixup_mkwork (nfc)

5 years agoquilt fixup: break out quilt_fixup_multipatch ready for quilt_fixup_singlepatch
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

5 years agoIn --dry-run mode, _do_ actually run dpkg-source --commit so that we actually do...
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.

5 years agoget_source_format returns the debian/source/options, too (nfc since no users yet)
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)

5 years agoCopy debian/source/options into fake dsc
Ian Jackson [Thu, 20 Aug 2015 13:00:42 +0000 (14:00 +0100)]
Copy debian/source/options into fake dsc

5 years agoRefactor coping with maybe-existing files in fake dsc
Ian Jackson [Thu, 20 Aug 2015 12:52:26 +0000 (13:52 +0100)]
Refactor coping with maybe-existing files in fake dsc

5 years agoDetect and reject git trees containing debian/source/local-options.
Ian Jackson [Wed, 19 Aug 2015 15:35:51 +0000 (16:35 +0100)]
Detect and reject git trees containing debian/source/local-options.

5 years agoIn dgit(7), discuss binaries and documentation present in upstream but removed by...
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.

5 years agoWhen quilt linearisation fails, print the right information in the error message...
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.)

5 years agoWhen running git-add in commit-quilty-patch, use -f and sometimes -A, so as to avoid...
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.

5 years agoWhen running git-add in commit-quilty-patch, properly escape filenames (which git...
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).

5 years agoUnbreak --dry-run (`exiting subroutine via next', broken in ac221d67, bug released...
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).

5 years agochangelog: start 1.4
Ian Jackson [Tue, 18 Aug 2015 14:15:06 +0000 (15:15 +0100)]
changelog: start 1.4

5 years agochangelog: finalise 1.3 debian/1.3
Ian Jackson [Sun, 16 Aug 2015 16:51:55 +0000 (17:51 +0100)]
changelog: finalise 1.3

5 years agoTest suite: Fix t-restriction-x-dgit-schroot-build not to print to stdout when it...
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

5 years agoInfrastructure: Improve an error message in dgit-repos-policy-debian.
Ian Jackson [Sun, 16 Aug 2015 15:42:07 +0000 (16:42 +0100)]
Infrastructure: Improve an error message in dgit-repos-policy-debian.

5 years agoTest suite: Fix t-restriction-x-dgit-schroot-build in non-adt mode.
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.

5 years agoTest suite: in enumerate-tests, massage multi-line whynot
Ian Jackson [Sun, 16 Aug 2015 15:01:17 +0000 (16:01 +0100)]
Test suite: in enumerate-tests, massage multi-line whynot

5 years agoPrep 1.3~~ for testing
Ian Jackson [Sun, 16 Aug 2015 14:16:00 +0000 (15:16 +0100)]
Prep 1.3~~ for testing

5 years agoProperly quote package name when constructing regexp in complete_file_from_dsc. ...
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.

5 years agoIf a .orig in .. is a symlink, hardlink the link target into our private unpack direc...
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).

5 years agoIn option parser test `@ARGV' not `length @ARGV'. Closes:#795710.
Ian Jackson [Sun, 16 Aug 2015 12:04:03 +0000 (13:04 +0100)]
In option parser test `@ARGV' not `length @ARGV'.  Closes:#795710.

5 years agochangelog: start 1.3
Ian Jackson [Sun, 16 Aug 2015 12:02:49 +0000 (13:02 +0100)]
changelog: start 1.3

5 years agochangelog: finalise 1.2 debian/1.2
Ian Jackson [Fri, 14 Aug 2015 17:27:30 +0000 (18:27 +0100)]
changelog: finalise 1.2

5 years agochangelog: tidy up
Ian Jackson [Fri, 14 Aug 2015 17:27:14 +0000 (18:27 +0100)]
changelog: tidy up

5 years agoAdd missing close of #793060 to changelog for version 1.1. pass -nc. Closes:#793060.
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.

5 years agoFinish dealing with uncuddled options
Ian Jackson [Fri, 14 Aug 2015 13:34:27 +0000 (14:34 +0100)]
Finish dealing with uncuddled options

5 years agoConvert to defvalopt: -k
Ian Jackson [Fri, 14 Aug 2015 13:29:48 +0000 (14:29 +0100)]
Convert to defvalopt: -k

5 years agoConvert to defvalopt: -C
Ian Jackson [Fri, 14 Aug 2015 13:26:29 +0000 (14:26 +0100)]
Convert to defvalopt: -C

5 years agoConvert to defvalopt: -c
Ian Jackson [Fri, 14 Aug 2015 13:25:25 +0000 (14:25 +0100)]
Convert to defvalopt: -c

5 years agoConvert to defvalopt: --quilt=
Ian Jackson [Fri, 14 Aug 2015 13:23:11 +0000 (14:23 +0100)]
Convert to defvalopt: --quilt=

5 years agoConvert to defvalopt: --clean
Ian Jackson [Fri, 14 Aug 2015 13:21:31 +0000 (14:21 +0100)]
Convert to defvalopt: --clean

5 years agoConvert to defvalopt: --build-products-dir
Ian Jackson [Fri, 14 Aug 2015 13:19:20 +0000 (14:19 +0100)]
Convert to defvalopt: --build-products-dir

5 years agoConvert to defvalopt: --initiator-tempdir
Ian Jackson [Fri, 14 Aug 2015 13:18:07 +0000 (14:18 +0100)]
Convert to defvalopt: --initiator-tempdir

5 years agoReformat defvalopt calls table (nfc)
Ian Jackson [Fri, 14 Aug 2015 13:17:27 +0000 (14:17 +0100)]
Reformat defvalopt calls table (nfc)

5 years agoUse defvalopt scalar ref (no overall functional change)
Ian Jackson [Fri, 14 Aug 2015 13:16:40 +0000 (14:16 +0100)]
Use defvalopt scalar ref (no overall functional change)

5 years agoPermit defvalopt $fn to be a scalar ref instead (nfc, since no users)
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)

5 years agoConvert to defvalopt: --existing-package
Ian Jackson [Fri, 14 Aug 2015 13:10:15 +0000 (14:10 +0100)]
Convert to defvalopt: --existing-package

5 years agoConvert to defvalopt: --distro, -d
Ian Jackson [Fri, 14 Aug 2015 13:07:21 +0000 (14:07 +0100)]
Convert to defvalopt: --distro, -d

5 years agoBreak out $valopt (nfc)
Ian Jackson [Fri, 14 Aug 2015 13:04:37 +0000 (14:04 +0100)]
Break out $valopt (nfc)

5 years agoIntroduce defvalopt, new approach for options taking values
Ian Jackson [Fri, 14 Aug 2015 12:31:04 +0000 (13:31 +0100)]
Introduce defvalopt, new approach for options taking values

5 years agoIn manpage move dgit.default.* to main CONFIGURATION section.
Ian Jackson [Fri, 14 Aug 2015 11:30:04 +0000 (12:30 +0100)]
In manpage move dgit.default.* to main CONFIGURATION section.

5 years agoHonour *.clean-mode configuration setting for --clean= mode.
Ian Jackson [Fri, 14 Aug 2015 17:15:26 +0000 (18:15 +0100)]
Honour *.clean-mode configuration setting for --clean= mode.

5 years agoDo defaulting for $cleanmode just before invoking main $fn->() (nfc)
Ian Jackson [Fri, 14 Aug 2015 11:13:49 +0000 (12:13 +0100)]
Do defaulting for $cleanmode just before invoking main $fn->() (nfc)

5 years agoBreak out $cleanmode_re (nfc)
Ian Jackson [Fri, 14 Aug 2015 11:14:36 +0000 (12:14 +0100)]
Break out $cleanmode_re (nfc)

5 years agoDocument that tags are in DEP-14 format, and that they are used for authenticating...
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.

5 years agoFix manpage typo `sourcefull'.
Ian Jackson [Fri, 14 Aug 2015 11:02:12 +0000 (12:02 +0100)]
Fix manpage typo `sourcefull'.

5 years agoCorrect manpage cross-reference to point to browse.d.d.o.
Ian Jackson [Fri, 14 Aug 2015 11:01:50 +0000 (12:01 +0100)]
Correct manpage cross-reference to point to browse.d.d.o.

5 years agoFix manpage typo `dig' for `dgit'.
Ian Jackson [Fri, 14 Aug 2015 11:01:04 +0000 (12:01 +0100)]
Fix manpage typo `dig' for `dgit'.

5 years agoStart changelog for 1.2
Ian Jackson [Mon, 27 Jul 2015 16:59:46 +0000 (17:59 +0100)]
Start changelog for 1.2

5 years agoFinalise 1.1 debian/1.1
Ian Jackson [Mon, 27 Jul 2015 15:35:03 +0000 (16:35 +0100)]
Finalise 1.1

5 years agoTest suite: build-modes tests: Use gbp-build, not git-build, in tests
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

5 years agoCope with new git-buildpackage which provides gbp, rather than the eponymous command...
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.

5 years agoWhen invoking git-buildpackage via dgit gbp-build, consider our command line argument...
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.

5 years agoTest suite: build-modes tests: Clean the tree ourselves before each test
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

5 years agoWhen exec fails, always print the program name in the error message.
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.

5 years agoDgit.pm: Provide executable_on_path (avoids loading File::Which which is rather more...
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)

5 years agoOrganise debian/changelog
Ian Jackson [Mon, 27 Jul 2015 12:35:53 +0000 (13:35 +0100)]
Organise debian/changelog

5 years agofixup! Test suite: Provide tests which check that
Ian Jackson [Mon, 27 Jul 2015 12:20:15 +0000 (13:20 +0100)]
fixup! Test suite: Provide tests which check that

5 years agoRun debian/rules debian/tests/control
Ian Jackson [Mon, 27 Jul 2015 12:17:44 +0000 (13:17 +0100)]
Run debian/rules debian/tests/control

5 years agoTest suite: build-modes tests: Do extra clean mode tests with build-source
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

5 years agoTest suite: build-modes tests: Generate id rather than using counter
Ian Jackson [Mon, 27 Jul 2015 11:32:20 +0000 (12:32 +0100)]
Test suite: build-modes tests: Generate id rather than using counter

5 years agoTest suite: Provide tests which check that all our various build operations run the...
Ian Jackson [Mon, 27 Jul 2015 12:16:14 +0000 (13:16 +0100)]
Test suite: Provide tests which check that all our various build operations run the right targets as expected (ie, that we are massaging the arguments to dpkg-buildpackage, and suppressing our clean target, etc., correctly).

5 years agoTest suite: Provide "indep-arch" branch in example worktree which produces both binar...
Ian Jackson [Mon, 27 Jul 2015 12:14:49 +0000 (13:14 +0100)]
Test suite: Provide "indep-arch" branch in example worktree which produces both binary-indep and binary-arch packages

5 years agoAlso suppress spurious runs of the clean target when building using git-buildpackage.
Ian Jackson [Mon, 27 Jul 2015 11:00:38 +0000 (12:00 +0100)]
Also suppress spurious runs of the clean target when building using git-buildpackage.

5 years agoWhen we are using dpkg-buildpackage to clean before using it to also do the build...
Ian Jackson [Mon, 27 Jul 2015 02:46:32 +0000 (03:46 +0100)]
When we are using dpkg-buildpackage to clean before using it to also do the build, let it do its cleaning thing as part of its run, rather than running it twice.  When we are _not_ supposed to be using dpkg-buildpackage to clean, but we are running it to do the build, pass -nc.

5 years agoShow `dgit sbuild' in usage message.
Ian Jackson [Mon, 27 Jul 2015 11:24:05 +0000 (12:24 +0100)]
Show `dgit sbuild' in usage message.

5 years agoRename `git-build' operation to `gbp-build' to make it clearer what it's for. Keep...
Ian Jackson [Mon, 27 Jul 2015 11:04:04 +0000 (12:04 +0100)]
Rename `git-build' operation to `gbp-build' to make it clearer what it's for.  Keep the old name as an alias.

5 years agoTest suite: Mention enumerate-tests in changelog
Ian Jackson [Mon, 27 Jul 2015 11:38:13 +0000 (12:38 +0100)]
Test suite: Mention enumerate-tests in changelog

5 years agoTest suite: rename list-tests to enumerate-tests for ease of completion over tests...
Ian Jackson [Mon, 27 Jul 2015 11:37:11 +0000 (12:37 +0100)]
Test suite: rename list-tests to enumerate-tests for ease of completion over tests/lib*

5 years agoHonour --git= (mostly).
Ian Jackson [Mon, 27 Jul 2015 01:00:59 +0000 (02:00 +0100)]
Honour --git= (mostly).

5 years agoWhen key to use not specified any other way, use the debian/changelog trailer line...
Ian Jackson [Sun, 26 Jul 2015 21:53:52 +0000 (22:53 +0100)]
When key to use not specified any other way, use the debian/changelog trailer line.  Closes:#793423.

5 years agoRemove stray .gits during quilt fixup, too
Ian Jackson [Sun, 26 Jul 2015 21:24:59 +0000 (22:24 +0100)]
Remove stray .gits during quilt fixup, too

5 years agoBreak out remove_stray_gits
Ian Jackson [Sun, 26 Jul 2015 21:20:24 +0000 (22:20 +0100)]
Break out remove_stray_gits

5 years agoWork around curl -sS -I printing `HTTP/1.0 200 Connection established' before the...
Ian Jackson [Sun, 26 Jul 2015 21:10:35 +0000 (22:10 +0100)]
Work around curl -sS -I printing `HTTP/1.0 200 Connection established' before the actual header, so dgit works with https_proxy set (!)

5 years agoSet up git user.email and user.name from distro access config or DEBEMAIL/DEBFULLNAME...
Ian Jackson [Mon, 27 Jul 2015 02:51:00 +0000 (03:51 +0100)]
Set up git user.email and user.name from distro access config or DEBEMAIL/DEBFULLNAME.  Closes:#793410.

5 years agoProvide dgit setup-new-tree (like dpkg-setup-mergechangelogs but only does it if...
Ian Jackson [Sun, 26 Jul 2015 20:41:49 +0000 (21:41 +0100)]
Provide dgit setup-new-tree (like dpkg-setup-mergechangelogs but only does it if not disabled in config).

5 years agoMake configuration able to prevent dpkg-mergechangelogs setup.
Ian Jackson [Sun, 26 Jul 2015 20:37:43 +0000 (21:37 +0100)]
Make configuration able to prevent dpkg-mergechangelogs setup.

5 years agoProvide access_cfg_bool (no call sites yet)
Ian Jackson [Sun, 26 Jul 2015 20:35:15 +0000 (21:35 +0100)]
Provide access_cfg_bool (no call sites yet)

5 years agoFix a debug message in the obsolete sshpsql archive access driver.
Ian Jackson [Sun, 26 Jul 2015 20:33:48 +0000 (21:33 +0100)]
Fix a debug message in the obsolete sshpsql archive access driver.

5 years agoWith -DDDD, print out all gitcfg references (copious!)
Ian Jackson [Sun, 26 Jul 2015 20:32:32 +0000 (21:32 +0100)]
With -DDDD, print out all gitcfg references (copious!)