X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=c27e94f5c9158eff05b5a3c5515a13cfa1b77971;hp=82754b66995728a55b6f0c91c77153c938a6db17;hb=d3e8ca277d8cd89e9156c8587f93eec1804ff0de;hpb=2eaa8bbe4d7197de7c1820f1ce5f5bd35644a0b5 diff --git a/dgit b/dgit index 82754b66..c27e94f5 100755 --- a/dgit +++ b/dgit @@ -24,30 +24,71 @@ use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; use File::Path; +use Dpkg::Version; use POSIX; -open DEBUG, ">&STDERR" or die $!; - -our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; -our $suite = 'sid'; +our $isuite = 'unstable'; our $package; -our $aliothname = 'iwj@git.debian.org'; -our $aliothpath = '/git/dgit-test'; -our $alioth_git = "git+ssh://$aliothname/$aliothpath"; -our $alioth_sshtestbodge = [$aliothname,$aliothpath]; +our $sign = 1; +our $dryrun = 0; +our $changesfile; +our $new_package = 0; +our $existing_package = 'dpkg'; -our (@dget_opts) = qw(-u); -our (@git_tag_opts); +our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); -our $remotename = 'dgit'; -our $ourdscfield = 'Vcs-git-master'; +our (@git) = qw(git); +our (@dget) = qw(dget); +our (@dput) = qw(dput); +our (@debsign) = qw(debsign); +our (@sbuild) = qw(sbuild); +our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git); +our (@mergechanges) = qw(mergechanges -f); + + +our %opts_opt_map = ('dget' => \@dget, + 'dput' => \@dput, + 'debsign' => \@debsign, + 'sbuild' => \@sbuild, + 'dpkg-buildpackage' => \@dpkgbuildpackage, + 'mergechanges' => \@mergechanges); + +our $keyid; + +our $debug = 0; +open DEBUG, ">/dev/null" or die $!; -sub uploadbranch () { return "dgit/$suite"; } -sub lref ($) { return "refs/heads/$_[0]"; } -sub rref ($) { return "refs/remotes/$remotename/$_[0]"; } +our $remotename = 'dgit'; +our $ourdscfield = '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 rrref () { return "refs/$branchprefix/$csuite"; } sub debiantag ($) { return "debian/$_[0]"; } +sub dscfn ($) { return "${package}_${1}.dsc"; } + +our $us = 'dgit'; + +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(); +} + our $ua; sub url_get { @@ -55,82 +96,351 @@ sub url_get { $ua = LWP::UserAgent->new(); $ua->env_proxy; } - print DEBUG "fetching @_...\n"; + my $what = $_[$#_]; + print "downloading $what...\n"; my $r = $ua->get(@_) or die $!; - die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success; + $r->is_success or fail "failed to fetch $what: ".$r->status_line; return $r->decoded_content(); } our ($dscdata,$dscurl,$dsc); +sub printcmd { + my $fh = shift @_; + my $intro = shift @_; + print $fh $intro or die $!; + local $_; + foreach my $a (@_) { + $_ = $a; + if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) { + print $fh " '$_'" or die $!; + } else { + print $fh " $_" or die $!; + } + } + print $fh "\n" or die $!; +} + +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,"+",@_) if $debug>0; $!=0; $?=0; - die "@_ $! $?" if system @_; + failedcmd @_ if system @_; } -sub cmdoutput { +sub printdone { + if (!$dryrun) { + print "dgit ok: @_\n"; + } else { + print "would be ok: @_ (but dry run only)\n"; + } +} + +sub cmdoutput_errok { + die Dumper(\@_)." ?" if grep { !defined } @_; + printcmd(\*DEBUG,"|",@_) 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) { print DEBUG "=>!$?\n" if $debug>0; return undef; } chomp $d; + $d =~ m/^.*/; + print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #'; return $d; } +sub cmdoutput { + my $d = cmdoutput_errok @_; + defined $d or failedcmd @_; + return $d; +} + +sub dryrun_report { + printcmd(\*STDOUT,"#",@_); +} + +sub runcmd_ordryrun { + if (!$dryrun) { + runcmd @_; + } else { + dryrun_report @_; + } +} + +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 + +sub badusage { + print STDERR "$us: @_\n", $helpmsg or die $!; + exit 8; +} + +sub helponly () { + print $helpmsg or die $!; + exit 0; +} + +our %defcfg = ('dgit.default.distro' => '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-proto' => 'git+ssh://', + 'dgit-distro.debian.git-path' => '/git/dgit-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.mirror' => 'http://http.debian.net/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 = access_distro(); + my $value = cfg(map { ("dgit-distro.$distro.$_", + "dgit.default.$_") } @keys); + return $value; +} + +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 $c = Dpkg::Control::Hash->new({ 'name' => $desc, @opts }); + $c->parse($fh) or die "parsing of $desc failed"; +} + sub parsecontrol { - my $c = Dpkg::Control::Hash->new(); - $c->load(@_) or return undef; + my ($file, $desc) = @_; + my $fh = new IO::File '<', $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::File '-|', qw(dpkg-parsechangelog) or die $!; + my $p = new IO::Handle; + my @cmd = (qw(dpkg-parsechangelog)); + open $p, '-|', @cmd or die $!; $c->parse($p); - $?=0; $!=0; close $p or die "$! $?"; + $?=0; $!=0; close $p or failedcmd @cmd; return $c; } -sub get_archive_dsc () { - my $rmad = cmdoutput qw(rmadison -asource),"-s$suite",$package; - $rmad =~ m/^ \s*( [^ \t|]+ )\s* \| - \s*( [^ \t|]+ )\s* \| +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) = @_; + if (!length $rmad) { + return (); + } + $rmad =~ m{^ \s*( [^ \t|]+ )\s* \| \s*( [^ \t|]+ )\s* \| - \s*( [^ \t|]+ )\s* /x or die "$rmad $?"; + \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \| + \s*( [^ \t|]+ )\s* }x or die "$rmad $?"; $1 eq $package or die "$rmad $package ?"; my $vsn = $2; - $3 eq $suite or die "$rmad $suite ?"; - $4 eq 'source' or die "$rmad ?"; - # fixme it does not show us the component ? + 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); - $dscurl = "$mirror/pool/main/$prefix/$package/${package}_$vsn.dsc"; -#print DEBUG Dumper($pdodata, $&, $dscurl); + my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc"; + return ($vsn,$subpath,$newsuite); +} + +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[2]; +} + +sub canonicalise_suite () { + $csuite = archive_query('canonicalise_suite'); + if ($isuite ne $csuite) { + # madison canonicalises for us + print "canonical suite name for $isuite is $csuite\n"; + } +} + +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, $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'; + 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}; } 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; + 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').";". + " mkdir -p $package.git;". + " cd $package.git;". + " if ! test -d objects; then git init --bare; fi"); + } else { + badcfg "unknown git-create \`$how'"; + } } our ($dsc_hash,$upload_hash); @@ -155,260 +465,542 @@ sub mktree_in_ud_from_only_subdir () { 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 @git, qw(add -Af); + my $tree = cmdoutput @git, qw(write-tree); + $tree =~ m/^\w+$/ or die "$tree ?"; return ($tree,$dir); } +sub dsc_files () { + my $field = $dsc->{'Checksums-Sha256'} || $dsc->{Files}; + 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/, $field; +} + +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 generate_commit_from_dsc () { prep_ud(); 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$#; + foreach my $f (dsc_files()) { + die "$f ?" 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" + 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','changelog') or die; - my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date}; - my $author = $clogp->{Maintainer}; + my $clogp = parsecontrol('../changelog.tmp',"commit's changelog"); + 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 die $authline; + $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 "tree $tree\n" or die $!; - print C "parent $upload_hash\n" or die $! if defined $upload_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 $upload_hash) { - chdir "$ud/$dir" or die $!; - runcmd qw(git reset --hard), $upload_hash; + my $outputhash = make_commit qw(../commit.tmp); + 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 = 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) +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 - } else { - die "version in archive is same as version in git". - " to-be-uploaded (upload/) branch but archive". - " version hash no commit hash?!\n"; + $outputhash = $upload_hash; + } elsif ($outputhash ne $upload_hash) { + fail "version in archive ($cversion)". + " is same as version in git". + " to-be-uploaded (upload/) branch ($oversion)". + " but archive version hash no commit hash?!"; } - chdir '../../../..' or die $!; } + 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; } +sub ensure_we_have_orig () { + foreach my $f (dsc_files()) { + next unless is_orig_file($f); + if (stat "../$f") { + die "$f ?" unless -f _; + } 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 qw(sh -ec),'cd ..; exec "$@"','x', + @dget,'--',$origurl; + } +} + sub rev_parse ($) { - return cmdoutput qw(git rev-parse --), "$_[0]~0"; + return cmdoutput @git, qw(rev-parse), "$_[0]~0"; } sub is_fast_fwd ($$) { my ($ancestor,$child) = @_; - my $mb = cmdoutput qw(git merge-base), $dsc_hash, $upload_hash; + my $mb = cmdoutput @git, qw(merge-base), $ancestor, $child; return rev_parse($mb) eq rev_parse($ancestor); } +sub git_fetch_us () { + badusage "cannot dry run with fetch" if $dryrun; + runcmd @git, qw(fetch),access_giturl(),fetchspec(); +} + sub fetch_from_archive () { - # ensures that rref(uploadbranch()) is what is actually in the archive, + # ensures that lrref() is what is actually in the archive, # one way or another - my $upload_ref = rref(uploadbranch()); - $!=0; $upload_hash = `git show-ref --heads $upload_ref`; - die $! if $!; - die $? unless ($?==0 && chomp $upload_hash) - or ($?==128 && !length $upload_hash); + get_archive_dsc() or return 0; + $dsc_hash = $dsc->{$ourdscfield}; + if (defined $dsc_hash) { + $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'"; + $dsc_hash = $&; + print "last upload to archive specified git hash\n"; + } else { + print "last upload to archive has NO git hash\n"; + } + + my $lrref_fn = ".git/".lrref(); + if (open H, $lrref_fn) { + $upload_hash = ; + chomp $upload_hash; + die "$lrref_fn $upload_hash ?" unless $upload_hash =~ m/^\w+$/; + } elsif ($! == &ENOENT) { + $upload_hash = ''; + } else { + die "$lrref_fn $!"; + } + print DEBUG "previous reference hash $upload_hash\n"; my $hash; if (defined $dsc_hash) { - die "missing git history even though dsc has hash" - unless length $upload_hash; + 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(); } - if (length $upload_hash) { - die "not fast forward on last upload branch!". + print DEBUG "current hash $hash\n"; + if ($upload_hash) { + fail "not fast forward on last upload branch!". " (archive's version left in DGIT_ARCHIVE)" - unless is_fast_fwd($dsc_hash, $upload_hash); + unless is_fast_fwd($upload_hash, $hash); } if ($upload_hash ne $hash) { - cmdoutput qw(git update-ref -m), 'dgit fetch', $upload_ref, $hash; + my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash); + if (!$dryrun) { + cmdoutput @upd_cmd; + } else { + dryrun_report @upd_cmd; + } } + return 1; } -sub clone () { - get_archive_dsc(); - $dsc_hash = $dsc->{$ourdscfield}; - if (defined $dsc_hash) { - $dsc_hash =~ m/\w+/ or die "$dsc_hash $?"; - $dsc_hash = $&; - print "last upload to archive specified git hash\n"; - } else { - print "last upload to archive has NO git hash\n"; - } - my $dstdir = "$package"; +sub clone ($) { + my ($dstdir) = @_; + canonicalise_suite(); + badusage "dry run makes no sense with clone" if $dryrun; + mkdir $dstdir or die "$dstdir $!"; + chdir "$dstdir" or die "$dstdir $!"; + runcmd @git, qw(init -q); + runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec(); + open H, "> .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()) { - 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), rref(uploadbranch()); + print "fetching existing git history\n"; + git_fetch_us(); + runcmd @git, qw(fetch origin); } else { 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: ".lref(uploadbranch())."\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 ".lref(uploadbranch()); - my $newhash = generate_commit_from_dsc(); - runcmd qw(git reset --hard), $newhash; } - print "ready for work in $dstdir\n"; + 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()) { - runcmd qw(git fetch -p),$remotename, - '+refs/heads/*:refs/remotes/origin/*'; + git_fetch_us(); } - fetch_from_archive(); + fetch_from_archive() or no_such_package(); + printdone "fetched into ".lrref(); } sub pull () { fetch(); - runcmd qw(git merge -m),"Merge from $suite [dgit]",lref(uploadbranch()); + runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]", + lrref(); + printdone "fetched to ".lrref()." and merged into HEAD"; +} + +sub check_not_dirty () { + runcmd @git, qw(diff --quiet HEAD); +} + +sub commit_quilty_patch ($) { + my ($vsn) = @_; + my $output = cmdoutput @git, qw(status --porcelain); + my %fixups = map {$_=>1} + (".pc/debian-changes-$vsn/","debian/patches/debian-changes-$vsn"); + my @files; + foreach my $l (split /\n/, $output) { + next unless $l =~ s/^\?\? //; + next unless $fixups{$l}; + push @files, $l; + } + 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; + } } sub dopush () { - runcmd qw(git diff --quiet HEAD); + print DEBUG "actually entering push\n"; my $clogp = parsechangelog(); - $package = $clogp->{Source}; - my $dscfn = "${package}_$clogp->{Version}.dsc"; - stat $dscfn or die "$dscfn $!"; - $dsc = parsecontrol("../$dscfn"); + $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"); + 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(); chdir $ud or die $!; print "checking that $dscfn corresponds to HEAD\n"; runcmd qw(dpkg-source -x --), "../../../../$dscfn"; - my $tree = mktree_in_ud_from_only_subdir(); + my ($tree,$dir) = mktree_in_ud_from_only_subdir(); chdir '../../../..' or die $!; - runcmd qw(git diff --exit-code), $tree; + printcmd \*DEBUG,"+",@_; + my @diffcmd = (@git, qw(diff --exit-code), $tree); + $!=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 qw(git fetch -p ), $alioth_git, +# runcmd @git, qw(fetch -p ), "$alioth_git/$package.git", # map { lref($_).":".rref($_) } # (uploadbranch()); $dsc->{$ourdscfield} = rev_parse('HEAD'); $dsc->save("../$dscfn.tmp") or die $!; - rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; - if ($sign) { - runcmd qw(git tag -s),@git_tag_opts,qw(-m), - "Release $dsc->{Version} for $suite [dgit]"; - unlink "../$dscfn.asc" or $!==&ENOENT or die "$dscfn.asc $!"; - runcmd qw(gpg --clearsign),@gpg_opts,"../$dscfn"; - rename "../$dscfn.asc","../$dscfn" or die "$dscfn $!"; + if (!$changesfile) { + 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 ..); perhaps you need to use dgit -C" + unless @cs==1; + ($changesfile) = @cs; + } + } + my $tag = debiantag($dversion); + if (!check_for_git()) { + create_remote_git_repo(); } - if (!$nopush) { - runcmd qw(git push),$remotename,"HEAD:".lref(uploadbranch()); - runcmd qw(dput),"../$dscfn"; + 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 $dversion for $csuite [dgit]"); + push @tag_cmd, qw(-u),$keyid if defined $keyid; + push @tag_cmd, $tag; + runcmd_ordryrun @tag_cmd; + my @debsign_cmd = @debsign; + push @debsign_cmd, "-k$keyid" if defined $keyid; + push @debsign_cmd, $changesfile; + runcmd_ordryrun @debsign_cmd; + } + 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 $dversion"; } 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) { - ($package,$suite) = @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 { - die; + badusage "incorrect arguments to dgit clone"; } - clone(); + $dstdir ||= "$package"; + clone($dstdir); } sub branchsuite () { - $branch = `git-symbolic-ref HEAD`; - if ($branch =~ m#^refs/heads/dgit/([^/.]+)$#) { + my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD); + if ($branch =~ m#$lbranch_re#o) { return $1; } else { return undef; } } -sub cmd_fetch { - my $clogp = parsechangelog(); - $package = $clogp->{Source}; +sub fetchpullargs () { + if (!defined $package) { + my $sourcep = parsecontrol('debian/control','debian/control'); + $package = getfield $sourcep, 'Source'; + } if (@ARGV==0) { - $suite = branchsuite(); - $suite ||= $clogp->{Distribution}; - print "fetching from suite $suite\n"; +# $isuite = branchsuite(); # this doesn't work because dak hates canons + if (!$isuite) { + my $clogp = parsechangelog(); + $isuite = getfield $clogp, 'Distribution'; + } + canonicalise_suite(); + print "fetching from suite $csuite\n"; } elsif (@ARGV==1) { - ($suite) = @ARGV; + ($isuite) = @ARGV; + canonicalise_suite(); } else { - die; + 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; + runcmd @git, qw(diff --quiet HEAD); my $clogp = parsechangelog(); - $package = $clogp->{Source}; + $package = getfield $clogp, 'Source'; if (@ARGV==0) { - $suite = $clogp->{Distribution}; + $isuite = getfield $clogp, 'Distribution'; + if ($new_package) { + local ($package) = $existing_package; # this is a hack + canonicalise_suite(); + } } else { - die; + badusage "incorrect arguments to dgit push"; + } + 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"; } dopush(); } +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 = getfield $clogp, 'Distribution'; + $package = getfield $clogp, 'Source'; + my @cmd = + (qw(git-buildpackage -us -uc --git-no-sign-tags), + "--git-builder=@dpkgbuildpackage"); + unless (grep { m/^--git-debian-branch/ } @ARGV) { + canonicalise_suite(); + push @cmd, "--git-debian-branch=".lbranch(); + } + runcmd_ordryrun @cmd, @ARGV; + print "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 $version = getfield $clogp, 'Version'; + runcmd (@dpkgbuildpackage, qw(-us -uc -S)); + chdir ".." or die $!; + my $sourcechanges = "${package}_${version}_source.changes"; + my $dscfn = dscfn($version); + stat "../$dscfn" or fail "$dscfn (in parent directory): $!"; + stat "../$sourcechanges" or fail "$sourcechanges (in parent directory): $!"; + my $pat = "${package}_${version}_*.changes"; + foreach my $cf (glob $pat) { + next if $cf eq $sourcechanges; + unlink $cf or fail "remove $cf: $!"; + } + runcmd @sbuild, @ARGV, $sourcechanges; + runcmd @mergechanges, glob $pat; + my $multichanges = "${package}_${version}_multi.changes"; + stat $multichanges or fail "$multichanges: $!"; + print "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((getfield $clogp, 'Version')); +} + sub parseopts () { - die if @ARGV && $ARGV[0] =~ m/^\-/; + my $om; + while (@ARGV) { + last unless $ARGV[0] =~ m/^-/; + $_ = shift @ARGV; + last if m/^--?$/; + if (m/^--/) { + if (m/^--dry-run$/) { + $dryrun=1; + } elsif (m/^--no-sign$/) { + $sign=0; + } elsif (m/^--help$/) { + helponly(); + } elsif (m/^--new$/) { + $new_package=1; + } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) { + $om->[0] = $2; + } elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) { + push @$om, $2; + } elsif (m/^--existing-package=(.*)/s) { + $existing_package = $1; + } else { + badusage "unknown long option \`$_'"; + } + } else { + while (m/^-./s) { + if (s/^-n/-/) { + $dryrun=1; + } elsif (s/^-h/-/) { + helponly(); + } elsif (s/^-D/-/) { + open DEBUG, ">&STDERR" or die $!; + $debug++; + } elsif (s/^-N/-/) { + $new_package=1; + } elsif (s/^-c(.*=.*)//s) { + push @git, '-c', $1; + } elsif (s/^-C(.*)//s) { + $changesfile = $1; + } elsif (s/^-k(.*)//s) { + $keyid=$1; + } else { + badusage "unknown short option \`$_'"; + } + } + } + } } parseopts(); -die unless @ARGV; +print STDERR "DRY RUN ONLY\n" if $dryrun; +if (!@ARGV) { + print STDERR $helpmsg or die $!; + exit 8; +} my $cmd = shift @ARGV; -parseopts(); - +$cmd =~ y/-/_/; { no strict qw(refs); &{"cmd_$cmd"}(); }