X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=93fb6fcd2a47beff177cab661b9a316ef2046958;hp=33da111700c695ea51757f4335b8d194ff4c8344;hb=fe01f87bb364084b6fffecfc5287818edc33718d;hpb=184d3eea8478dd234f69516b1192c9bb35d62ab8 diff --git a/dgit b/dgit index 33da1117..93fb6fcd 100755 --- a/dgit +++ b/dgit @@ -42,14 +42,22 @@ our (@git) = qw(git); our (@dget) = qw(dget); our (@dput) = qw(dput); our (@debsign) = qw(debsign); -our $keyid; +our (@sbuild) = qw(sbuild -A); +our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git); +our (@mergechanges) = qw(mergechanges -f); -our $debug = 0; -open DEBUG, ">/dev/null" or die $!; our %opts_opt_map = ('dget' => \@dget, 'dput' => \@dput, - 'debsign' => \@debsign); + 'debsign' => \@debsign, + 'sbuild' => \@sbuild, + 'dpkg-buildpackage' => \@dpkgbuildpackage, + 'mergechanges' => \@mergechanges); + +our $keyid; + +our $debug = 0; +open DEBUG, ">/dev/null" or die $!; our $remotename = 'dgit'; our $ourdscfield = 'Vcs-Dgit-Master'; @@ -63,14 +71,16 @@ sub lrref () { return "refs/remotes/$remotename/$csuite"; } sub rrref () { return "refs/$branchprefix/$csuite"; } sub debiantag ($) { return "debian/$_[0]"; } +sub dscfn ($) { return "${package}_$_[0].dsc"; } + our $us = 'dgit'; -sub fail () { die "$us: @_\n"; } +sub fail { die "$us: @_\n"; } -sub badcfg () { print STDERR "$us: invalid configuration: @_\n"; exit 12; } +sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; } sub no_such_package () { - print STDERR "$us: package $package does not exist in suite $suite\n"; + print STDERR "$us: package $package does not exist in suite $isuite\n"; exit 4; } @@ -266,19 +276,29 @@ sub access_giturl () { sub parsecontrolfh ($$@) { my ($fh, $desc, @opts) = @_; - my $c = Dpkg::Control::Hash->new({ 'name' => $desc, @opts }); + my %opts = ('name' => $desc, @opts); + my $c = Dpkg::Control::Hash->new(%opts); $c->parse($fh) or die "parsing of $desc failed"; + return $c; } sub parsecontrol { my ($file, $desc) = @_; - my $fh = new IO::File '<', $file or die "$file: $!"; + my $fh = new IO::Handle; + open $fh, '<', $file or die "$file: $!"; my $c = parsecontrolfh($fh,$desc); $fh->error and die $!; close $fh; return $c; } +sub getfield ($$) { + my ($dctrl,$field) = @_; + my $v = $dctrl->{$field}; + return $v if defined $v; + fail "missing field $field in ".$v->get_option('name'); +} + sub parsechangelog { my $c = Dpkg::Control::Hash->new(); my $p = new IO::Handle; @@ -369,7 +389,7 @@ sub canonicalise_suite_madison ($$) { my @r = archive_query_madison($_[0],$_[1]); @r or fail "unable to canonicalise suite using package $package". - " which does not appear to exist in suite $suite;". + " which does not appear to exist in suite $isuite;". " --existing-package may help"; return $r[2]; } @@ -392,7 +412,7 @@ sub get_archive_dsc () { print DEBUG Dumper($dscdata) if $debug>1; $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1); print DEBUG Dumper($dsc) if $debug>1; - my $fmt = $dsc->{Format}; + my $fmt = getfield $dsc, 'Format'; fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt}; } @@ -455,11 +475,15 @@ sub mktree_in_ud_from_only_subdir () { } sub dsc_files () { + my $field = $dsc->{'Checksums-Sha256'} || $dsc->{Files}; + defined $field or + fail "missing both Checksums-Sha256 and Files in ". + $dsc->get_option('name'); map { m/^\w+ \d+ (\S+)$/ or fail "could not parse .dsc Files/Checksums line \`$_'"; $1; - } grep m/\S/, split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files}); + } grep m/\S/, split /\n/, $field; } sub is_orig_file ($) { @@ -492,32 +516,35 @@ sub generate_commit_from_dsc () { my ($tree,$dir) = mktree_in_ud_from_only_subdir(); runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; my $clogp = parsecontrol('../changelog.tmp',"commit's changelog"); - my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date}; - my $author = $clogp->{Maintainer}; + my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date'); + my $author = getfield $clogp, 'Maintainer'; $author =~ s#,.*##ms; my $authline = "$author $date"; $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or fail "unexpected commit author line format \`$authline'". " (was generated from changelog Maintainer field)"; + my $changes = getfield $clogp, 'Changes'; open C, ">../commit.tmp" or die $!; print C <{Changes} +$changes # imported from the archive END close C or die $!; my $outputhash = make_commit qw(../commit.tmp); - print "synthesised git commit from .dsc $clogp->{Version}\n"; + my $cversion = getfield $clogp, 'Version'; + print "synthesised git commit from .dsc $cversion\n"; if ($upload_hash) { runcmd @git, qw(reset --hard), $upload_hash; runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp'; my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog'); + my $oversion = getfield $oldclogp, 'Version'; my $vcmp = - version_compare_string($oldclogp->{Version}, $clogp->{Version}); + version_compare_string($oversion, $cversion); if ($vcmp < 0) { # git upload/ is earlier vsn than archive, use archive open C, ">../commit2.tmp" or die $!; @@ -528,25 +555,25 @@ parent $outputhash author $authline committer $authline -Record $package ($clogp->{Version}) in archive suite $csuite +Record $package ($cversion) in archive suite $csuite END $outputhash = make_commit qw(../commit2.tmp); } elsif ($vcmp > 0) { print STDERR <{Version} (older) -Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same) +Version actually in archive: $cversion (older) +Last allegedly pushed/uploaded: $oversion (newer or same) Perhaps the upload is stuck in incoming. Using the version from git. END $outputhash = $upload_hash; } elsif ($outputhash ne $upload_hash) { - fail "version in archive ($clogp->{Version})". + fail "version in archive ($cversion)". " is same as version in git". - " to-be-uploaded (upload/) branch ($oldclogp->{Version})". + " to-be-uploaded (upload/) branch ($oversion)". " but archive version hash no commit hash?!"; } } chdir '../../../..' or die $!; - runcmd @git, qw(update-ref -m),"dgit fetch import $clogp->{Version}", + runcmd @git, qw(update-ref -m),"dgit fetch import $cversion", 'DGIT_ARCHIVE', $outputhash; cmdoutput @git, qw(log -n2), $outputhash; # ... gives git a chance to complain if our commit is malformed @@ -610,19 +637,19 @@ sub fetch_from_archive () { } else { die "$lrref_fn $!"; } - print DEBUG "previous reference hash $upload_hash\n"; + print DEBUG "previous reference hash=$upload_hash\n"; my $hash; if (defined $dsc_hash) { - fail "missing git history even though dsc has hash -" - " could not find commit $dsc_hash" - " (should be in ".access_giturl()."#".rref().")"; + fail "missing git history even though dsc has hash -". + " could not find commit $dsc_hash". + " (should be in ".access_giturl()."#".rref().")" unless $upload_hash; $hash = $dsc_hash; ensure_we_have_orig(); } else { $hash = generate_commit_from_dsc(); } - print DEBUG "current hash $hash\n"; + print DEBUG "current hash=$hash\n"; if ($upload_hash) { fail "not fast forward on last upload branch!". " (archive's version left in DGIT_ARCHIVE)" @@ -679,7 +706,7 @@ sub pull () { } sub check_not_dirty () { - runcmd @git, qw(diff --quiet); + runcmd @git, qw(diff --quiet HEAD); } sub commit_quilty_patch ($) { @@ -705,16 +732,23 @@ sub commit_quilty_patch ($) { sub dopush () { print DEBUG "actually entering push\n"; my $clogp = parsechangelog(); - $package = $clogp->{Source}; - my $dscfn = "${package}_$clogp->{Version}.dsc"; + $package = getfield $clogp, 'Source'; + my $cversion = getfield $clogp, 'Version'; + my $dscfn = dscfn($cversion); stat "../$dscfn" or fail "looked for .dsc $dscfn, but $!;". " maybe you forgot to build"; $dsc = parsecontrol("../$dscfn","$dscfn"); - print DEBUG "format $dsc->{Format}\n"; - if ($dsc->{Format} eq '3.0 (quilt)') { - print "Format \`$dsc->{Format}', urgh\n"; - commit_quilty_patch($dsc->{Version}); + my $dscpackage = getfield $dsc, 'Source'; + my $format = getfield $dsc, 'Format'; + my $dversion = getfield $dsc, 'Version'; + ($dscpackage eq $package && $dversion eq $cversion) or + fail "$dsc is for $dscpackage $dversion". + " but debian/changelog is for $package $cversion"; + print DEBUG "format $format\n"; + if ($format eq '3.0 (quilt)') { + print "Format \`$format', urgh\n"; + commit_quilty_patch($dversion); } check_not_dirty(); prep_ud(); @@ -723,7 +757,7 @@ sub dopush () { runcmd qw(dpkg-source -x --), "../../../../$dscfn"; my ($tree,$dir) = mktree_in_ud_from_only_subdir(); chdir '../../../..' or die $!; - printcmd \@DEBUG,"+",@_; + printcmd \*DEBUG,"+",@_; my @diffcmd = (@git, qw(diff --exit-code), $tree); $!=0; $?=0; if (system @diffcmd) { @@ -742,27 +776,34 @@ sub dopush () { # (uploadbranch()); $dsc->{$ourdscfield} = rev_parse('HEAD'); $dsc->save("../$dscfn.tmp") or die $!; - if (!$dryrun) { - rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; - } else { - print "[new .dsc left in $dscfn.tmp]\n"; - } if (!$changesfile) { - my $pat = "${package}_$clogp->{Version}_*.changes"; - my @cs = glob "../$pat"; - fail "failed to find unique changes file". - " (looked for $pat in ..); perhaps you need to use dgit -C" - unless @cs==1; - ($changesfile) = @cs; - } - my $tag = debiantag($dsc->{Version}); + my $multi = "../${package}_${cversion}_multi.changes"; + if (stat "$multi") { + $changesfile = $multi; + } else { + $!==&ENOENT or die "$multi: $!"; + my $pat = "${package}_${cversion}_*.changes"; + my @cs = glob "../$pat"; + fail "failed to find unique changes file". + " (looked for $pat in .., or $multi);". + " perhaps you need to use dgit -C" + unless @cs==1; + ($changesfile) = @cs; + } + } + my $tag = debiantag($dversion); if (!check_for_git()) { create_remote_git_repo(); } runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref(); + if (!$dryrun) { + rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; + } else { + print "[new .dsc left in $dscfn.tmp]\n"; + } if ($sign) { my @tag_cmd = (@git, qw(tag -s -m), - "Release $dsc->{Version} for $csuite [dgit]"); + "Release $dversion for $csuite [dgit]"); push @tag_cmd, qw(-u),$keyid if defined $keyid; push @tag_cmd, $tag; runcmd_ordryrun @tag_cmd; @@ -775,7 +816,7 @@ sub dopush () { my $host = access_cfg('upload-host','RETURN-UNDEF'); my @hostarg = defined($host) ? ($host,) : (); runcmd_ordryrun @dput, @hostarg, $changesfile; - printdone "pushed and uploaded $dsc->{Version}"; + printdone "pushed and uploaded $dversion"; } sub cmd_clone { @@ -810,13 +851,13 @@ sub branchsuite () { sub fetchpullargs () { if (!defined $package) { my $sourcep = parsecontrol('debian/control','debian/control'); - $package = $sourcep->{Source}; + $package = getfield $sourcep, 'Source'; } if (@ARGV==0) { # $isuite = branchsuite(); # this doesn't work because dak hates canons if (!$isuite) { my $clogp = parsechangelog(); - $isuite = $clogp->{Distribution}; + $isuite = getfield $clogp, 'Distribution'; } canonicalise_suite(); print "fetching from suite $csuite\n"; @@ -845,9 +886,9 @@ sub cmd_push { badusage "-p is not allowed with dgit push" if defined $package; runcmd @git, qw(diff --quiet HEAD); my $clogp = parsechangelog(); - $package = $clogp->{Source}; + $package = getfield $clogp, 'Source'; if (@ARGV==0) { - $isuite = $clogp->{Distribution}; + $isuite = getfield $clogp, 'Distribution'; if ($new_package) { local ($package) = $existing_package; # this is a hack canonicalise_suite(); @@ -868,22 +909,52 @@ sub cmd_build { # we pass further options and args to git-buildpackage badusage "-p is not allowed with dgit build" if defined $package; my $clogp = parsechangelog(); - $isuite = $clogp->{Distribution}; - $package = $clogp->{Source}; + $isuite = getfield $clogp, 'Distribution'; + $package = getfield $clogp, 'Source'; my @cmd = (qw(git-buildpackage -us -uc --git-no-sign-tags), - '--git-builder=dpkg-buildpackage -i\.git/ -I.git'); + "--git-builder=@dpkgbuildpackage"); unless (grep { m/^--git-debian-branch/ } @ARGV) { canonicalise_suite(); push @cmd, "--git-debian-branch=".lbranch(); } runcmd_ordryrun @cmd, @ARGV; + printdone "build successful\n"; } +sub cmd_sbuild { + check_not_dirty(); + badusage "-p is not allowed with dgit sbuild" if defined $package; + my $clogp = parsechangelog(); + $package = getfield $clogp, 'Source'; + my $isuite = getfield $clogp, 'Distribution'; + my $version = getfield $clogp, 'Version'; + runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)); + chdir ".." or die $!; + my $sourcechanges = "${package}_${version}_source.changes"; + my $dscfn = dscfn($version); + my $pat = "${package}_${version}_*.changes"; + if (!$dryrun) { + stat $dscfn or fail "$dscfn (in parent directory): $!"; + stat $sourcechanges or fail "$sourcechanges (in parent directory): $!"; + foreach my $cf (glob $pat) { + next if $cf eq $sourcechanges; + unlink $cf or fail "remove $cf: $!"; + } + } + runcmd_ordryrun @sbuild, @ARGV, qw(-d), $isuite, $dscfn; + runcmd_ordryrun @mergechanges, glob $pat; + my $multichanges = "${package}_${version}_multi.changes"; + if (!$dryrun) { + stat $multichanges or fail "$multichanges: $!"; + } + printdone "build successful, results in $multichanges\n" or die $!; +} + sub cmd_quilt_fixup { badusage "incorrect arguments to dgit quilt-fixup"; my $clogp = parsechangelog(); - commit_quilty_patch($clogp->{Version}); + commit_quilty_patch((getfield $clogp, 'Version')); } sub parseopts () {