X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=e95f30c885ede0854217a5ab9157d63cbfa24e7e;hp=60138fea122567892caad6d4b352727d37fda25d;hb=08a4cefb989b93dec53d5357e3b40d04340884cc;hpb=e6663e4fe6ca8c1a6b155e692d3a7b8b264b95c1 diff --git a/dgit b/dgit index 60138fea..e95f30c8 100755 --- a/dgit +++ b/dgit @@ -24,15 +24,17 @@ use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; use File::Path; +use Dpkg::Version; use POSIX; -our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/'; -our $suite = 'sid'; +our $isuite = 'unstable'; our $package; our $sign = 1; our $dryrun = 0; our $changesfile; +our $new_package = 0; +our $existing_package = 'dpkg'; our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -40,27 +42,50 @@ our (@git) = qw(git); our (@dget) = qw(dget); our (@dput) = qw(dput); our (@debsign) = qw(debsign); -our $keyid; +our (@sbuild) = qw(sbuild); +our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git); +our (@mergechanges) = qw(mergechanges -f); -open DEBUG, ">/dev/null" or die $!; our %opts_opt_map = ('dget' => \@dget, 'dput' => \@dput, - 'debsign' => \@debsign); + 'debsign' => \@debsign, + 'sbuild' => \@sbuild, + 'dpkg-buildpackage' => \@dpkgbuildpackage; + 'mergechanges' => \@mergechanges); + +our $keyid; + +our $debug = 0; +open DEBUG, ">/dev/null" or die $!; our $remotename = 'dgit'; -our $ourdscfield = 'Vcs-Git-Master'; +our $ourdscfield = 'Vcs-Dgit-Master'; our $branchprefix = 'dgit'; +our $csuite; -sub lbranch () { return "$branchprefix/$suite"; } +sub lbranch () { return "$branchprefix/$csuite"; } my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$'; sub lref () { return "refs/heads/".lbranch(); } -sub lrref () { return "refs/remotes/$remotename/$suite"; } -sub rrref () { return "refs/$branchprefix/$suite"; } +sub lrref () { return "refs/remotes/$remotename/$csuite"; } +sub rrref () { return "refs/$branchprefix/$csuite"; } sub debiantag ($) { return "debian/$_[0]"; } +sub dscfn () { return "${package}_${cversion}.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 $suite\n"; + exit 4; +} + sub fetchspec () { - local $suite = '*'; + local $csuite = '*'; return "+".rrref().":".lrref(); } @@ -71,9 +96,10 @@ sub url_get { $ua = LWP::UserAgent->new(); $ua->env_proxy; } - print "downloading @_...\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(); } @@ -95,28 +121,51 @@ sub printcmd { 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,"+",@_); + printcmd(\*DEBUG,"+",@_) if $debug>0; $!=0; $?=0; - die "@_ $! $?" if system @_; + failedcmd @_ if system @_; +} + +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,"|",@_); + printcmd(\*DEBUG,"|",@_) if $debug>0; open P, "-|", @_ or die $!; my $d; $!=0; $?=0; { local $/ = undef; $d =

; } - die if P->error; - close P or return undef; + 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 die "@_ $? $!"; + defined $d or failedcmd @_; return $d; } @@ -132,122 +181,251 @@ sub runcmd_ordryrun { } } +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' => 'git.debian.org', + '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.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 (@_) { - my $v = cmdoutput_errok(qw(git config --), $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) { - chomp $v; return $v; } elsif ($?!=256) { - die "$c $?"; + failedcmd @cmd; } my $dv = $defcfg{$c}; return $dv if defined $dv; } - return undef; + badcfg "need value for one of: @_"; +} + +sub access_distro () { + return cfg("dgit-suite.$isuite.distro", + "dgit.default.distro"); } -sub access_cfg ($) { - my ($key) = @_; - my $distro = cfg("dgit-suite.$suite.distro", - "dgit.default.distro"); - my $value = cfg("dgit-distro.$distro.$key", - "dgit.default.$key"); +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 () { - my $user = access_cfg('git-user'); - my $host = access_cfg('git-host'); - return defined($user) && length($user) ? "$user\@$host" : $host; + return access_someuserhost('git'); } -sub access_giturl ($) { - my $url = access_cfg('git-url'); +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"; + 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::Handle; - open $p, '-|', qw(dpkg-parsechangelog) or die $!; + 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; } -our $rmad; +our %rmad; -sub askmadison () { - $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite",$package; - $rmad =~ m/^ \s*( [^ \t|]+ )\s* \| - \s*( [^ \t|]+ )\s* \| +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; - if ($suite ne $3) { - # madison canonicalises for us - print "canonical suite name for $suite is $3\n"; - $suite = $3; + my $newsuite = $3; + my $component; + if (defined $4) { + $component = $4; + } else { + $component = access_cfg('archive-query-default-component'); } - $4 eq 'source' or die "$rmad ?"; - return $vsn; + $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); +} + +sub canonicalise_suite_madison ($$) { + my @r = archive_query_madison($_[0],$_[1]); + @r or fail + "unable to canonicalise suite using package $package". + " which does not appear to exist in suite $suite;". + " --existing-package may help"; + return $r[2]; } sub canonicalise_suite () { - askmadison(); + $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 = askmadison(); - # fixme madison does not show us the component - my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1); - $dscurl = "$mirror/pool/main/$prefix/$package/${package}_$vsn.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); - $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 $format_ok{$fmt}; + 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 $how = access_cfg('git-check'); if ($how eq 'ssh-cmd') { - my $r= cmdoutput + 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"); - print DEBUG ">$r<\n"; - die "$r $! $?" unless $r =~ m/^[01]$/; + my $r= cmdoutput @cmd; + failedcmd @cmd unless $r =~ m/^[01]$/; return $r+0; } else { - die "unknown git-check $how ?"; + badcfg "unknown git-check \`$how'"; } } @@ -261,7 +439,7 @@ sub create_remote_git_repo () { " cd $package.git;". " if ! test -d objects; then git init --bare; fi"); } else { - die "unknown git-create $how ?"; + badcfg "unknown git-create \`$how'"; } } @@ -289,15 +467,18 @@ sub mktree_in_ud_from_only_subdir () { symlink '../../../../objects','.git/objects' or die $!; runcmd @git, qw(add -Af); my $tree = cmdoutput @git, qw(write-tree); - chomp $tree; $tree =~ m/^\w+$/ or die "$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 die "$_ ?"; + m/^\w+ \d+ (\S+)$/ or + fail "could not parse .dsc Files/Checksums line \`$_'"; $1; - } grep m/\S/, split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files}); + } grep m/\S/, split /\n/, $field; } sub is_orig_file ($) { @@ -305,12 +486,17 @@ sub is_orig_file ($) { 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 my $f (dsc_files()) { - die if $f =~ m#/|^\.|\.dsc$|\.tmp$#; + die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#; push @files, $f; link "../../../$f", $f or $!==&ENOENT @@ -324,55 +510,68 @@ sub generate_commit_from_dsc () { } my ($tree,$dir) = mktree_in_ud_from_only_subdir(); runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp'; - my $clogp = parsecontrol('../changelog.tmp','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 $upload_hash; print C <{Changes} +$chhanges -# imported by dgit from the archive +# imported from the archive END close C or die $!; - my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp); - print "synthesised git commit from .dsc $clogp->{Version}\n"; - chdir '../../../..' or die $!; - cmdoutput @git, qw(update-ref -m),"dgit synthesise $clogp->{Version}", - 'DGIT_ARCHIVE', $commithash; - cmdoutput @git, qw(log -n2), $commithash; - # ... gives git a chance to complain if our commit is malformed - my $outputhash = $commithash; + my $outputhash = make_commit qw(../commit.tmp); + my $cversion = getfield $clogp, 'Version'; + print "synthesised git commit from .dsc $cversion\n"; if ($upload_hash) { - chdir "$ud/$dir" or die $!; 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; } @@ -401,50 +600,55 @@ sub rev_parse ($) { sub is_fast_fwd ($$) { my ($ancestor,$child) = @_; - my $mb = cmdoutput @git, qw(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 () { - die "cannot dry run with fetch" if $dryrun; - runcmd @git, qw(fetch),$remotename,fetchspec(); + badusage "cannot dry run with fetch" if $dryrun; + runcmd @git, qw(fetch),access_giturl(),fetchspec(); } sub fetch_from_archive () { # ensures that lrref() is what is actually in the archive, # one way or another - get_archive_dsc(); + get_archive_dsc() or return 0; $dsc_hash = $dsc->{$ourdscfield}; if (defined $dsc_hash) { - $dsc_hash =~ m/\w+/ or die "$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"; } - $!=0; $upload_hash = - cmdoutput_errok @git, qw(show-ref --heads), lrref(); - if ($?==0) { - die unless chomp $upload_hash; - } elsif ($?==256) { + 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 $?; + 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" + fail "missing git history even though dsc has hash -" + " could not find commit $dsc_hash" + " (should be in ".access_giturl()."#".rref().")"; unless $upload_hash; $hash = $dsc_hash; ensure_we_have_orig(); } else { $hash = generate_commit_from_dsc(); } + print DEBUG "current hash $hash\n"; if ($upload_hash) { - die "not fast forward on last upload branch!". + 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) { my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash); @@ -454,11 +658,13 @@ sub fetch_from_archive () { dryrun_report @upd_cmd; } } + return 1; } sub clone ($) { my ($dstdir) = @_; - die "dry run makes no sense with clone" if $dryrun; + 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); @@ -466,7 +672,7 @@ sub clone ($) { 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($package); + runcmd @git, qw(remote add), 'origin', access_giturl(); if (check_for_git()) { print "fetching existing git history\n"; git_fetch_us(); @@ -474,39 +680,89 @@ sub clone ($) { } else { print "starting new git history\n"; } - fetch_from_archive(); + fetch_from_archive() or no_such_package; runcmd @git, qw(reset --hard), lrref(); - print "ready for work in $dstdir\n"; + printdone "ready for work in $dstdir"; } sub fetch () { if (check_for_git()) { git_fetch_us(); } - fetch_from_archive(); + fetch_from_archive() or no_such_package(); + printdone "fetched into ".lrref(); } sub pull () { fetch(); - runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]", + 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); +} + +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 @git, qw(diff --quiet HEAD); + print DEBUG "actually entering push\n"; my $clogp = parsechangelog(); - die if defined $package; - $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(); + 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) + 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,$dir) = mktree_in_ud_from_only_subdir(); chdir '../../../..' or die $!; - runcmd @git, qw(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 @@ -515,25 +771,27 @@ sub dopush () { # (uploadbranch()); $dsc->{$ourdscfield} = rev_parse('HEAD'); $dsc->save("../$dscfn.tmp") or die $!; - if (!$dryrun) { - rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; - } else { - print "[new .dsc left in $dscfn.tmp]\n"; - } if (!$changesfile) { - my $pat = "../${package}_$clogp->{Version}_*.changes"; - my @cs = glob $pat; - die "$pat ?" unless @cs==1; + my $pat = "${package}_c$version_*.changes"; + my @cs = glob "../$pat"; + fail "failed to find unique changes file". + " (looked for $pat in ..); perhaps you need to use dgit -C" + unless @cs==1; ($changesfile) = @cs; } - my $tag = debiantag($dsc->{Version}); + my $tag = debiantag($dversion); if (!check_for_git()) { create_remote_git_repo(); } - runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".rrref(); + runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref(); + if (!$dryrun) { + rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; + } else { + print "[new .dsc left in $dscfn.tmp]\n"; + } if ($sign) { my @tag_cmd = (@git, qw(tag -s -m), - "Release $dsc->{Version} for $suite [dgit]"); + "Release $dversion for $csuite [dgit]"); push @tag_cmd, qw(-u),$keyid if defined $keyid; push @tag_cmd, $tag; runcmd_ordryrun @tag_cmd; @@ -542,23 +800,28 @@ sub dopush () { push @debsign_cmd, $changesfile; runcmd_ordryrun @debsign_cmd; } - runcmd_ordryrun @git, qw(push),$remotename,"refs/tags/$tag"; - runcmd_ordryrun @dput, $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 $dversion"; } sub cmd_clone { + parseopts(); my $dstdir; - die if defined $package; + 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,$suite) = @ARGV; + ($package,$isuite) = @ARGV; } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) { ($package,$dstdir) = @ARGV; } elsif (@ARGV==3) { - ($package,$suite,$dstdir) = @ARGV; + ($package,$isuite,$dstdir) = @ARGV; } else { - die; + badusage "incorrect arguments to dgit clone"; } $dstdir ||= "$package"; clone($dstdir); @@ -566,7 +829,6 @@ sub cmd_clone { sub branchsuite () { my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD); - chomp $branch; if ($branch =~ m#$lbranch_re#o) { return $1; } else { @@ -576,58 +838,106 @@ sub branchsuite () { sub fetchpullargs () { if (!defined $package) { - my $sourcep = parsecontrol('debian/control'); - $package = $sourcep->{Source}; + my $sourcep = parsecontrol('debian/control','debian/control'); + $package = getfield $sourcep, 'Source'; } if (@ARGV==0) { - $suite = branchsuite(); - if (!$suite) { +# $isuite = branchsuite(); # this doesn't work because dak hates canons + if (!$isuite) { my $clogp = parsechangelog(); - $suite = $clogp->{Distribution}; + $isuite = getfield $clogp, 'Distribution'; } canonicalise_suite(); - print "fetching from suite $suite\n"; + 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 { - die if defined $package; + 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}; - canonicalise_suite(); + $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 { - die if defined $package; + # we pass further options and args to git-buildpackage + badusage "-p is not allowed with dgit build" if defined $package; my $clogp = parsechangelog(); - $suite = $clogp->{Distribution}; - $package = $clogp->{Source}; - canonicalise_suite(); - runcmd_ordryrun - qw(git-buildpackage -us -uc --git-no-sign-tags), - "--git-debian-branch=".lbranch(), - @ARGV; + $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(); + 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 () { @@ -641,27 +951,38 @@ sub parseopts () { $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 { - die "$_ ?"; + 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, $1; + push @git, '-c', $1; } elsif (s/^-C(.*)//s) { $changesfile = $1; } elsif (s/^-k(.*)//s) { $keyid=$1; } else { - die "$_ ?"; + badusage "unknown short option \`$_'"; } } } @@ -669,8 +990,11 @@ sub parseopts () { } 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"}(); }