X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=878065fff06eaaf1bc49993be180f39ae79790e8;hp=93fb6fcd2a47beff177cab661b9a316ef2046958;hb=afd3aa8b36b05f6cf01b17d553fc14250afacaec;hpb=fe01f87bb364084b6fffecfc5287818edc33718d diff --git a/dgit b/dgit index 93fb6fcd..878065ff 100755 --- a/dgit +++ b/dgit @@ -24,10 +24,12 @@ use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; use File::Path; +use File::Basename; use Dpkg::Version; use POSIX; our $isuite = 'unstable'; +our $idistro; our $package; our $sign = 1; @@ -35,6 +37,7 @@ our $dryrun = 0; our $changesfile; our $new_package = 0; our $existing_package = 'dpkg'; +our $cleanmode = 'dpkg-source'; our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -44,14 +47,19 @@ our (@dput) = qw(dput); our (@debsign) = qw(debsign); our (@sbuild) = qw(sbuild -A); our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git); +our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git); +our (@dpkggenchanges) = qw(dpkg-genchanges); our (@mergechanges) = qw(mergechanges -f); - +our (@changesopts) = (''); our %opts_opt_map = ('dget' => \@dget, 'dput' => \@dput, 'debsign' => \@debsign, 'sbuild' => \@sbuild, + 'dpkg-source' => \@dpkgsource, 'dpkg-buildpackage' => \@dpkgbuildpackage, + 'dpkg-genchanges' => \@dpkggenchanges, + 'ch' => \@changesopts, 'mergechanges' => \@mergechanges); our $keyid; @@ -60,19 +68,25 @@ our $debug = 0; open DEBUG, ">/dev/null" or die $!; our $remotename = 'dgit'; -our $ourdscfield = 'Vcs-Dgit-Master'; +our @ourdscfield = qw(Dgit Vcs-Dgit-Master); our $branchprefix = 'dgit'; our $csuite; sub lbranch () { return "$branchprefix/$csuite"; } my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$'; sub lref () { return "refs/heads/".lbranch(); } -sub lrref () { return "refs/remotes/$remotename/$csuite"; } +sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; } sub rrref () { return "refs/$branchprefix/$csuite"; } -sub debiantag ($) { return "debian/$_[0]"; } +sub debiantag ($) { + my ($v) = @_; + $v =~ y/~:/_%/; + return "debian/$v"; +} sub dscfn ($) { return "${package}_$_[0].dsc"; } +sub changesopts () { return @changesopts[1..$#changesopts]; } + our $us = 'dgit'; sub fail { die "$us: @_\n"; } @@ -99,6 +113,7 @@ sub url_get { my $what = $_[$#_]; print "downloading $what...\n"; my $r = $ua->get(@_) or die $!; + return undef if $r->code == 404; $r->is_success or fail "failed to fetch $what: ".$r->status_line; return $r->decoded_content(); } @@ -195,6 +210,10 @@ important dgit options: -c= set git config option (used directly by dgit too) END +our $later_warning_msg = < 'debian', 'dgit.default.username' => '', 'dgit.default.archive-query-default-component' => 'main', 'dgit.default.ssh' => 'ssh', - 'dgit-distro.debian.git-host' => 'dgit.debian.net', + 'dgit-distro.debian.git-host' => 'git.debian.org', 'dgit-distro.debian.git-proto' => 'git+ssh://', 'dgit-distro.debian.git-path' => '/git/dgit-repos', 'dgit-distro.debian.git-check' => 'ssh-cmd', @@ -217,7 +236,7 @@ our %defcfg = ('dgit.default.distro' => 'debian', 'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org', 'dgit-distro.debian.sshdakls-dir' => '/srv/ftp-master.debian.org/ftp/dists', - 'dgit-distro.debian.mirror' => 'http://http.debian.net/debian/'); + 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/'); sub cfg { foreach my $c (@_) { @@ -246,7 +265,7 @@ sub access_distro () { sub access_cfg (@) { my (@keys) = @_; - my $distro = access_distro(); + my $distro = $idistro || access_distro(); my $value = cfg(map { ("dgit-distro.$distro.$_", "dgit.default.$_") } @keys); return $value; @@ -363,26 +382,27 @@ sub canonicalise_suite_sshdakls ($$) { sub madison_parse ($) { my ($rmad) = @_; - if (!length $rmad) { - return (); - } - $rmad =~ m{^ \s*( [^ \t|]+ )\s* \| - \s*( [^ \t|]+ )\s* \| - \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \| - \s*( [^ \t|]+ )\s* }x or die "$rmad $?"; - $1 eq $package or die "$rmad $package ?"; - my $vsn = $2; - my $newsuite = $3; - my $component; - if (defined $4) { - $component = $4; - } else { - $component = access_cfg('archive-query-default-component'); + my @out; + foreach my $l (split /\n/, $rmad) { + $l =~ m{^ \s*( [^ \t|]+ )\s* \| + \s*( [^ \t|]+ )\s* \| + \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \| + \s*( [^ \t|]+ )\s* }x or die "$rmad $?"; + $1 eq $package or die "$rmad $package ?"; + my $vsn = $2; + my $newsuite = $3; + my $component; + if (defined $4) { + $component = $4; + } else { + $component = access_cfg('archive-query-default-component'); + } + $5 eq 'source' or die "$rmad ?"; + my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1); + my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc"; + push @out, [$vsn,$subpath,$newsuite]; } - $5 eq 'source' or die "$rmad ?"; - my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1); - my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc"; - return ($vsn,$subpath,$newsuite); + return sort { -version_compare_string($a->[0],$b->[0]); } @out; } sub canonicalise_suite_madison ($$) { @@ -391,7 +411,7 @@ sub canonicalise_suite_madison ($$) { "unable to canonicalise suite using package $package". " which does not appear to exist in suite $isuite;". " --existing-package may help"; - return $r[2]; + return $r[0][2]; } sub canonicalise_suite () { @@ -403,17 +423,24 @@ sub canonicalise_suite () { } sub get_archive_dsc () { - my ($vsn,$subpath) = archive_query('archive_query'); canonicalise_suite(); - if (!defined $vsn) { $dsc=undef; return undef; } - $dscurl = access_cfg('mirror').$subpath; - $dscdata = url_get($dscurl); - my $dscfh = new IO::File \$dscdata, '<' or die $!; - print DEBUG Dumper($dscdata) if $debug>1; - $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1); - print DEBUG Dumper($dsc) if $debug>1; - my $fmt = getfield $dsc, 'Format'; - fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt}; + my @vsns = archive_query('archive_query'); + foreach my $vinfo (@vsns) { + my ($vsn,$subpath) = @$vinfo; + $dscurl = access_cfg('mirror').$subpath; + $dscdata = url_get($dscurl); + next unless defined $dscdata; + $dscurl = access_cfg('mirror').$subpath; + $dscdata = url_get($dscurl); + my $dscfh = new IO::File \$dscdata, '<' or die $!; + print DEBUG Dumper($dscdata) if $debug>1; + $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1); + print DEBUG Dumper($dsc) if $debug>1; + my $fmt = getfield $dsc, 'Format'; + fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt}; + return $dsc; + } + return undef; } sub check_for_git () { @@ -438,9 +465,7 @@ sub create_remote_git_repo () { runcmd_ordryrun (access_cfg('ssh'),access_gituserhost(), "set -e; cd ".access_cfg('git-path').";". - " mkdir -p $package.git;". - " cd $package.git;". - " if ! test -d objects; then git init --bare; fi"); + " cp -a _template $package.git"); } else { badcfg "unknown git-create \`$how'"; } @@ -463,7 +488,7 @@ sub mktree_in_ud_from_only_subdir () { $dirs[0] =~ m#^([^/]+)/\.$# or die; my $dir = $1; chdir $dir or die "$dir $!"; - die if stat '.git'; + fail "source package contains .git directory" if stat '.git'; die $! unless $!==&ENOENT; runcmd qw(git init -q); rmtree('.git/objects'); @@ -560,17 +585,15 @@ END $outputhash = make_commit qw(../commit2.tmp); } elsif ($vcmp > 0) { print STDERR <{$ourdscfield}; + foreach my $field (@ourdscfield) { + $dsc_hash = $dsc->{$field}; + last if defined $dsc_hash; + } if (defined $dsc_hash) { $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'"; $dsc_hash = $&; @@ -642,10 +668,24 @@ sub fetch_from_archive () { 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().")" + " (should be in ".access_giturl()."#".rrref().")" unless $upload_hash; $hash = $dsc_hash; ensure_we_have_orig(); + if ($dsc_hash eq $upload_hash) { + } elsif (is_fast_fwd($dsc_hash,$upload_hash)) { + print STDERR <0; + $!=0; $?=0; system @cmd; + return if !$! && !$?; + if (!$! && $?==256) { + fail "working tree is dirty (does not match HEAD)"; + } else { + failedcmd @cmd; + } } -sub commit_quilty_patch ($) { - my ($vsn) = @_; +sub commit_quilty_patch () { my $output = cmdoutput @git, qw(status --porcelain); - my %fixups = map {$_=>1} - (".pc/debian-changes-$vsn/","debian/patches/debian-changes-$vsn"); - my @files; + my %adds; + my $bad=0; foreach my $l (split /\n/, $output) { - next unless $l =~ s/^\?\? //; - next unless $fixups{$l}; - push @files, $l; + next unless $l =~ m/\S/; + if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) { + $adds{$1}++; + } else { + print STDERR "git status: $l\n"; + $bad++; + } } - print DEBUG "checking for quilty\n", Dumper(\@files); - if (@files == 2) { - my $m = "Commit Debian 3.0 (quilt) metadata"; - print "$m\n"; - runcmd_ordryrun @git, qw(add), @files; - runcmd_ordryrun @git, qw(commit -m), $m; + fail "unexpected output from git status (is tree clean?)" if $bad; + if (!%adds) { + print "nothing quilty to commit, ok.\n"; + return; } + runcmd_ordryrun @git, qw(add), sort keys %adds; + my $m = "Commit Debian 3.0 (quilt) metadata"; + print "$m\n"; + runcmd_ordryrun @git, qw(commit -m), $m; +} + +sub madformat ($) { + my ($format) = @_; + return 0 unless $format eq '3.0 (quilt)'; + print "Format \`$format', urgh\n"; + return 1; } sub dopush () { @@ -746,9 +805,8 @@ sub dopush () { 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); + if (madformat($format)) { + commit_quilty_patch(); } check_not_dirty(); prep_ud(); @@ -774,7 +832,7 @@ sub dopush () { # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git", # map { lref($_).":".rref($_) } # (uploadbranch()); - $dsc->{$ourdscfield} = rev_parse('HEAD'); + $dsc->{$ourdscfield[0]} = rev_parse('HEAD'); $dsc->save("../$dscfn.tmp") or die $!; if (!$changesfile) { my $multi = "../${package}_${cversion}_multi.changes"; @@ -791,6 +849,12 @@ sub dopush () { ($changesfile) = @cs; } } + my $changes = parsecontrol($changesfile,$changesfile); + foreach my $field (qw(Source Distribution Version)) { + $changes->{$field} eq $clogp->{$field} or + fail "changes field $field \`$changes->{$field}'". + " does not match changelog \`$clogp->{$field}'"; + } my $tag = debiantag($dversion); if (!check_for_git()) { create_remote_git_repo(); @@ -802,6 +866,9 @@ sub dopush () { print "[new .dsc left in $dscfn.tmp]\n"; } if ($sign) { + if (!defined $keyid) { + $keyid = access_cfg('keyid','RETURN-UNDEF'); + } my @tag_cmd = (@git, qw(tag -s -m), "Release $dversion for $csuite [dgit]"); push @tag_cmd, qw(-u),$keyid if defined $keyid; @@ -896,21 +963,97 @@ sub cmd_push { } else { badusage "incorrect arguments to dgit push"; } + if (check_for_git()) { + git_fetch_us(); + } if (fetch_from_archive()) { is_fast_fwd(lrref(), 'HEAD') or die; } else { - fail "package appears to be new in this suite;". - " if this is intentional, use --new"; + $new_package or + fail "package appears to be new in this suite;". + " if this is intentional, use --new"; } dopush(); } +our $version; +our $sourcechanges; +our $dscfn; + +our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT'; + +sub build_maybe_quilt_fixup () { + if (!open F, "debian/source/format") { + die $! unless $!==&ENOENT; + return; + } + $_ = ; + F->error and die $!; + chomp; + return unless madformat($_); + # sigh + my $headref = rev_parse('HEAD'); + my $time = time; + my $patchname = "auto-$version-$headref-$time"; + my $author = cmdoutput @git, qw(log -n1), '--pretty=format:%an <%ae>'; + my $msg = cmdoutput @git, qw(log -n1), "--pretty=format:%s\n%b"; + my $descfn = ".git/dgit/quilt-description.tmp"; + open O, '>', $descfn or die "$descfn: $!"; + $msg =~ s/\n/\n /g; + $msg =~ s/^\s+$/ ./mg; + print O <>', ".pc/applied-patches") { + $!==&ENOENT or die $!; + } else { + close P; + } + + commit_quilty_patch(); +} + +sub quilt_fixup_editor () { + my $descfn = $ENV{$fakeeditorenv}; + my $editing = $ARGV[$#ARGV]; + open I1, '<', $descfn or die "$descfn: $!"; + open I2, '<', $editing or die "$editing: $!"; + unlink $editing or die "$editing: $!"; + open O, '>', $editing or die "$editing: $!"; + while () { print O or die $!; } I1->error and die $!; + my $copying = 0; + while () { + $copying ||= m/^\-\-\- /; + next unless $copying; + print O or die $!; + } + I2->error and die $!; + close O or die $1; + exit 0; +} + sub cmd_build { # we pass further options and args to git-buildpackage badusage "-p is not allowed with dgit build" if defined $package; + badusage "dgit build implies --clean=dpkg-source" if defined $package; my $clogp = parsechangelog(); $isuite = getfield $clogp, 'Distribution'; $package = getfield $clogp, 'Source'; + $version = getfield $clogp, 'Version'; + build_maybe_quilt_fixup(); my @cmd = (qw(git-buildpackage -us -uc --git-no-sign-tags), "--git-builder=@dpkgbuildpackage"); @@ -918,21 +1061,51 @@ sub cmd_build { canonicalise_suite(); push @cmd, "--git-debian-branch=".lbranch(); } + push @cmd, changesopts(); runcmd_ordryrun @cmd, @ARGV; printdone "build successful\n"; } -sub cmd_sbuild { +sub build_source { + badusage "-p is not allowed with this action" if defined $package; 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)); + $isuite = getfield $clogp, 'Distribution'; + $version = getfield $clogp, 'Version'; + $sourcechanges = "${package}_${version}_source.changes"; + $dscfn = dscfn($version); + build_maybe_quilt_fixup(); + if ($cleanmode eq 'dpkg-source') { + runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)), changesopts(); + } else { + if ($cleanmode eq 'git') { + runcmd_ordryrun @git, qw(clean -xdf); + } elsif ($cleanmode eq 'none') { + } else { + die "$cleanmode ?"; + } + my $pwd = cmdoutput qw(env - pwd); + my $leafdir = basename $pwd; + chdir ".." or die $!; + runcmd_ordryrun @dpkgsource, qw(-b --), $leafdir; + chdir $pwd or die $!; + runcmd_ordryrun qw(sh -ec), + 'exec >$1; shift; exec "$@"','x', + "../$sourcechanges", + @dpkggenchanges, qw(-S), changesopts(); + } +} + +sub cmd_build_source { + badusage "build-source takes no additional arguments" if @ARGV; + build_source(); + printdone "source built, results in $dscfn and $sourcechanges"; +} + +sub cmd_sbuild { + build_source(); 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): $!"; @@ -952,9 +1125,10 @@ sub cmd_sbuild { } sub cmd_quilt_fixup { - badusage "incorrect arguments to dgit quilt-fixup"; + badusage "incorrect arguments to dgit quilt-fixup" if @ARGV; my $clogp = parsechangelog(); - commit_quilty_patch((getfield $clogp, 'Version')); + $version = getfield $clogp, 'Version'; + build_maybe_quilt_fixup(); } sub parseopts () { @@ -972,12 +1146,21 @@ sub parseopts () { helponly(); } elsif (m/^--new$/) { $new_package=1; - } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) { + } elsif (m/^--(\w+)=(.*)/s && + ($om = $opts_opt_map{$1}) && + length $om->[0]) { $om->[0] = $2; - } elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) { + } elsif (m/^--(\w+):(.*)/s && + ($om = $opts_opt_map{$1})) { push @$om, $2; } elsif (m/^--existing-package=(.*)/s) { $existing_package = $1; + } elsif (m/^--distro=(.*)/s) { + $idistro = $1; + } elsif (m/^--clean=(dpkg-source|git|none)$/s) { + $cleanmode = $1; + } elsif (m/^--clean=(.*)$/s) { + badusage "unknown cleaning mode \`$1'"; } else { badusage "unknown long option \`$_'"; } @@ -992,12 +1175,23 @@ sub parseopts () { $debug++; } elsif (s/^-N/-/) { $new_package=1; + } elsif (m/^-[vm]/) { + push @changesopts, $_; + $_ = ''; } elsif (s/^-c(.*=.*)//s) { push @git, '-c', $1; + } elsif (s/^-d(.*)//s) { + $idistro = $1; } elsif (s/^-C(.*)//s) { $changesfile = $1; } elsif (s/^-k(.*)//s) { $keyid=$1; + } elsif (s/^-wn//s) { + $cleanmode = 'none'; + } elsif (s/^-wg//s) { + $cleanmode = 'git'; + } elsif (s/^-wd//s) { + $cleanmode = 'dpkg-source'; } else { badusage "unknown short option \`$_'"; } @@ -1006,6 +1200,10 @@ sub parseopts () { } } +if ($ENV{$fakeeditorenv}) { + quilt_fixup_editor(); +} + parseopts(); print STDERR "DRY RUN ONLY\n" if $dryrun; if (!@ARGV) {