X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=b3a4e9b7fc10252debef9133c3010f6be52ac498;hp=4d9a71a8c3682049aa23223f13e5f99be075d167;hb=863475c001c7846fe4de4310f517207bd8178871;hpb=90d348ace9e603191cfc054fa0c432bfd56ae588 diff --git a/dgit b/dgit index 4d9a71a8..b6d81587 100755 --- a/dgit +++ b/dgit @@ -1,4 +1,22 @@ #!/usr/bin/perl -w +# dgit +# Integration between git and Debian-style archives +# +# Copyright (C)2013 Ian Jackson +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + use strict; use IO::Handle; @@ -6,26 +24,258 @@ use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; use File::Path; +use File::Temp qw(tempdir); +use File::Basename; +use Dpkg::Version; use POSIX; +use IPC::Open2; + +our $our_version = 'UNRELEASED'; ###substituted### + +our $isuite = 'unstable'; +our $idistro; +our $package; +our @ropts; + +our $sign = 1; +our $dryrun = 0; +our $changesfile; +our $new_package = 0; +our $ignoredirty = 0; +our $noquilt = 0; +our $existing_package = 'dpkg'; +our $cleanmode = 'dpkg-source'; +our $we_are_responder; -open DEBUG, ">&STDERR" or die $!; +our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); -our $pdo = 'http://packages.debian.org/'; -#our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; -our $suite = 'sid'; -our $package = '2vcard'; +our (@git) = qw(git); +our (@dget) = qw(dget); +our (@dput) = qw(dput); +our (@debsign) = qw(debsign); +our (@gpg) = qw(gpg); +our (@sbuild) = qw(sbuild -A); +our (@ssh) = 'ssh'; +our (@dgit) = qw(dgit); +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 $aliothname = 'iwj@git.debian.org'; -our $aliothpath = '/git/dgit-test'; -our $alioth_git = "git+ssh://$aliothname/$aliothpath"; -our $alioth_sshtestbodge = [$aliothname,$aliothpath]; +our %opts_opt_map = ('dget' => \@dget, + 'dput' => \@dput, + 'debsign' => \@debsign, + 'gpg' => \@gpg, + 'sbuild' => \@sbuild, + 'ssh' => \@ssh, + 'dgit' => \@dgit, + 'dpkg-source' => \@dpkgsource, + 'dpkg-buildpackage' => \@dpkgbuildpackage, + 'dpkg-genchanges' => \@dpkggenchanges, + 'ch' => \@changesopts, + 'mergechanges' => \@mergechanges); -our (@dget_opts) = qw(-u); +our %opts_opt_cmdonly = ('gpg' => 1); + +our $keyid; + +our $debug = 0; +open DEBUG, ">/dev/null" or die $!; our $remotename = 'dgit'; +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/$branchprefix/$csuite"; } +sub rrref () { return "refs/$branchprefix/$csuite"; } +sub debiantag ($) { + my ($v) = @_; + $v =~ y/~:/_%/; + return "debian/$v"; +} + +sub stripepoch ($) { + my ($vsn) = @_; + $vsn =~ s/^\d+\://; + return $vsn; +} + +sub dscfn ($) { + my ($vsn) = @_; + return "${package}_".(stripepoch $vsn).".dsc"; +} + +sub changesopts () { return @changesopts[1..$#changesopts]; } + +our $us = 'dgit'; +our $debugprefix = ' '; + +sub printdebug { print DEBUG $debugprefix, @_ or die $!; } + +sub fail { die "$us: @_\n"; } + +sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; } + +sub no_such_package () { + print STDERR "$us: package $package does not exist in suite $isuite\n"; + exit 4; +} + +sub fetchspec () { + local $csuite = '*'; + return "+".rrref().":".lrref(); +} + +#---------- remote protocol support, common ---------- + +# remote push initiator/responder protocol: +# < dgit-remote-push-ready [optional extra info ignored by old initiators] +# +# > file parsed-changelog +# [indicates that output of dpkg-parsechangelog follows] +# > data-block NBYTES +# > [NBYTES bytes of data (no newline)] +# [maybe some more blocks] +# > data-end +# +# > file dsc +# [etc] +# +# > file changes +# [etc] +# +# > param head HEAD +# +# > want signed-tag +# [indicates that signed tag is wanted] +# < data-block NBYTES +# < [NBYTES bytes of data (no newline)] +# [maybe some more blocks] +# < data-end +# < files-end +# +# > want signed-dsc-changes +# < data-block NBYTES [transfer of signed dsc] +# [etc] +# < data-block NBYTES [transfer of signed changes] +# [etc] +# < files-end +# +# > complete + +sub badproto ($$) { + my ($fh, $m) = @_; + fail "connection lost: $!" if $fh->error; + fail "connection terminated" if $fh->eof; + fail "protocol violation; $m not expected"; +} + +sub protocol_expect (&$) { + my ($match, $fh) = @_; + local $_; + $_ = <$fh>; + defined && chomp or badproto $fh, "eof"; + if (wantarray) { + my @r = &$match; + return @r if @r; + } else { + my $r = &$match; + return $r if $r; + } + badproto $fh, "\`$_'"; +} + +sub protocol_send_file ($$) { + my ($fh, $ourfn) = @_; + open PF, "<", $ourfn or die "$ourfn: $!"; + for (;;) { + my $d; + my $got = read PF, $d, 65536; + die "$ourfn: $!" unless defined $got; + last if $got; + print $fh "data-block ".length($d)."\n" or die $!; + print $d or die $!; + } + print $fh "data-end\n" or die $!; + close PF; +} + +sub protocol_read_bytes ($$) { + my ($fh, $nbytes) = @_; + $nbytes =~ m/^\d{1,6}$/ or badproto \*RO, "bad byte count"; + my $d; + my $got = read $fh, $d, $nbytes; + $got==$nbytes or badproto $fh, "eof during data block"; + return $d; +} -sub mainbranch () { return "$suite"; } -sub uploadbranch () { return "upload/$suite"; } +sub protocol_receive_file ($$) { + my ($fh, $ourfn) = @_; + open PF, ">", $ourfn or die "$ourfn: $!"; + for (;;) { + my ($y,$l) = protocol_expect { + m/^data-block (.*})$|data-end$/; + length $1 ? (1,$1) : (0); + } \*STDIN; + last unless $y; + my $d = protocol_read_bytes \*STDIN, $1; + print PF $d or die $!; + } + printdebug "received into $ourfn\n"; +} + +#---------- remote protocol support, responder ---------- + +sub responder_send_command ($) { + my ($command) = @_; + return unless $we_are_responder; + # called even without $we_are_responder + printdebug "<< $command\n"; + print $command, "\n" or die $!; +} + +sub responder_send_file ($$) { + my ($keyword, $ourfn) = @_; + return unless $we_are_responder; + printdebug "[[ $keyword $ourfn\n"; + responder_send_command "file $keyword"; + protocol_send_file \*STDOUT, $ourfn; +} + +sub responder_receive_files ($@) { + my ($keyword, @ourfns) = @_; + die unless $we_are_responder; + printdebug "]] $keyword @ourfns\n"; + responder_send_command "want $keyword"; + foreach my $fn (@ourfns) { + protocol_receive_file \*STDIN, $fn; + } + protocol_expect { m/^files-end$/ } \*STDIN; +} + +#---------- remote protocol support, initiator ---------- + +sub initiator_expect (&) { + my ($match) = @_; + protocol_expect { &$match } \*RO; +} + +#---------- end remote code ---------- + +sub progress { + if ($we_are_responder) { + my $m = join '', @_; + responder_send_command "progress ".length($m) or die $!; + print $m or die $!; + } else { + print @_, "\n"; + } +} our $ua; @@ -34,252 +284,1545 @@ sub url_get { $ua = LWP::UserAgent->new(); $ua->env_proxy; } - print DEBUG "fetching @_...\n"; + my $what = $_[$#_]; + progress "downloading $what..."; my $r = $ua->get(@_) or die $!; - die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success; + return undef if $r->code == 404; + $r->is_success or fail "failed to fetch $what: ".$r->status_line; return $r->decoded_content(); } -our ($dscdata,$dscurl,$dsc); +our ($dscdata,$dscurl,$dsc,$skew_warning_vsn); -sub parsecontrol { - my $c = Dpkg::Control::Hash->new(); - $c->load(@_) or return undef; - return $c; +sub shellquote { + my @out; + local $_; + foreach my $a (@_) { + $_ = $a; + if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) { + push @out, "'$_'"; + } else { + push @out, $_; + } + } + return join ' ', @out; } -sub get_archive_dsc () { - my $pdourl = "$pdo/source/$suite/$package"; - my $pdodata = url_get($pdourl); - # FFS. The Debian archive has no sane way to find what - # version is currently the tip in any branch (aka, what - # is the current version in any suite). - $pdodata =~ m{ - Download\ \Q$package\E .* - \\2\ - }msx - or die "screenscraping of $pdourl failed :-(\n"; - $dscurl = $1; -#print DEBUG Dumper($pdodata, $&, $dscurl); - $dscdata = url_get($dscurl); - my $dscfh = new IO::File \$dscdata, '<' or die $!; -#print DEBUG Dumper($dscdata, $dscfh); - $dsc = Dpkg::Control::Hash->new(allow_pgp=>1); - $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n"; -#print DEBUG Dumper($dsc); - my $fmt = $dsc->{Format}; - die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0'; +sub printcmd { + my $fh = shift @_; + my $intro = shift @_; + print $fh $intro," " or die $!; + print $fh shellquote @_ or die $!; + print $fh "\n" or die $!; } -sub check_for_git () { - # returns 0 or 1 - my $cmd= - "ssh $alioth_sshtestbodge->[0] '". - " set -e; cd /git/dgit-test;". - " if test -d $package.git; then echo 1; else echo 0; fi". - "'"; - #print DEBUG "$cmd\n"; - open P, "$cmd |" or die $!; - $!=0; $?=0; - my $r =

; close P; -#print STDERR ">$r<\n"; - die "$r $! $?" unless $r =~ m/^[01]$/; - return $r+0; +sub failedcmd { + { local ($!); printcmd \*STDERR, "$_[0]: failed command:", @_ or die $!; }; + if ($!) { + fail "failed to fork/exec: $!"; + } elsif (!($? & 0xff)) { + fail "subprocess failed with error exit status ".($?>>8); + } elsif ($?) { + fail "subprocess crashed (wait status $?)"; + } else { + fail "subprocess produced invalid output"; + } } sub runcmd { + printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0; $!=0; $?=0; - die "@_ $! $?" if system @_; + failedcmd @_ if system @_; } -sub cmdoutput { +sub printdone { + if (!$dryrun) { + progress "dgit ok: @_"; + } else { + progress "would be ok: @_ (but dry run only)"; + } +} + +sub cmdoutput_errok { + die Dumper(\@_)." ?" if grep { !defined } @_; + printcmd(\*DEBUG,$debugprefix."|",@_) if $debug>0; open P, "-|", @_ or die $!; my $d; $!=0; $?=0; { local $/ = undef; $d =

; } - die if P->error; - close P or die "@_ $? $!"; + die $! if P->error; + if (!close P) { printdebug "=>!$?\n" if $debug>0; return undef; } chomp $d; + $d =~ m/^.*/; + printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #'; return $d; } -our ($dsc_hash,$lastupl_hash); +sub cmdoutput { + my $d = cmdoutput_errok @_; + defined $d or failedcmd @_; + return $d; +} -sub generate_commit_from_dsc () { - my $ud = '.git/dgit/unpack'; +sub dryrun_report { + printcmd(\*STDERR,$debugprefix."#",@_); +} + +sub runcmd_ordryrun { + if (!$dryrun) { + runcmd @_; + } else { + dryrun_report @_; + } +} + +sub shell_cmd { + my ($first_shell, @cmd) = @_; + return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd; +} + +our $helpmsg = < sign tag and package with instead of default + --dry-run -n do not change anything, but go through the motions + --new -N allow introducing a new package + --debug -D increase debug level + -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' => 'git.debian.org', + 'dgit-distro.debian.git-proto' => 'git+ssh://', + 'dgit-distro.debian.git-path' => '/git/dgit-repos/repos', + 'dgit-distro.debian.git-check' => 'ssh-cmd', + 'dgit-distro.debian.git-create' => 'ssh-cmd', + 'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org', + 'dgit-distro.debian.sshdakls-dir' => + '/srv/ftp-master.debian.org/ftp/dists', + 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput + 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/'); + +sub cfg { + foreach my $c (@_) { + return undef if $c =~ /RETURN-UNDEF/; + my @cmd = (@git, qw(config --), $c); + my $v; + { + local ($debug) = $debug-1; + $v = cmdoutput_errok @cmd; + }; + if ($?==0) { + return $v; + } elsif ($?!=256) { + failedcmd @cmd; + } + my $dv = $defcfg{$c}; + return $dv if defined $dv; + } + badcfg "need value for one of: @_"; +} + +sub access_distro () { + return cfg("dgit-suite.$isuite.distro", + "dgit.default.distro"); +} + +sub access_cfg (@) { + my (@keys) = @_; + my $distro = $idistro || access_distro(); + my $value = cfg(map { ("dgit-distro.$distro.$_", + "dgit.default.$_") } @keys); + return $value; +} + +sub string_to_ssh ($) { + my ($spec) = @_; + if ($spec =~ m/\s/) { + return qw(sh -ec), 'exec '.$spec.' "$@"', 'x'; + } else { + return ($spec); + } +} + +sub access_cfg_ssh () { + my $gitssh = access_cfg('ssh', 'RETURN-UNDEF'); + if (!defined $gitssh) { + return @ssh; + } else { + return string_to_ssh $gitssh; + } +} + +sub access_someuserhost ($) { + my ($some) = @_; + my $user = access_cfg("$some-user",'username'); + my $host = access_cfg("$some-host"); + return length($user) ? "$user\@$host" : $host; +} + +sub access_gituserhost () { + return access_someuserhost('git'); +} + +sub access_giturl () { + my $url = access_cfg('git-url','RETURN-UNDEF'); + if (!defined $url) { + $url = + access_cfg('git-proto'). + access_gituserhost(). + access_cfg('git-path'); + } + return "$url/$package.git"; +} + +sub parsecontrolfh ($$@) { + my ($fh, $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::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; + my @cmd = (qw(dpkg-parsechangelog), @_); + open $p, '-|', @cmd or die $!; + $c->parse($p); + $?=0; $!=0; close $p or failedcmd @cmd; + return $c; +} + +our %rmad; + +sub archive_query ($) { + my ($method) = @_; + my $query = access_cfg('archive-query','RETURN-UNDEF'); + if (!defined $query) { + my $distro = access_distro(); + if ($distro eq 'debian') { + $query = "sshdakls:". + access_someuserhost('sshdakls').':'. + access_cfg('sshdakls-dir'); + } else { + $query = "madison:$distro"; + } + } + $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'"; + my $proto = $1; + my $data = $'; #'; + { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); } +} + +sub archive_query_madison ($$) { + my ($proto,$data) = @_; + die unless $proto eq 'madison'; + $rmad{$package} ||= cmdoutput + qw(rmadison -asource),"-s$isuite","-u$data",$package; + my $rmad = $rmad{$package}; + return madison_parse($rmad); +} + +sub archive_query_sshdakls ($$) { + my ($proto,$data) = @_; + $data =~ s/:.*// or badcfg "invalid sshdakls method string \`$data'"; + my $dakls = cmdoutput + access_cfg_ssh, $data, qw(dak ls -asource),"-s$isuite",$package; + return madison_parse($dakls); +} + +sub canonicalise_suite_sshdakls ($$) { + my ($proto,$data) = @_; + $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'"; + my @cmd = + (access_cfg_ssh, $`, + "set -e; cd $';". + " if test -h $isuite; then readlink $isuite; exit 0; fi;". + " if test -d $isuite; then echo $isuite; exit 0; fi;". + " exit 1"); + my $dakls = cmdoutput @cmd; + failedcmd @cmd unless $dakls =~ m/^\w/; + return $dakls; +} + +sub madison_parse ($) { + my ($rmad) = @_; + 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/".dscfn($vsn); + push @out, [$vsn,$subpath,$newsuite]; + } + return sort { -version_compare_string($a->[0],$b->[0]); } @out; +} + +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 $isuite;". + " --existing-package may help"; + return $r[0][2]; +} + +sub canonicalise_suite () { + return if defined $csuite; + fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED'; + $csuite = archive_query('canonicalise_suite'); + if ($isuite ne $csuite) { + # madison canonicalises for us + progress "canonical suite name for $isuite is $csuite"; + } +} + +sub get_archive_dsc () { + canonicalise_suite(); + my @vsns = archive_query('archive_query'); + foreach my $vinfo (@vsns) { + my ($vsn,$subpath) = @$vinfo; + $dscurl = access_cfg('mirror').$subpath; + $dscdata = url_get($dscurl); + if (!$dscdata) { + $skew_warning_vsn = $vsn if !defined $skew_warning_vsn; + next; + } + my $dscfh = new IO::File \$dscdata, '<' or die $!; + printdebug Dumper($dscdata) if $debug>1; + $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1); + printdebug Dumper($dsc) if $debug>1; + my $fmt = getfield $dsc, 'Format'; + fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt}; + return; + } + $dsc = undef; +} + +sub check_for_git () { + # returns 0 or 1 + my $how = access_cfg('git-check'); + if ($how eq 'ssh-cmd') { + my @cmd = + (access_cfg_ssh, access_gituserhost(), + " set -e; cd ".access_cfg('git-path').";". + " if test -d $package.git; then echo 1; else echo 0; fi"); + my $r= cmdoutput @cmd; + failedcmd @cmd unless $r =~ m/^[01]$/; + return $r+0; + } else { + badcfg "unknown git-check \`$how'"; + } +} + +sub create_remote_git_repo () { + my $how = access_cfg('git-create'); + if ($how eq 'ssh-cmd') { + runcmd_ordryrun + (access_cfg_ssh, access_gituserhost(), + "set -e; cd ".access_cfg('git-path').";". + " cp -a _template $package.git"); + } else { + badcfg "unknown git-create \`$how'"; + } +} + +our ($dsc_hash,$lastpush_hash); + +our $ud = '.git/dgit/unpack'; + +sub prep_ud () { rmtree($ud); mkpath '.git/dgit'; mkdir $ud or die $!; - chdir $ud or die $!; - my @files; - foreach (split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files})) { - next unless m/\S/; - m/^\w+ \d+ (\S+)$/ or die "$_ ?"; - my $f = $1; - die if $f =~ m#/|^\.|\.dsc$|\.tmp$#; - push @files, $f; - link "../../../$f", $f - or $!==&ENOENT - or die "$f $!"; - } - runcmd qw(dget), @dget_opts, qw(--), $dscurl; - foreach my $f (grep { m/\.tar\.gz$/ } @files) { - link $f, "../../../$f" - or $!==&EEXIST - or die "$f $!"; - } +} + +sub mktree_in_ud_from_only_subdir () { + # changes into the subdir my (@dirs) = <*/.>; die unless @dirs==1; $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'); symlink '../../../../objects','.git/objects' or die $!; - runcmd qw(git add -Af); - my $tree = cmdoutput qw(git write-tree); - chomp $tree; $tree =~ m/^\w+$/ or die "$tree ?"; - runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; - my $clogp = parsecontrol('../changelog.tmp','changelog') or die; - my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date}; - my $author = $clogp->{Maintainer}; + runcmd @git, qw(add -Af); + my $tree = cmdoutput @git, qw(write-tree); + $tree =~ m/^\w+$/ or die "$tree ?"; + return ($tree,$dir); +} + +sub dsc_files_info () { + foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'], + ['Checksums-Sha1', 'Digest::SHA', 'new(1)'], + ['Files', 'Digest::MD5', 'new()']) { + my ($fname, $module, $method) = @$csumi; + my $field = $dsc->{$fname}; + next unless defined $field; + eval "use $module; 1;" or die $@; + my @out; + foreach (split /\n/, $field) { + next unless m/\S/; + m/^(\w+) (\d+) (\S+)$/ or + fail "could not parse .dsc $fname line \`$_'"; + my $digester = eval "$module"."->$method;" or die $@; + push @out, { + Hash => $1, + Bytes => $2, + Filename => $3, + Digester => $digester, + }; + } + return @out; + } + fail "missing any supported Checksums-* or Files field in ". + $dsc->get_option('name'); +} + +sub dsc_files () { + map { $_->{Filename} } dsc_files_info(); +} + +sub is_orig_file ($) { + local ($_) = @_; + m/\.orig(?:-\w+)?\.tar\.\w+$/; +} + +sub make_commit ($) { + my ($file) = @_; + return cmdoutput @git, qw(hash-object -w -t commit), $file; +} + +sub clogp_authline ($) { + my ($clogp) = @_; + my $author = getfield $clogp, 'Maintainer'; $author =~ s#,.*##ms; + my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date'); my $authline = "$author $date"; - $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline; + $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or + fail "unexpected commit author line format \`$authline'". + " (was generated from changelog Maintainer field)"; + return $authline; +} + +sub generate_commit_from_dsc () { + prep_ud(); + chdir $ud or die $!; + my @files; + foreach my $f (dsc_files()) { + die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#; + push @files, $f; + link "../../../$f", $f + or $!==&ENOENT + or die "$f $!"; + } + runcmd @dget, qw(--), $dscurl; + foreach my $f (grep { is_orig_file($_) } @files) { + link $f, "../../../../$f" + or $!==&EEXIST + or die "$f $!"; + } + 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 $authline = clogp_authline $clogp; + my $changes = getfield $clogp, 'Changes'; open C, ">../commit.tmp" or die $!; - print C "tree $tree\n" or die $!; - print C "parent $lastupl_hash\n" or die $! if defined $lastupl_hash; print C <{Changes} +$changes -# imported by dgit from the archive +# imported from the archive END close C or die $!; - print "synthesised git commit from .dsc $clogp->{Version}\n"; - my $commithash = cmdoutput qw(git hash-object -w -t commit ../commit.tmp); - chdir '../../../..' or die $!; - cmdoutput qw(git update-ref -m),"dgit synthesise $clogp->{Version}", - 'DGIT_ARCHIVE', $commithash; - cmdoutput qw(git log -n2), $commithash; - # ... gives git a chance to complain if our commit is malformed - my $outputhash = $commithash; - if (defined $lastupl_hash) { - chdir "$ud/$dir" or die $!; - runcmd qw(git reset --hard), $lastupl_hash; + my $outputhash = make_commit qw(../commit.tmp); + my $cversion = getfield $clogp, 'Version'; + progress "synthesised git commit from .dsc $cversion"; + if ($lastpush_hash) { + runcmd @git, qw(reset --hard), $lastpush_hash; runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp'; - my $oldclogp = Dpkg::Control::Hash->new(); - $oldclogp->parse('../changelogold.tmp','previous changelog') or die; + 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 - } elsif ($vcmp >= 0) { + open C, ">../commit2.tmp" or die $!; + print C < 0) { print STDERR <{Version} (older) -Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same) -Perhaps the upload is stuck in incoming. Using the version from git. + +Version actually in archive: $cversion (older) +Last allegedly pushed/uploaded: $oversion (newer or same) +$later_warning_msg END - } else { - die "version in archive is same as version in git". - " to-be-uploaded (upload/) branch but archive". - " version hash no commit hash?!\n"; - } - chdir '../../../..' or die $!; + $outputhash = $lastpush_hash; + } else { + $outputhash = $lastpush_hash; + } } + chdir '../../../..' or die $!; + 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 rmtree($ud); return $outputhash; } -my $lastupl_ref = "refs/remotes/$remotename/upload/$suite"; +sub ensure_we_have_orig () { + foreach my $fi (dsc_files_info()) { + my $f = $fi->{Filename}; + next unless is_orig_file($f); + if (open F, "<", "../$f") { + $fi->{Digester}->reset(); + $fi->{Digester}->addfile(*F); + F->error and die $!; + my $got = $fi->{Digester}->hexdigest(); + $got eq $fi->{Hash} or + fail "existing file $f has hash $got but .dsc". + " demands hash $fi->{Hash}". + " (perhaps you should delete this file?)"; + progress "using existing $f"; + next; + } else { + die "$f $!" unless $!==&ENOENT; + } + my $origurl = $dscurl; + $origurl =~ s{/[^/]+$}{}; + $origurl .= "/$f"; + die "$f ?" unless $f =~ m/^${package}_/; + die "$f ?" if $f =~ m#/#; + runcmd_ordryrun shell_cmd 'cd ..', @dget,'--',$origurl; + } +} + +sub rev_parse ($) { + return cmdoutput @git, qw(rev-parse), "$_[0]~0"; +} + +sub is_fast_fwd ($$) { + my ($ancestor,$child) = @_; + my @cmd = (@git, qw(merge-base), $ancestor, $child); + my $mb = cmdoutput_errok @cmd; + if (defined $mb) { + return rev_parse($mb) eq rev_parse($ancestor); + } else { + $?==256 or failedcmd @cmd; + return 0; + } +} + +sub git_fetch_us () { + runcmd_ordryrun @git, qw(fetch),access_giturl(),fetchspec(); +} sub fetch_from_archive () { - # ensures that $lastupl_ref is what is actually in the archive, + # ensures that lrref() is what is actually in the archive, # one way or another - $!=0; $lastupl_hash = `git show-ref --heads $lastupl_ref`; - die $! if $!; - die $? unless ($?==0 && chomp $lastupl_hash) - or ($?==128 && !length $lastupl_hash); + get_archive_dsc(); + + if ($dsc) { + 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 = $&; + progress "last upload to archive specified git hash"; + } else { + progress "last upload to archive has NO git hash"; + } + } else { + progress "no version available from the archive"; + } + + my $lrref_fn = ".git/".lrref(); + if (open H, $lrref_fn) { + $lastpush_hash = ; + chomp $lastpush_hash; + die "$lrref_fn $lastpush_hash ?" unless $lastpush_hash =~ m/^\w+$/; + } elsif ($! == &ENOENT) { + $lastpush_hash = ''; + } else { + die "$lrref_fn $!"; + } + printdebug "previous reference hash=$lastpush_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()."#".rrref().")" + unless $lastpush_hash; $hash = $dsc_hash; - } else { + ensure_we_have_orig(); + if ($dsc_hash eq $lastpush_hash) { + } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) { + print STDERR <$clogf", + @git, qw(cat-file blob), "$hash:debian/changelog"; + my $gotclogp = parsechangelog("-l$clogf"); + my $got_vsn = getfield $gotclogp, 'Version'; + printdebug "SKEW CHECK GOT $got_vsn\n"; + if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) { + print STDERR < .git/HEAD" or die $!; + print H "ref: ".lref()."\n" or die $!; + close H or die $!; + runcmd @git, qw(remote add), 'origin', access_giturl(); + if (check_for_git()) { + progress "fetching existing git history"; + git_fetch_us(); + runcmd_ordryrun @git, qw(fetch origin); + } else { + progress "starting new git history"; + } + fetch_from_archive() or no_such_package; + runcmd @git, qw(reset --hard), lrref(); + printdone "ready for work in $dstdir"; +} -# } +sub fetch () { + if (check_for_git()) { + git_fetch_us(); + } + fetch_from_archive() or no_such_package(); + printdone "fetched into ".lrref(); +} -# open P, "-|", qw(git rev-parse --), $dsc_hash; - -#} +sub pull () { + fetch(); + runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]", + lrref(); + printdone "fetched to ".lrref()." and merged into HEAD"; +} -sub clone () { - get_archive_dsc(); - $dsc_hash = $dsc->{'Vcs-git-master'}; - if (defined $dsc_hash) { - $dsc_hash =~ m/\w+/ or die "$dsc_hash $?"; - $dsc_hash = $&; - print "last upload to archive specified git hash\n"; +sub check_not_dirty () { + return if $ignoredirty; + my @cmd = (@git, qw(diff --quiet HEAD)); + printcmd(\*DEBUG,$debugprefix."+",@cmd) if $debug>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 $output = cmdoutput @git, qw(status --porcelain); + my %adds; + my $bad=0; + foreach my $l (split /\n/, $output) { + next unless $l =~ m/\S/; + if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) { + $adds{$1}++; + } else { + print STDERR "git status: $l\n"; + $bad++; + } + } + fail "unexpected output from git status (is tree clean?)" if $bad; + if (!%adds) { + progress "nothing quilty to commit, ok."; + return; + } + runcmd_ordryrun @git, qw(add), sort keys %adds; + my $m = "Commit Debian 3.0 (quilt) metadata"; + progress "$m"; + runcmd_ordryrun @git, qw(commit -m), $m; +} + +sub madformat ($) { + my ($format) = @_; + return 0 unless $format eq '3.0 (quilt)'; + progress "Format \`$format', urgh"; + if ($noquilt) { + progress "Not doing any fixup of \`$format' due to --no-quilt-fixup"; + return 0; + } + return 1; +} + +sub push_parse_changelog ($) { + my ($clogpfn) = @_; + + my $clogp = Dpkg::Control::Hash->new(); + $clogp->load($clogpfn); + + $package = getfield $clogp, 'Source'; + my $cversion = getfield $clogp, 'Version'; + my $tag = debiantag($cversion); + runcmd @git, qw(check-ref-format), $tag; + + my $dscfn = dscfn($cversion); + + return ($clogp, $cversion, $tag, $dscfn); +} + +sub push_parse_dsc ($$$) { + my ($dscfn,$dscfnwhat, $cversion) = @_; + $dsc = parsecontrol($dscfn,$dscfnwhat); + my $dversion = getfield $dsc, 'Version'; + my $dscpackage = getfield $dsc, 'Source'; + ($dscpackage eq $package && $dversion eq $cversion) or + fail "$dsc is for $dscpackage $dversion". + " but debian/changelog is for $package $cversion"; +} + +sub push_mktag ($$$$$$$$) { + my ($head,$clogp,$tag, + $dsc,$dscfn, + $changesfile,$changesfilewhat, + $tfn) = @_; + + $dsc->{$ourdscfield[0]} = $head; + $dsc->save("$dscfn.tmp") or die $!; + + my $changes = parsecontrol($changesfile,$changesfilewhat); + 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 $cversion = getfield $clogp, 'Version'; + + # We make the git tag by hand because (a) that makes it easier + # to control the "tagger" (b) we can do remote signing + my $authline = clogp_authline $clogp; + open TO, '>', $tfn->('.tmp') or die $!; + print TO <('.tmp'); + if ($sign) { + if (!defined $keyid) { + $keyid = access_cfg('keyid','RETURN-UNDEF'); + } + unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!; + my @sign_cmd = (@gpg, qw(--detach-sign --armor)); + push @sign_cmd, qw(-u),$keyid if defined $keyid; + push @sign_cmd, $tfn->('.tmp'); + runcmd_ordryrun @sign_cmd; + if (!$dryrun) { + $tagobjfn = $tfn->('.signed.tmp'); + runcmd shell_cmd "exec >$tagobjfn", qw(cat --), + $tfn->('.tmp'), $tfn->('.tmp.asc'); + } + } + + return ($tagobjfn); +} + +sub sign_changes ($) { + my ($changesfile) = @_; + if ($sign) { + my @debsign_cmd = @debsign; + push @debsign_cmd, "-k$keyid" if defined $keyid; + push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg'; + push @debsign_cmd, $changesfile; + runcmd_ordryrun @debsign_cmd; + } +} + +sub dopush () { + printdebug "actually entering push\n"; + prep_ud(); + + my $clogpfn = ".git/dgit/changelog.822.tmp"; + runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog); + + responder_send_file('parsed-changelog', $clogpfn); + + my ($clogp, $cversion, $tag, $dscfn) = + push_parse_changelog("$clogpfn"); + + stat "../$dscfn" or + fail "looked for .dsc $dscfn, but $!;". + " maybe you forgot to build"; + + responder_send_file('dsc', "../$dscfn"); + + push_parse_dsc("../$dscfn", $dscfn, $cversion); + + my $format = getfield $dsc, 'Format'; + printdebug "format $format\n"; + if (madformat($format)) { + commit_quilty_patch(); + } + check_not_dirty(); + chdir $ud or die $!; + progress "checking that $dscfn corresponds to HEAD"; + runcmd qw(dpkg-source -x --), "../../../../$dscfn"; + my ($tree,$dir) = mktree_in_ud_from_only_subdir(); + chdir '../../../..' or die $!; + my @diffcmd = (@git, qw(diff --exit-code), $tree); + printcmd \*DEBUG,$debugprefix."+",@diffcmd; + $!=0; $?=0; + if (system @diffcmd) { + if ($! && $?==256) { + fail "$dscfn specifies a different tree to your HEAD commit;". + " perhaps you forgot to build"; + } else { + failedcmd @diffcmd; + } + } +#fetch from alioth +#do fast forward check and maybe fake merge +# if (!is_fast_fwd(mainbranch +# runcmd @git, qw(fetch -p ), "$alioth_git/$package.git", +# map { lref($_).":".rref($_) } +# (uploadbranch()); + my $head = rev_parse('HEAD'); + if (!$changesfile) { + my $multi = "../${package}_".(stripepoch $cversion)."_multi.changes"; + if (stat "$multi") { + $changesfile = $multi; + } else { + $!==&ENOENT or die "$multi: $!"; + my $pat = "${package}_".(stripepoch $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; + } + } + + responder_send_file('changes',$changesfile); + + my $tfn = sub { ".git/dgit/tag$_[0]"; }; + my ($tagobjfn) = + $we_are_responder + ? responder_receive_files('signed-tag', $tfn->('.signed.tmp')) + : push_mktag($head,$clogp,$tag, + $dsc,"../$dscfn", + $changesfile,$changesfile, + $tfn); + + my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn; + runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash; + runcmd_ordryrun @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash; + runcmd_ordryrun @git, qw(tag -v --), $tag; + + if (!check_for_git()) { + create_remote_git_repo(); + } + runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref(); + runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD'; + + if (!$we_are_responder) { + if (!$dryrun) { + rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; + } else { + progress "[new .dsc left in $dscfn.tmp]"; + } + } + + if ($we_are_responder) { + my $dryrunsuffix = $dryrun ? ".tmp" : ""; + responder_receive_files('signed-dsc-changes', + "../$dscfn$dryrunsuffix", + "$changesfile$dryrunsuffix"); + } else { + sign_changes $changesfile; + } + + runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag"; + my $host = access_cfg('upload-host','RETURN-UNDEF'); + my @hostarg = defined($host) ? ($host,) : (); + runcmd_ordryrun @dput, @hostarg, $changesfile; + printdone "pushed and uploaded $cversion"; + + responder_send_command("complete"); +} + +sub cmd_clone { + parseopts(); + my $dstdir; + badusage "-p is not allowed with clone; specify as argument instead" + if defined $package; + if (@ARGV==1) { + ($package) = @ARGV; + } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) { + ($package,$isuite) = @ARGV; + } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) { + ($package,$dstdir) = @ARGV; + } elsif (@ARGV==3) { + ($package,$isuite,$dstdir) = @ARGV; + } else { + badusage "incorrect arguments to dgit clone"; + } + $dstdir ||= "$package"; + clone($dstdir); +} + +sub branchsuite () { + my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD); + if ($branch =~ m#$lbranch_re#o) { + return $1; + } else { + return undef; + } +} + +sub fetchpullargs () { + if (!defined $package) { + my $sourcep = parsecontrol('debian/control','debian/control'); + $package = getfield $sourcep, 'Source'; + } + if (@ARGV==0) { +# $isuite = branchsuite(); # this doesn't work because dak hates canons + if (!$isuite) { + my $clogp = parsechangelog(); + $isuite = getfield $clogp, 'Distribution'; + } + canonicalise_suite(); + progress "fetching from suite $csuite"; + } elsif (@ARGV==1) { + ($isuite) = @ARGV; + canonicalise_suite(); } else { - print "last upload to archive has NO git hash\n"; + badusage "incorrect arguments to dgit fetch or dgit pull"; + } +} + +sub cmd_fetch { + parseopts(); + fetchpullargs(); + fetch(); +} + +sub cmd_pull { + parseopts(); + fetchpullargs(); + pull(); +} + +sub cmd_push { + parseopts(); + badusage "-p is not allowed with dgit push" if defined $package; + check_not_dirty(); + my $clogp = parsechangelog(); + $package = getfield $clogp, 'Source'; + my $specsuite; + if (@ARGV==0) { + } elsif (@ARGV==1) { + ($specsuite) = (@ARGV); + } else { + badusage "incorrect arguments to dgit push"; + } + $isuite = getfield $clogp, 'Distribution'; + if ($new_package) { + local ($package) = $existing_package; # this is a hack + canonicalise_suite(); + } + if (defined $specsuite && $specsuite ne $isuite) { + canonicalise_suite(); + $csuite eq $specsuite or + fail "dgit push: changelog specifies $isuite ($csuite)". + " but command line specifies $specsuite"; } - my $dstdir = "$package"; if (check_for_git()) { - print "cloning existing git history\n"; - runcmd qw(git clone --origin),$remotename, qw(-b), $suite, '--', - $alioth_git, $dstdir; - chdir "$dstdir" or die "$dstdir $!"; - fetch_from_archive(); - runcmd qw(git reset --hard), $lastupl_ref; + git_fetch_us(); + } + if (fetch_from_archive()) { + is_fast_fwd(lrref(), 'HEAD') or + fail "dgit push: HEAD is not a descendant". + " of the archive's version.\n". + "$us: To overwrite it, use git-merge -s ours ".lrref()."."; } else { - die "missing git history even though dsc has hash" if defined $dsc_hash; - print "starting new git history\n"; - mkdir $dstdir or die "$dstdir $!"; - chdir "$dstdir" or die "$dstdir $!"; - runcmd qw(git init -q); - open H, "> .git/HEAD" or die $!; - print H "ref: refs/heads/$suite\n" or die $!; - close H or die $!; - runcmd qw(git remote add), $remotename, $alioth_git; - runcmd "git config branch.$suite.remote $remotename"; - runcmd "git config branch.$suite.merge refs/heads/$suite"; - my $newhash = generate_commit_from_dsc(); - runcmd qw(git reset --hard), $newhash; - } - print "ready for work in $dstdir\n"; + $new_package or + fail "package appears to be new in this suite;". + " if this is intentional, use --new"; + } + dopush(); } -sub fetch () { - +#---------- remote commands' implementation ---------- + +sub cmd_remote_push_responder { + my ($nrargs) = shift @ARGV; + my (@rargs) = @ARGV[0..$nrargs-1]; + @ARGV = @ARGV[$nrargs..$#ARGV]; + die unless @rargs; + my ($dir) = @rargs; + chdir $dir or die "$dir: $!"; + $we_are_responder = 1; + $debugprefix = ' '; + $|=1; + responder_send_command("dgit-remote-push-ready"); + &cmd_push; +} + +our $i_tmp; + +sub i_cleanup { + local ($@); + return unless defined $i_tmp; + chdir "/" or die $!; + eval { rmtree $i_tmp; }; +} + +sub i_method { + my ($base,$selector,@args) = @_; + $selector =~ s/\-/_/g; + { no strict qw(refs); &{"${base}_${selector}"}(@args); } +} + +sub cmd_rpush { + my $host = nextarg; + my $dir; + if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) { + $host = $1; + $dir = $'; #'; + } else { + $dir = nextarg; + } + $dir =~ s{^-}{./-}; + my @rargs = ($dir); + my @rdgit; + push @rdgit, @dgit; + push @rdgit, @ropts; + push @rdgit, qw(remote-push-responder), (scalar @rargs), @rargs; + push @rdgit, @ARGV; + my @cmd = (@ssh, $host, shellquote @rdgit); + printcmd \*DEBUG,$debugprefix."+",@cmd; + eval { + $i_tmp = tempdir(); + my $pid = open2(\*RO, \*RI, @cmd); + chdir $i_tmp or die "$i_tmp $!"; + initiator_expect { m/^dgit-remote-push-ready/ }; + for (;;) { + my ($icmd,$iargs) = initiator_expect { + m/^(\S+)(?: (.*))?$/; + ($1,$2); + }; + i_method "i_resp", $icmd, $iargs; + } + }; + i_cleanup(); + die $@; +} + +sub i_resp_progress ($) { + my ($rhs) = @_; + my $msg = protocol_read_bytes \*RO, $rhs; + progress $msg; +} + +sub i_resp_complete { + i_cleanup(); + exit 0; +} + +sub i_resp_file ($) { + my ($keyword) = @_; + my $localname = i_method "i_localname", $keyword; + my $localpath = "$i_tmp/$localname"; + stat $localpath and badproto \*RO, "file $keyword ($localpath) twice"; + protocol_receive_file \*RO, $localpath; +} + +our %i_param; + +sub i_param ($) { + $_[0] =~ m/^(\S+) (.*)$/; + $i_param{$1} = $2; +} + +our %i_wanted; + +sub i_resp_want ($) { + my ($keyword) = @_; + die "$keyword ?" if $i_wanted{$keyword}++; + my @localpaths = i_method "i_want", $keyword; + printdebug "]] $keyword @localpaths\n"; + foreach my $localpath (@localpaths) { + protocol_send_file \*RI, $localpath; + } + print RI "end-files\n" or die $!; +} + +our ($i_clogp, $i_version, $i_tag, $i_dscfn); + +sub i_localname_parsed_changelog { return "remote-changelog.822"; } +sub i_localname_changes { return "remote.changes"; } +sub i_localname_dsc { + ($i_clogp, $i_version, $i_tag, $i_dscfn) = + push_parse_changelog 'remote-changelog.822'; + die if $i_dscfn =~ m#/|^\W#; + return $i_dscfn; +} + +sub i_want_signed_tag { + defined $i_param{'head'} && defined $i_dscfn + or badproto \*RO, "sequencing error"; + my $head = $i_param{'head'}; + die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../; + + push_parse_dsc $i_dscfn, 'remote dsc', + + push_mktag $head, $i_clogp, $i_tag, + $dsc, $i_dscfn, + 'remote.changes', 'remote changes', + 'tag.tag'; + + return 'tag.tag'; +} + +sub i_want_signed_dsc_changes { + rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!"; + sign_changes 'remote.changes'; + return ($i_dscfn, 'remote.changes'); +} + +#---------- building etc. ---------- + +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 $clogp = parsechangelog(); + my $version = getfield $clogp, 'Version'; + my $author = getfield $clogp, 'Maintainer'; + my $headref = rev_parse('HEAD'); + my $time = time; + my $ncommits = 3; + my $patchname = "auto-$version-$headref-$time"; + my $msg = cmdoutput @git, qw(log), "-n$ncommits"; + mkpath '.git/dgit'; + my $descfn = ".git/dgit/quilt-description.tmp"; + open O, '>', $descfn or die "$descfn: $!"; + $msg =~ s/\n/\n /g; + $msg =~ s/^\s+$/ ./mg; + print O <{Version}) + Last (up to) $ncommits git changes, FYI: + . + $msg +Author: $author + +--- + +END + close O or die $!; + { + local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0; + local $ENV{'VISUAL'} = $ENV{'EDITOR'}; + local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn; + runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname; + } + + if (!open P, '>>', ".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 build_prep () { + badusage "-p is not allowed when building" if defined $package; + check_not_dirty(); + my $clogp = parsechangelog(); + $isuite = getfield $clogp, 'Distribution'; + $package = getfield $clogp, 'Source'; + $version = getfield $clogp, 'Version'; + build_maybe_quilt_fixup(); +} + +sub cmd_build { + badusage "dgit build implies --clean=dpkg-source" + if $cleanmode ne 'dpkg-source'; + build_prep(); + runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV; + printdone "build successful\n"; +} + +sub cmd_git_build { + badusage "dgit git-build implies --clean=dpkg-source" + if $cleanmode ne 'dpkg-source'; + build_prep(); + my @cmd = + (qw(git-buildpackage -us -uc --git-no-sign-tags), + "--git-builder=@dpkgbuildpackage"); + unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) { + canonicalise_suite(); + push @cmd, "--git-debian-branch=".lbranch(); + } + push @cmd, changesopts(); + runcmd_ordryrun @cmd, @ARGV; + printdone "build successful\n"; +} + +sub build_source { + build_prep(); + $sourcechanges = "${package}_".(stripepoch $version)."_source.changes"; + $dscfn = dscfn($version); + 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 $pat = "${package}_".(stripepoch $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}_".(stripepoch $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" if @ARGV; + my $clogp = parsechangelog(); + $version = getfield $clogp, 'Version'; + build_maybe_quilt_fixup(); +} + +#---------- argument parsing and main program ---------- + +sub cmd_version { + print "dgit version $our_version\n" or die $!; + exit 0; +} + +sub parseopts () { + my $om; + + if (defined $ENV{'DGIT_SSH'}) { + @ssh = string_to_ssh $ENV{'DGIT_SSH'}; + } elsif (defined $ENV{'GIT_SSH'}) { + @ssh = ($ENV{'GIT_SSH'}); + } + + while (@ARGV) { + last unless $ARGV[0] =~ m/^-/; + $_ = shift @ARGV; + last if m/^--?$/; + if (m/^--/) { + if (m/^--dry-run$/) { + push @ropts, $_; + $dryrun=1; + } elsif (m/^--no-sign$/) { + push @ropts, $_; + $sign=0; + } elsif (m/^--help$/) { + cmd_help(); + } elsif (m/^--version$/) { + cmd_version(); + } elsif (m/^--new$/) { + push @ropts, $_; + $new_package=1; + } elsif (m/^--(\w+)=(.*)/s && + ($om = $opts_opt_map{$1}) && + length $om->[0]) { + push @ropts, $_; + $om->[0] = $2; + } elsif (m/^--(\w+):(.*)/s && + !$opts_opt_cmdonly{$1} && + ($om = $opts_opt_map{$1})) { + push @ropts, $_; + push @$om, $2; + } elsif (m/^--existing-package=(.*)/s) { + push @ropts, $_; + $existing_package = $1; + } elsif (m/^--distro=(.*)/s) { + push @ropts, $_; + $idistro = $1; + } elsif (m/^--clean=(dpkg-source|git|none)$/s) { + push @ropts, $_; + $cleanmode = $1; + } elsif (m/^--clean=(.*)$/s) { + badusage "unknown cleaning mode \`$1'"; + } elsif (m/^--ignore-dirty$/s) { + push @ropts, $_; + $ignoredirty = 1; + } elsif (m/^--no-quilt-fixup$/s) { + push @ropts, $_; + $noquilt = 1; + } else { + badusage "unknown long option \`$_'"; + } + } else { + while (m/^-./s) { + if (s/^-n/-/) { + push @ropts, $_; + $dryrun=1; + } elsif (s/^-h/-/) { + cmd_help(); + } elsif (s/^-D/-/) { + push @ropts, $&; + open DEBUG, ">&STDERR" or die $!; + $debug++; + } elsif (s/^-N/-/) { + push @ropts, $&; + $new_package=1; + } elsif (m/^-[vm]/) { + push @ropts, $&; + push @changesopts, $_; + $_ = ''; + } elsif (s/^-c(.*=.*)//s) { + push @ropts, $&; + push @git, '-c', $1; + } elsif (s/^-d(.*)//s) { + push @ropts, $&; + $idistro = $1; + } elsif (s/^-C(.*)//s) { + push @ropts, $&; + $changesfile = $1; + } elsif (s/^-k(.*)//s) { + $keyid=$1; + } elsif (s/^-wn//s) { + push @ropts, $&; + $cleanmode = 'none'; + } elsif (s/^-wg//s) { + push @ropts, $&; + $cleanmode = 'git'; + } elsif (s/^-wd//s) { + push @ropts, $&; + $cleanmode = 'dpkg-source'; + } else { + badusage "unknown short option \`$_'"; + } + } + } + } +} + +if ($ENV{$fakeeditorenv}) { + quilt_fixup_editor(); +} + +delete $ENV{'DGET_UNPACK'}; + +parseopts(); +print STDERR "DRY RUN ONLY\n" if $dryrun; +if (!@ARGV) { + print STDERR $helpmsg or die $!; + exit 8; } - -#print Dumper(get_archive_dsc()); -clone(); +my $cmd = shift @ARGV; +$cmd =~ y/-/_/; +{ no strict qw(refs); &{"cmd_$cmd"}(); }