chiark / gitweb /
dgit.git
7 years agoMerge branch 'master' into wip.remote
Ian Jackson [Tue, 22 Oct 2013 13:53:11 +0000 (14:53 +0100)]
Merge branch 'master' into wip.remote

Conflicts:
debian/changelog
dgit

7 years agofinalise 0.16 debian/0.16
Ian Jackson [Tue, 22 Oct 2013 12:07:01 +0000 (13:07 +0100)]
finalise 0.16

7 years ago#727053 fix justifies high urgency
Ian Jackson [Tue, 22 Oct 2013 11:52:29 +0000 (12:52 +0100)]
#727053 fix justifies high urgency

7 years agoFormat `(3.0) quilt' fixup does not mind extraneous other files in the build tree...
Ian Jackson [Tue, 22 Oct 2013 11:51:36 +0000 (12:51 +0100)]
Format `(3.0) quilt' fixup does not mind extraneous other files in the build tree (e.g., build products and logs).  Closes: #727053.

7 years agoNew --damp-run mode, for more convenient and fuller testing etc.
Ian Jackson [Tue, 22 Oct 2013 11:50:06 +0000 (12:50 +0100)]
New --damp-run mode, for more convenient and fuller testing etc.

7 years agoSet autoflush on stdout, to get better ordering of debugging etc. output when stdout...
Ian Jackson [Tue, 22 Oct 2013 11:42:14 +0000 (12:42 +0100)]
Set autoflush on stdout, to get better ordering of debugging etc. output when stdout is redirected.

7 years agowip remote - better autoflushes
Ian Jackson [Tue, 22 Oct 2013 09:25:22 +0000 (10:25 +0100)]
wip remote - better autoflushes

7 years agowip remote - better debugging
Ian Jackson [Tue, 22 Oct 2013 09:24:52 +0000 (10:24 +0100)]
wip remote - better debugging

7 years agointroduce $debugprefix and debugprint etc.
Ian Jackson [Mon, 21 Oct 2013 15:25:58 +0000 (16:25 +0100)]
introduce $debugprefix and debugprint etc.

7 years agofixes for remote mode
Ian Jackson [Mon, 21 Oct 2013 15:16:57 +0000 (16:16 +0100)]
fixes for remote mode

7 years agodocs for rpush
Ian Jackson [Mon, 21 Oct 2013 14:45:53 +0000 (15:45 +0100)]
docs for rpush

7 years agofix printcmd and shellquote
Ian Jackson [Mon, 21 Oct 2013 14:32:12 +0000 (15:32 +0100)]
fix printcmd and shellquote

7 years agoMerge branch 'wip.remote' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into... debian/0.16_experimental2
Ian Jackson [Mon, 21 Oct 2013 13:31:50 +0000 (14:31 +0100)]
Merge branch 'wip.remote' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into wip.remote

7 years agofinalise 0.16~experimental2
Ian Jackson [Mon, 21 Oct 2013 13:30:54 +0000 (14:30 +0100)]
finalise 0.16~experimental2

7 years agowip, compile fixes
Ian Jackson [Wed, 9 Oct 2013 07:51:26 +0000 (08:51 +0100)]
wip, compile fixes

ready for testing:
 - baseline push
 - remote push
 - other stuff

7 years agowip, compile fixes
Ian Jackson [Wed, 9 Oct 2013 07:47:57 +0000 (08:47 +0100)]
wip, compile fixes

7 years agofinish documenting --dgit
Ian Jackson [Wed, 9 Oct 2013 07:43:11 +0000 (08:43 +0100)]
finish documenting --dgit

7 years agofinish support and docs for DGIT_SSH etc. config
Ian Jackson [Wed, 9 Oct 2013 07:37:12 +0000 (08:37 +0100)]
finish support and docs for DGIT_SSH etc. config

7 years agodocument --gpg=
Ian Jackson [Wed, 9 Oct 2013 07:02:18 +0000 (08:02 +0100)]
document --gpg=

7 years agowip changes for remote push - remove notes for done stuff from TODO
Ian Jackson [Wed, 9 Oct 2013 06:51:46 +0000 (07:51 +0100)]
wip changes for remote push - remove notes for done stuff from TODO

7 years agowip changes for remote push - implement i_want
Ian Jackson [Wed, 9 Oct 2013 06:50:42 +0000 (07:50 +0100)]
wip changes for remote push - implement i_want

7 years agowip changes for remote push - check repeated want
Ian Jackson [Wed, 9 Oct 2013 06:50:25 +0000 (07:50 +0100)]
wip changes for remote push - check repeated want

7 years agowip changes for remote push - dsc first
Ian Jackson [Wed, 9 Oct 2013 06:50:14 +0000 (07:50 +0100)]
wip changes for remote push - dsc first

7 years agowip changes for remote push - implement i_param
Ian Jackson [Wed, 9 Oct 2013 06:49:54 +0000 (07:49 +0100)]
wip changes for remote push - implement i_param

7 years agowip changes for remote push - split off sign_changes
Ian Jackson [Wed, 9 Oct 2013 06:49:34 +0000 (07:49 +0100)]
wip changes for remote push - split off sign_changes

7 years agowip changes for remote push - implement i_localname_*
Ian Jackson [Wed, 9 Oct 2013 06:31:34 +0000 (07:31 +0100)]
wip changes for remote push - implement i_localname_*

7 years agowip changes for remote push - implement i_resp_*
Ian Jackson [Wed, 9 Oct 2013 06:21:45 +0000 (07:21 +0100)]
wip changes for remote push - implement i_resp_*

7 years agowip changes for remote push - fixes
Ian Jackson [Wed, 9 Oct 2013 06:20:12 +0000 (07:20 +0100)]
wip changes for remote push - fixes

7 years agowip changes for remote push - provide i_method
Ian Jackson [Wed, 9 Oct 2013 06:20:25 +0000 (07:20 +0100)]
wip changes for remote push - provide i_method

7 years agowip changes for remote push - provide i_tmp
Ian Jackson [Wed, 9 Oct 2013 06:19:56 +0000 (07:19 +0100)]
wip changes for remote push - provide i_tmp

7 years agowip changes for remote push - break out protocol_read_bytes
Ian Jackson [Wed, 9 Oct 2013 06:18:02 +0000 (07:18 +0100)]
wip changes for remote push - break out protocol_read_bytes

7 years agoimplement initiator_expect
Ian Jackson [Wed, 9 Oct 2013 00:45:37 +0000 (01:45 +0100)]
implement initiator_expect

7 years agocode motion and separators
Ian Jackson [Wed, 9 Oct 2013 00:42:16 +0000 (01:42 +0100)]
code motion and separators

7 years agowip changes for remote push - much implementation
Ian Jackson [Thu, 26 Sep 2013 21:37:49 +0000 (22:37 +0100)]
wip changes for remote push - much implementation

7 years agowip changes for remote push - break out shellquote, nfc
Ian Jackson [Thu, 26 Sep 2013 21:37:37 +0000 (22:37 +0100)]
wip changes for remote push - break out shellquote, nfc

7 years agowip changes for remote push - implementation of remote push responder, not tested
Ian Jackson [Thu, 26 Sep 2013 19:36:49 +0000 (20:36 +0100)]
wip changes for remote push - implementation of remote push responder, not tested

7 years agowip changes for remote push - introduce calls to responder_* functions, currently...
Ian Jackson [Thu, 26 Sep 2013 00:57:47 +0000 (01:57 +0100)]
wip changes for remote push - introduce calls to responder_* functions, currently noops, nfc

7 years agoCommand execution reports from --dry-run go to stderr.
Ian Jackson [Thu, 26 Sep 2013 00:47:47 +0000 (01:47 +0100)]
Command execution reports from --dry-run go to stderr.

7 years agowip changes for remote push - replace uses of plain print with new progress sub, nfc
Ian Jackson [Thu, 26 Sep 2013 00:46:22 +0000 (01:46 +0100)]
wip changes for remote push - replace uses of plain print with new progress sub, nfc

7 years agopush actually takes an optional suite, like it says in the synopsis.
Ian Jackson [Thu, 26 Sep 2013 00:14:55 +0000 (01:14 +0100)]
push actually takes an optional suite, like it says in the synopsis.

7 years agowip changes for remote push - beginning with remote protocol
Ian Jackson [Thu, 26 Sep 2013 00:14:00 +0000 (01:14 +0100)]
wip changes for remote push - beginning with remote protocol

7 years agowip changes for remote push - no intentional functional change, break out push_parse_...
Ian Jackson [Wed, 25 Sep 2013 23:58:20 +0000 (00:58 +0100)]
wip changes for remote push - no intentional functional change, break out push_parse_{changelog,dsc}

7 years agowip changes for remote push - fixes, todos
Ian Jackson [Tue, 24 Sep 2013 22:59:17 +0000 (23:59 +0100)]
wip changes for remote push - fixes, todos

7 years agowip changes for remote push - fixes
Ian Jackson [Tue, 24 Sep 2013 22:56:03 +0000 (23:56 +0100)]
wip changes for remote push - fixes

7 years agoMerge remote-tracking branch 'remotes/dgit/dgit/experimental' into wip.remote debian/0.16_experimental1
Ian Jackson [Tue, 24 Sep 2013 22:26:49 +0000 (23:26 +0100)]
Merge remote-tracking branch 'remotes/dgit/dgit/experimental' into wip.remote

7 years agowip changes for remote push - fixes
Ian Jackson [Tue, 24 Sep 2013 22:25:15 +0000 (23:25 +0100)]
wip changes for remote push - fixes

7 years agofinalise changelog for 0.16~experimental1
Ian Jackson [Tue, 24 Sep 2013 22:08:55 +0000 (23:08 +0100)]
finalise changelog for 0.16~experimental1

7 years agowip changes for remote push - make tag ourselves
Ian Jackson [Tue, 24 Sep 2013 22:02:50 +0000 (23:02 +0100)]
wip changes for remote push - make tag ourselves

7 years agowip changes for remote push
Ian Jackson [Sun, 15 Sep 2013 12:28:21 +0000 (13:28 +0100)]
wip changes for remote push

7 years agowip changes for remote push - support supplying gpg command
Ian Jackson [Sun, 15 Sep 2013 12:28:07 +0000 (13:28 +0100)]
wip changes for remote push - support supplying gpg command

7 years agowip changes for remote push
Ian Jackson [Sun, 1 Sep 2013 21:19:25 +0000 (22:19 +0100)]
wip changes for remote push

7 years agofinalise and tidy changelog for 0.15 debian/0.15
Ian Jackson [Wed, 11 Sep 2013 23:14:17 +0000 (00:14 +0100)]
finalise and tidy changelog for 0.15

7 years agoMore comprehensive warnings in many cases of archive skew.
Ian Jackson [Wed, 11 Sep 2013 23:10:50 +0000 (00:10 +0100)]
More comprehensive warnings in many cases of archive skew.

7 years agoparsechangelog takes optional args for dpkg-parsechangelog
Ian Jackson [Wed, 11 Sep 2013 23:10:07 +0000 (00:10 +0100)]
parsechangelog takes optional args for dpkg-parsechangelog

7 years agobreak out shell_cmd
Ian Jackson [Wed, 11 Sep 2013 23:09:25 +0000 (00:09 +0100)]
break out shell_cmd

7 years agoBetter handling of packages pushed using dgit and stuck in NEW. (And, use of `--new...
Ian Jackson [Wed, 11 Sep 2013 22:34:56 +0000 (23:34 +0100)]
Better handling of packages pushed using dgit and stuck in NEW. (And, use of `--new' is not needed with fetch.)  Closes: #722199.

Specifically
 * get_archive_dsc leaves its answer in $dsc, not the return value
 * fetch_from_archive tolerates get_archive_dsc saying "no", and
   then uses the git ref, with a warning message

7 years agorename upload_hash to lastpush_hash
Ian Jackson [Wed, 11 Sep 2013 20:42:23 +0000 (21:42 +0100)]
rename upload_hash to lastpush_hash

7 years agodgit --version: changelog entry
Ian Jackson [Wed, 11 Sep 2013 20:13:00 +0000 (21:13 +0100)]
dgit --version: changelog entry

7 years agosupport --version too
Ian Jackson [Wed, 11 Sep 2013 20:12:33 +0000 (21:12 +0100)]
support --version too

7 years agocmd_version: check error
Ian Jackson [Wed, 11 Sep 2013 20:12:15 +0000 (21:12 +0100)]
cmd_version: check error

7 years agorename $dgit_version to $our_version
Ian Jackson [Wed, 11 Sep 2013 20:11:05 +0000 (21:11 +0100)]
rename $dgit_version to $our_version

7 years agocmd_version whitespace style fix
Ian Jackson [Wed, 11 Sep 2013 20:10:47 +0000 (21:10 +0100)]
cmd_version whitespace style fix

7 years agodo substition for $dgit_version in rules
Ian Jackson [Wed, 11 Sep 2013 20:10:24 +0000 (21:10 +0100)]
do substition for $dgit_version in rules

7 years agodgit*: Implement `dgit version`
Richard Hartmann [Mon, 2 Sep 2013 19:04:41 +0000 (21:04 +0200)]
dgit*: Implement `dgit version`

7 years agochangelog message for "dgit help"
Ian Jackson [Wed, 11 Sep 2013 17:20:02 +0000 (18:20 +0100)]
changelog message for "dgit help"

7 years agodgit*: Implement `dgit help`
Richard Hartmann [Tue, 3 Sep 2013 22:42:44 +0000 (00:42 +0200)]
dgit*: Implement `dgit help`

7 years agofinalise 0.14 debian/0.14
Ian Jackson [Sun, 1 Sep 2013 17:31:14 +0000 (18:31 +0100)]
finalise 0.14

7 years agochangelog entry for vcs-* fields
Ian Jackson [Sun, 1 Sep 2013 17:29:57 +0000 (18:29 +0100)]
changelog entry for vcs-* fields

7 years agodebian/control: Add Vcs-Git and Vcs-Browser
Richard Hartmann [Sat, 31 Aug 2013 08:30:24 +0000 (10:30 +0200)]
debian/control: Add Vcs-Git and Vcs-Browser

7 years agoCreate directory .git/dgit when needed during build. Closes: #721428.
Ian Jackson [Sun, 1 Sep 2013 17:22:54 +0000 (18:22 +0100)]
Create directory .git/dgit when needed during build.  Closes: #721428.

7 years agoInclude package name in tag message.
Ian Jackson [Thu, 29 Aug 2013 00:23:50 +0000 (01:23 +0100)]
Include package name in tag message.

7 years agochangelog typo fix debian/0.13
Ian Jackson [Wed, 28 Aug 2013 23:28:03 +0000 (00:28 +0100)]
changelog typo fix

7 years agofinalise 0.13
Ian Jackson [Wed, 28 Aug 2013 23:27:31 +0000 (00:27 +0100)]
finalise 0.13

7 years agoNew manpage section on FILES IN THE SOURCE PACKAGE BUT NOT IN GIT. Closes: #721186.
Ian Jackson [Wed, 28 Aug 2013 23:11:09 +0000 (00:11 +0100)]
New manpage section on FILES IN THE SOURCE PACKAGE BUT NOT IN GIT. Closes: #721186.

7 years agoReorganise manpage sections to be in a more conventional order.
Ian Jackson [Wed, 28 Aug 2013 22:44:42 +0000 (23:44 +0100)]
Reorganise manpage sections to be in a more conventional order.

7 years agoFix references in manpage to old Vcs-Dgit-Master field name.
Ian Jackson [Wed, 28 Aug 2013 22:38:16 +0000 (23:38 +0100)]
Fix references in manpage to old Vcs-Dgit-Master field name.

7 years agoUpdate the local tracking branch for the dgit remote, when pushing. Closes: #720956.
Ian Jackson [Wed, 28 Aug 2013 22:37:30 +0000 (23:37 +0100)]
Update the local tracking branch for the dgit remote, when pushing. Closes: #720956.

7 years agoFix some bugs in dgit fetch --dry-run which made dgit push --dry-run often not work...
Ian Jackson [Wed, 28 Aug 2013 22:36:54 +0000 (23:36 +0100)]
Fix some bugs in dgit fetch --dry-run which made dgit push --dry-run often not work at all.

7 years agoUpload to experimental to test dgit push. debian/0.13_experimental2
Ian Jackson [Wed, 28 Aug 2013 22:33:11 +0000 (23:33 +0100)]
Upload to experimental to test dgit push.

7 years agoWhen uploading to Debian, tell dput to upload to "ftp-master". This avoids problems...
Ian Jackson [Wed, 28 Aug 2013 22:27:00 +0000 (23:27 +0100)]
When uploading to Debian, tell dput to upload to "ftp-master".  This avoids problems with derivatives whose dput has a different default. Closes: #720958.

7 years agoUpload to experimental to test dgit push. debian/0.13_experimental1
Ian Jackson [Wed, 28 Aug 2013 22:19:36 +0000 (23:19 +0100)]
Upload to experimental to test dgit push.

7 years agoMerge branch 'master' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into...
Ian Jackson [Wed, 28 Aug 2013 22:18:52 +0000 (23:18 +0100)]
Merge branch 'master' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into dgit/experimental

Conflicts:
debian/changelog

7 years agoDo not always pointlessly fetch the .dsc twice. (That code was erroneously duplicate...
Ian Jackson [Wed, 28 Aug 2013 22:08:06 +0000 (23:08 +0100)]
Do not always pointlessly fetch the .dsc twice.  (That code was erroneously duplicated during editing, apparently.)

7 years agoReuse already-downloaded .orig files after checking their hashes. Closes: #720526...
Ian Jackson [Wed, 28 Aug 2013 22:03:38 +0000 (23:03 +0100)]
Reuse already-downloaded .orig files after checking their hashes. Closes: #720526.  (This introduces a dependency on the Digest::SHA.)

7 years agoRemove scary warning from Description.
Ian Jackson [Wed, 28 Aug 2013 20:48:11 +0000 (21:48 +0100)]
Remove scary warning from Description.

7 years agosplit out dsc_files_info with hash machinery. nfc
Ian Jackson [Wed, 28 Aug 2013 20:32:14 +0000 (21:32 +0100)]
split out dsc_files_info with hash machinery.  nfc

7 years agoRemove DGET_UNPACK from the environment in case the user has set it.
Ian Jackson [Wed, 28 Aug 2013 17:31:37 +0000 (18:31 +0100)]
Remove DGET_UNPACK from the environment in case the user has set it.

7 years agofinalise 0.12 debian/0.12
Ian Jackson [Mon, 26 Aug 2013 15:50:49 +0000 (16:50 +0100)]
finalise 0.12

7 years agoNew --no-quilt-fixup option to suppress quilt fixup. RTFM.
Ian Jackson [Mon, 26 Aug 2013 15:48:47 +0000 (16:48 +0100)]
New --no-quilt-fixup option to suppress quilt fixup.  RTFM.

7 years agoNew --ignore-dirty option to skip noncritical check. Closes: #720895.
Ian Jackson [Mon, 26 Aug 2013 15:44:47 +0000 (16:44 +0100)]
New --ignore-dirty option to skip noncritical check.  Closes: #720895.

7 years agoImprove error message for non-fast-forward push. Closes: #720896.
Ian Jackson [Mon, 26 Aug 2013 15:36:23 +0000 (16:36 +0100)]
Improve error message for non-fast-forward push.  Closes: #720896.

7 years agois_fast_fwd simply returns false if no common history (pursuant to #720896)
Ian Jackson [Mon, 26 Aug 2013 15:35:58 +0000 (16:35 +0100)]
is_fast_fwd simply returns false if no common history (pursuant to #720896)

7 years agoAdd Closes line for #720595 to changelog entry for 0.11. for using git-buildpackage...
Ian Jackson [Mon, 26 Aug 2013 15:19:35 +0000 (16:19 +0100)]
Add Closes line for #720595 to changelog entry for 0.11. for using git-buildpackage.  Closes: #720595.

7 years agoCope with packages with epoch. Closes: #720897.
Ian Jackson [Mon, 26 Aug 2013 15:18:26 +0000 (16:18 +0100)]
Cope with packages with epoch.  Closes: #720897.

7 years agofinalise 0.11 debian/0.11
Ian Jackson [Sun, 25 Aug 2013 16:00:54 +0000 (17:00 +0100)]
finalise 0.11

7 years agogit-build (git-buildpackage wrapper) does not bother canonicalising the suite if...
Ian Jackson [Sun, 25 Aug 2013 15:56:08 +0000 (16:56 +0100)]
git-build (git-buildpackage wrapper) does not bother canonicalising the suite if --git-ignore-branch is used.

7 years agoAdd missing dependency on realpath.
Ian Jackson [Sun, 25 Aug 2013 15:34:06 +0000 (16:34 +0100)]
Add missing dependency on realpath.

7 years agotypo fixes
Ian Jackson [Sun, 25 Aug 2013 15:29:34 +0000 (16:29 +0100)]
typo fixes

7 years agodgit build uses dpkg-buildpackage
Ian Jackson [Sun, 25 Aug 2013 15:28:54 +0000 (16:28 +0100)]
dgit build uses dpkg-buildpackage

7 years agoIntroduce build_prep subroutine and use it where appropriate
Ian Jackson [Sun, 25 Aug 2013 15:21:54 +0000 (16:21 +0100)]
Introduce build_prep subroutine and use it where appropriate