chiark / gitweb /
dgit.git
6 years agowip changes for remote push
Ian Jackson [Sun, 1 Sep 2013 21:19:25 +0000 (22:19 +0100)]
wip changes for remote push

6 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

6 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.

6 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

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

6 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

6 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

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

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

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

6 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

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

6 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

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

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

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

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

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

6 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

6 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.

6 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.

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

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

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.)

6 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.)

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

6 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

6 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.

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

6 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.

6 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.

6 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.

6 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)

6 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.

6 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.

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

6 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.

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

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

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

6 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

6 years agoFix a badly open-coded copy of check_not_dirty. Closes: #720524.
Ian Jackson [Sun, 25 Aug 2013 15:17:22 +0000 (16:17 +0100)]
Fix a badly open-coded copy of check_not_dirty.  Closes: #720524.

6 years agoBetter error message for use of UNRELEASED suite. Closes: #720523.
Ian Jackson [Sun, 25 Aug 2013 15:13:36 +0000 (16:13 +0100)]
Better error message for use of UNRELEASED suite.  Closes: #720523.

6 years agoLocation of dgit-repos is now git.debian.org:/git/dgit-repos/repos. Closes: #720525...
Ian Jackson [Sun, 25 Aug 2013 15:02:25 +0000 (16:02 +0100)]
Location of dgit-repos is now git.debian.org:/git/dgit-repos/repos. Closes: #720525.  The rename on the server side will break older versions of dgit.

6 years agoAutogenerated quilt patch fixup patch Description contains several recent git commits...
Ian Jackson [Sun, 25 Aug 2013 14:59:56 +0000 (15:59 +0100)]
Autogenerated quilt patch fixup patch Description contains several recent git commits, rather than implying that the patch corresponds exactly to the top git commit.

6 years agoFix bug which would make quilt patch fixup fail if git status produced "M" lines.
Ian Jackson [Sun, 25 Aug 2013 14:57:51 +0000 (15:57 +0100)]
Fix bug which would make quilt patch fixup fail if git status produced "M" lines.

6 years agoUse "ftp.debian.org" not "http.debian.net" as the default Debian archive. (http...
Ian Jackson [Sun, 25 Aug 2013 14:42:28 +0000 (15:42 +0100)]
Use "ftp.debian.org" not "http.debian.net" as the default Debian archive.  (http.debian.net tends to defeat certain kinds of cacheing, and can also have more skew.)

6 years agoCreate .pc/applied-patches - do not empty it (!) debian/0.10
Ian Jackson [Sat, 24 Aug 2013 23:52:53 +0000 (00:52 +0100)]
Create .pc/applied-patches - do not empty it (!)

6 years agofinalise 0.9 debian/0.9
Ian Jackson [Sat, 24 Aug 2013 17:49:08 +0000 (18:49 +0100)]
finalise 0.9

6 years ago`3.0 (quilt)' fixup creates .pc/applied-patches since modern dpkg-source creates...
Ian Jackson [Sat, 24 Aug 2013 17:44:49 +0000 (18:44 +0100)]
`3.0 (quilt)' fixup creates .pc/applied-patches since modern dpkg-source creates it even though old ones didn't always.

6 years agoFix bug handling our synthetic merges when we see them in the remote suite branch.
Ian Jackson [Sat, 24 Aug 2013 17:37:23 +0000 (18:37 +0100)]
Fix bug handling our synthetic merges when we see them in the remote suite branch.

6 years agofix typo
Ian Jackson [Sat, 24 Aug 2013 17:16:58 +0000 (18:16 +0100)]
fix typo

6 years agoChange our .dsc field name to `Dgit'. Relevant to #720201.
Ian Jackson [Sat, 24 Aug 2013 17:15:46 +0000 (18:15 +0100)]
Change our .dsc field name to `Dgit'.  Relevant to #720201.

6 years agoBetter error when source package contains .git. Closes: #720555.
Ian Jackson [Sat, 24 Aug 2013 17:12:52 +0000 (18:12 +0100)]
Better error when source package contains .git.  Closes: #720555.

6 years agofix bug which causes all uploads to go to sid (!)
Ian Jackson [Sat, 24 Aug 2013 17:06:55 +0000 (18:06 +0100)]
fix bug which causes all uploads to go to sid (!)

6 years agotypo
Ian Jackson [Sat, 24 Aug 2013 17:02:07 +0000 (18:02 +0100)]
typo

6 years agotypo
Ian Jackson [Sat, 24 Aug 2013 17:01:52 +0000 (18:01 +0100)]
typo

6 years agoIn push, double-check the .changes against the changelog.
Ian Jackson [Sat, 24 Aug 2013 17:01:30 +0000 (18:01 +0100)]
In push, double-check the .changes against the changelog.

6 years agoMore comprehensive workaround for `3.0 (quilt)'.
Ian Jackson [Sat, 24 Aug 2013 16:47:07 +0000 (17:47 +0100)]
More comprehensive workaround for `3.0 (quilt)'.

6 years agonew cleaning arrangements
Ian Jackson [Sat, 24 Aug 2013 15:15:28 +0000 (16:15 +0100)]
new cleaning arrangements

6 years agonew cleaning arrangements
Ian Jackson [Sat, 24 Aug 2013 15:15:23 +0000 (16:15 +0100)]
new cleaning arrangements

6 years agoNew cleaning arrangements (wip).
Ian Jackson [Sat, 24 Aug 2013 13:42:02 +0000 (14:42 +0100)]
New cleaning arrangements (wip).

6 years agowip new arrangements for clean etc.
Ian Jackson [Sat, 24 Aug 2013 13:10:38 +0000 (14:10 +0100)]
wip new arrangements for clean etc.

6 years agoIn push, do git fetch as well as archive fetch, or archive fetch can fail. debian/0.8
Ian Jackson [Fri, 23 Aug 2013 11:24:16 +0000 (12:24 +0100)]
In push, do git fetch as well as archive fetch, or archive fetch can fail.

6 years agofinalise 0.8
Ian Jackson [Fri, 23 Aug 2013 11:15:19 +0000 (12:15 +0100)]
finalise 0.8

6 years agoFix comparison of archive's .dsc's hash and git branch head to DTRT.
Ian Jackson [Fri, 23 Aug 2013 11:15:10 +0000 (12:15 +0100)]
Fix comparison of archive's .dsc's hash and git branch head to DTRT.

6 years agoWhen creating repos in dgit-repos (using the ssh-cmd method), copy _template rather...
Ian Jackson [Fri, 23 Aug 2013 11:04:45 +0000 (12:04 +0100)]
When creating repos in dgit-repos (using the ssh-cmd method), copy _template rather than using mkdir and git init. Closes: #720522.

6 years agofinalise 0.7 again debian/0.7
Ian Jackson [Thu, 22 Aug 2013 17:29:18 +0000 (18:29 +0100)]
finalise 0.7 again

6 years agoIf dak ls, or rmadison, reports multiple versions, look for them all, and pick the...
Ian Jackson [Thu, 22 Aug 2013 17:27:53 +0000 (18:27 +0100)]
If dak ls, or rmadison, reports multiple versions, look for them all, and pick the newest .dsc that doesn't give 404.

(url_get can now return undef for 404)

6 years agofinalise 0.7
Ian Jackson [Thu, 22 Aug 2013 17:08:33 +0000 (18:08 +0100)]
finalise 0.7

6 years agoName the local remote tracking branch remotes/dgit/dgit/<suite> so that we avoid...
Ian Jackson [Thu, 22 Aug 2013 17:08:24 +0000 (18:08 +0100)]
Name the local remote tracking branch remotes/dgit/dgit/<suite> so that we avoid a warning from git about ambiguous branch names.

6 years agoManpage formatting fix.
Ian Jackson [Thu, 22 Aug 2013 17:02:33 +0000 (18:02 +0100)]
Manpage formatting fix.

6 years agoAllow fetching when archive has out-of-date git hash in .dsc. Closes: #720490. debian/0.6
Ian Jackson [Thu, 22 Aug 2013 15:02:24 +0000 (16:02 +0100)]
Allow fetching when archive has out-of-date git hash in .dsc. Closes: #720490.

6 years agofix new packages debian/0.5
Ian Jackson [Thu, 22 Aug 2013 14:41:05 +0000 (15:41 +0100)]
fix new packages

6 years agoUpload to unstable
Ian Jackson [Thu, 22 Aug 2013 14:38:15 +0000 (15:38 +0100)]
Upload to unstable

6 years agofinalise 0.4~pre2 debian/0.4_pre2
Ian Jackson [Thu, 22 Aug 2013 14:32:02 +0000 (15:32 +0100)]
finalise 0.4~pre2

6 years agoRevert change to ssh to alioth CNAME, as the recommended CNAME is to something with...
Ian Jackson [Thu, 22 Aug 2013 14:31:55 +0000 (15:31 +0100)]
Revert change to ssh to alioth CNAME, as the recommended CNAME is to something with no write access to the fs and the new CNAME has not yet been set up.  This reintroduces #720172 :-/.

6 years agoSupport dgit-distro.<distro>.keyid config option.
Ian Jackson [Thu, 22 Aug 2013 14:18:27 +0000 (15:18 +0100)]
Support dgit-distro.<distro>.keyid config option.

6 years agoMangle debian/<version> tags the way git-buildpackage does (as of git-buildpackage...
Ian Jackson [Thu, 22 Aug 2013 14:17:28 +0000 (15:17 +0100)]
Mangle debian/<version> tags the way git-buildpackage does (as of git-buildpackage 0.5.5, 3c6bbd0f4992f8da).

6 years agofix Closes syntax debian/0.4_pre1
Ian Jackson [Thu, 22 Aug 2013 13:54:19 +0000 (14:54 +0100)]
fix Closes syntax

6 years agobetter error msgs from check_not_dirty
Ian Jackson [Thu, 22 Aug 2013 13:52:47 +0000 (14:52 +0100)]
better error msgs from check_not_dirty

6 years agosuggest sbuild
Ian Jackson [Thu, 22 Aug 2013 13:48:49 +0000 (14:48 +0100)]
suggest sbuild

6 years agoNew --distro option (helps with unknown suites).
Ian Jackson [Thu, 22 Aug 2013 13:45:18 +0000 (14:45 +0100)]
New --distro option (helps with unknown suites).

6 years agocomment on retrying dput
Ian Jackson [Thu, 22 Aug 2013 13:36:55 +0000 (14:36 +0100)]
comment on retrying dput

6 years agobugfixes from testing, for recent changes
Ian Jackson [Thu, 22 Aug 2013 13:33:29 +0000 (14:33 +0100)]
bugfixes from testing, for recent changes

6 years agobugfixes from testing, for recent changes
Ian Jackson [Thu, 22 Aug 2013 13:32:41 +0000 (14:32 +0100)]
bugfixes from testing, for recent changes

6 years agowip bugfixes
Ian Jackson [Thu, 22 Aug 2013 13:03:36 +0000 (14:03 +0100)]
wip bugfixes

6 years agosupport _multi.changes
Ian Jackson [Thu, 22 Aug 2013 13:00:12 +0000 (14:00 +0100)]
support _multi.changes

6 years agodocument usual workflow
Ian Jackson [Thu, 22 Aug 2013 12:59:04 +0000 (13:59 +0100)]
document usual workflow

6 years agoin check_not_dirty, diff against HEAD as that's what we care about
Ian Jackson [Thu, 22 Aug 2013 12:58:50 +0000 (13:58 +0100)]
in check_not_dirty, diff against HEAD as that's what we care about

6 years agoProvide "dgit sbuild".
Ian Jackson [Thu, 22 Aug 2013 12:58:02 +0000 (13:58 +0100)]
Provide "dgit sbuild".

6 years agoOrdering improvement in push: don't add dsc field until git push done.
Ian Jackson [Thu, 22 Aug 2013 12:21:31 +0000 (13:21 +0100)]
Ordering improvement in push: don't add dsc field until git push done.

6 years agoBetter checking that the supplied .dsc and debian/changes correspond.
Ian Jackson [Thu, 22 Aug 2013 12:20:58 +0000 (13:20 +0100)]
Better checking that the supplied .dsc and debian/changes correspond.

6 years agomake manpage DESCRIPTION section more formal, and other manpage improvements
Ian Jackson [Thu, 22 Aug 2013 12:20:09 +0000 (13:20 +0100)]
make manpage DESCRIPTION section more formal, and other manpage improvements