X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=6d7e5740638ed259cd583e9d6f0ca89497f37988;hp=f02bb30a646bbda0ba2a0a2354d753005431e13c;hb=802c7301eadda1f7664c0efe3193050e5a70cc2d;hpb=468679d0e5f7cd55331f99f041aaf9ac78608b68 diff --git a/dgit b/dgit index f02bb30a..6d7e5740 100755 --- a/dgit +++ b/dgit @@ -24,22 +24,19 @@ 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 $package; our $sign = 1; our $dryrun = 0; our $changesfile; +our $new_package = 0; +our $existing_package = 'dpkg'; -our $aliothname = 'iwj@git.debian.org'; -our $aliothpath = '/git/dgit-test'; -our $alioth_git = "git+ssh://$aliothname/$aliothpath"; -our $alioth_sshtestbodge = [$aliothname,$aliothpath]; +our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); our (@git) = qw(git); our (@dget) = qw(dget); @@ -47,19 +44,29 @@ our (@dput) = qw(dput); our (@debsign) = qw(debsign); our $keyid; +our $debug = 0; +open DEBUG, ">/dev/null" or die $!; + our %opts_opt_map = ('dget' => \@dget, 'dput' => \@dput, 'debsign' => \@debsign); our $remotename = 'dgit'; -our $ourdscfield = 'Vcs-Git-Master'; +our $ourdscfield = 'Vcs-Dgit-Master'; our $branchprefix = 'dgit'; -sub uploadbranch () { return "$branchprefix/$suite"; } -sub lref ($) { return "refs/heads/$_[0]"; } -sub rref ($) { return "refs/remotes/$remotename/$_[0]"; } +sub lbranch () { return "$branchprefix/$suite"; } +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 debiantag ($) { return "debian/$_[0]"; } +sub fetchspec () { + local $suite = '*'; + return "+".rrref().":".lrref(); +} + our $ua; sub url_get { @@ -67,7 +74,7 @@ sub url_get { $ua = LWP::UserAgent->new(); $ua->env_proxy; } - print DEBUG "fetching @_...\n"; + print "downloading @_...\n"; my $r = $ua->get(@_) or die $!; die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success; return $r->decoded_content(); @@ -75,19 +82,48 @@ sub url_get { 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 runcmd { + printcmd(\*DEBUG,"+",@_) if $debug>0; $!=0; $?=0; die "@_ $! $?" 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,"|",@_) if $debug>0; open P, "-|", @_ or die $!; my $d; $!=0; $?=0; { local $/ = undef; $d =

; } die if P->error; - close P or return undef; + if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; } chomp $d; + $d =~ m/^.*/; + print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #'; return $d; } @@ -98,17 +134,7 @@ sub cmdoutput { } sub dryrun_report { - print "#" or die $!; - local $_; - foreach my $a (@_) { - $_ = $a; - if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) { - print " '$_'" or die $!; - } else { - print " $_" or die $!; - } - } - print "\n" or die $!; + printcmd(\*STDOUT,"#",@_); } sub runcmd_ordryrun { @@ -119,6 +145,65 @@ sub runcmd_ordryrun { } } +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-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.mirror' => 'http://http.debian.net/debian/'); + +sub cfg { + foreach my $c (@_) { + my $v; + { + local ($debug) = $debug-1; + $v = cmdoutput_errok(@git, qw(config --), $c); + }; + if ($?==0) { + return $v; + } elsif ($?!=256) { + die "$c $?"; + } + my $dv = $defcfg{$c}; + return $dv if defined $dv; + } + return undef; +} + +sub access_distro () { + return cfg("dgit-suite.$suite.distro", + "dgit.default.distro"); +} + +sub access_cfg ($) { + my ($key) = @_; + my $distro = access_distro(); + my $value = cfg("dgit-distro.$distro.$key", + "dgit.default.$key"); + return $value; +} + +sub access_gituserhost () { + my $user = access_cfg('git-user'); + my $host = access_cfg('git-host'); + return defined($user) && length($user) ? "$user\@$host" : $host; +} + +sub access_giturl () { + my $url = access_cfg('git-url'); + if (!defined $url) { + $url = + access_cfg('git-proto'). + access_gituserhost(). + access_cfg('git-path'); + } + return "$url/$package.git"; +} + sub parsecontrol { my $c = Dpkg::Control::Hash->new(); $c->load(@_) or return undef; @@ -134,44 +219,89 @@ sub parsechangelog { 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 $query = access_cfg('archive-query'); + $query ||= "madison:".access_distro(); + $query =~ s/^(\w+):// or die "$query ?"; + my $proto = $1; + my $url = $'; #'; + die unless $proto eq 'madison'; + $rmad{$package} ||= cmdoutput + qw(rmadison -asource),"-s$suite","-u$url",$package; + my $rmad = $rmad{$package}; + 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 ? + if ($suite ne $3) { + # madison canonicalises for us + print "canonical suite name for $suite is $3\n"; + $suite = $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); +} + +sub canonicalise_suite () { + archive_query() or die; +} + +sub get_archive_dsc () { + my ($vsn,$subpath) = archive_query(); + 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); + print DEBUG Dumper($dscdata) if $debug>1; $dsc = Dpkg::Control::Hash->new(allow_pgp=>1); $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n"; -#print DEBUG Dumper($dsc); + print DEBUG Dumper($dsc) if $debug>1; my $fmt = $dsc->{Format}; - die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0'; + die "unsupported format $fmt, sorry\n" unless $format_ok{$fmt}; } sub check_for_git () { # returns 0 or 1 - my $cmd= - "ssh $alioth_sshtestbodge->[0] '". - " set -e; cd $aliothpath;". - " 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 $r= cmdoutput + (access_cfg('ssh'),access_gituserhost(), + " set -e; cd ".access_cfg('git-path').";". + " if test -d $package.git; then echo 1; else echo 0; fi"); + die "$r $! $?" unless $r =~ m/^[01]$/; + return $r+0; + } else { + die "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 { + die "unknown git-create $how ?"; + } } our ($dsc_hash,$upload_hash); @@ -198,7 +328,7 @@ 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); } @@ -211,7 +341,12 @@ sub dsc_files () { sub is_orig_file ($) { local ($_) = @_; - m/\.orig\.tar\.\w+$/; + 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 () { @@ -240,48 +375,57 @@ sub generate_commit_from_dsc () { my $authline = "$author $date"; $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline; 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} -# imported by dgit from the archive +# imported from the archive END close C or die $!; + my $outputhash = make_commit qw(../commit.tmp); print "synthesised git commit from .dsc $clogp->{Version}\n"; - my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp); - 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; 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; + $oldclogp->load('../changelogold.tmp','previous changelog') or die; my $vcmp = version_compare_string($oldclogp->{Version}, $clogp->{Version}); if ($vcmp < 0) { # git upload/ is earlier vsn than archive, use archive - } elsif ($vcmp >= 0) { + open C, ">../commit2.tmp" or die $!; + print C <{Version}) in archive suite $suite +END + $outputhash = make_commit qw(../commit2.tmp); + } elsif ($vcmp > 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. 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) { + die "version in archive ($clogp->{Version})". + " is same as version in git". + " to-be-uploaded (upload/) branch ($oldclogp->{Version})". + " but archive version hash no commit hash?!\n"; } - chdir '../../../..' or die $!; } + chdir '../../../..' or die $!; + runcmd @git, qw(update-ref -m),"dgit fetch import $clogp->{Version}", + 'DGIT_ARCHIVE', $outputhash; + cmdoutput @git, qw(log -n2), $outputhash; + # ... gives git a chance to complain if our commit is malformed rmtree($ud); return $outputhash; } @@ -310,20 +454,39 @@ 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),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 = - cmdoutput_errok @git, qw(show-ref --heads), $upload_ref; - die $! if $!; - die $? unless ($?==0 && chomp $upload_hash) - or ($?==256 && !length $upload_hash); - $upload_hash ||= ''; + get_archive_dsc() or return 0; + $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 $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" @@ -333,80 +496,105 @@ sub fetch_from_archive () { } else { $hash = generate_commit_from_dsc(); } + print DEBUG "current hash $hash\n"; if ($upload_hash) { die "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', $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 () { +sub clone ($) { + my ($dstdir) = @_; die "dry run makes no sense with clone" if $dryrun; - 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"; - my $branch = uploadbranch(); + 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 @git, qw(clone --origin),$remotename, qw(-b), $branch, '--', - "$alioth_git/$package.git", $dstdir; - chdir "$dstdir" or die "$dstdir $!"; - fetch_from_archive(); - runcmd @git, qw(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 @git, qw(init -q); - open H, "> .git/HEAD" or die $!; - print H "ref: ".lref(uploadbranch())."\n" or die $!; - close H or die $!; - runcmd @git, qw(remote add), $remotename, "$alioth_git/$package.git"; - runcmd "git config branch.$branch.remote $remotename"; - runcmd "git config branch.$branch.merge ".lref(uploadbranch()); - my $newhash = generate_commit_from_dsc(); - runcmd @git, qw(reset --hard), $newhash; } - print "ready for work in $dstdir\n"; + fetch_from_archive() or die; + runcmd @git, qw(reset --hard), lrref(); + printdone "ready for work in $dstdir"; } sub fetch () { - get_archive_dsc(); if (check_for_git()) { - runcmd_ordryrun @git, qw(fetch -p),$remotename, - '+refs/heads/*:refs/remotes/origin/*'; + git_fetch_us(); } - fetch_from_archive(); + fetch_from_archive() or die; + printdone "fetched into ".lrref(); } sub pull () { fetch(); runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]", - lref(uploadbranch()); + lrref(); + printdone "fetched to ".lrref()." and merged into HEAD"; +} + +sub check_not_dirty () { + my $output = cmdoutput @git, qw(status --porcelain); + if (length $output) { + my $m = "tree dirty:\n$output\n"; + if (!$dryrun) { + die $m; + } else { + warn $m; + } + } +} + +sub commit_quilty_patch () { + my $output = cmdoutput @git, qw(status --porcelain); + my $vsn = $dsc->{Version}; + my %fixups = map {$_=>1} + (".pc/debian-changes-$vsn/","debian/patches/debian-changes-2.8-5"); + 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) { + runcmd_ordryrun @git, qw(add), @files; + runcmd_ordryrun + @git, qw(commit -m), "Commit Debian 3.0 (quilt) metadata"; + } } sub dopush () { - runcmd @git, qw(diff --quiet HEAD); + print DEBUG "actually entering push\n"; + runcmd qw(debian/rules clean); my $clogp = parsechangelog(); $package = $clogp->{Source}; my $dscfn = "${package}_$clogp->{Version}.dsc"; stat "../$dscfn" or die "$dscfn $!"; $dsc = parsecontrol("../$dscfn"); + print DEBUG "format $dsc->{Format}\n"; + if ($dsc->{Format} eq '3.0 (quilt)') { + commit_quilty_patch(); + } + check_not_dirty(); prep_ud(); chdir $ud or die $!; print "checking that $dscfn corresponds to HEAD\n"; @@ -422,42 +610,62 @@ sub dopush () { # (uploadbranch()); $dsc->{$ourdscfield} = rev_parse('HEAD'); $dsc->save("../$dscfn.tmp") or die $!; - rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!"; + 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; ($changesfile) = @cs; } + my $tag = debiantag($dsc->{Version}); + if (!check_for_git()) { + create_remote_git_repo(); + } + runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref(); if ($sign) { my @tag_cmd = (@git, qw(tag -s -m), "Release $dsc->{Version} for $suite [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),$remotename,"HEAD:".lref(uploadbranch()); - runcmd_ordryrun @dput, $changesfile; + runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag"; + my $host = access_cfg('upload-host'); + my @hostarg = defined($host) ? ($host,) : (); + runcmd_ordryrun @dput, @hostarg, $changesfile; + printdone "pushed and uploaded $dsc->{Version}"; } sub cmd_clone { + parseopts(); + my $dstdir; + die if defined $package; if (@ARGV==1) { ($package) = @ARGV; - } elsif (@ARGV==2) { + } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) { ($package,$suite) = @ARGV; + } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) { + ($package,$dstdir) = @ARGV; + } elsif (@ARGV==3) { + ($package,$suite,$dstdir) = @ARGV; } else { die; } - clone(); + $dstdir ||= "$package"; + clone($dstdir); } sub branchsuite () { my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD); - chomp $branch; - if ($branch =~ m#^refs/heads/$branchprefix/([^/.]+)$#o) { + if ($branch =~ m#$lbranch_re#o) { return $1; } else { return undef; @@ -465,47 +673,72 @@ sub branchsuite () { } sub fetchpullargs () { - my $clogp = parsechangelog(); - $package = $clogp->{Source}; + if (!defined $package) { + my $sourcep = parsecontrol('debian/control'); + $package = $sourcep->{Source}; + } if (@ARGV==0) { $suite = branchsuite(); - $suite ||= $clogp->{Distribution}; + if (!$suite) { + my $clogp = parsechangelog(); + $suite = $clogp->{Distribution}; + } + canonicalise_suite(); print "fetching from suite $suite\n"; } elsif (@ARGV==1) { ($suite) = @ARGV; + canonicalise_suite(); } else { die; } } sub cmd_fetch { + parseopts(); fetchpullargs(); fetch(); } sub cmd_pull { + parseopts(); fetchpullargs(); pull(); } sub cmd_push { + parseopts(); + die if defined $package; + runcmd @git, qw(diff --quiet HEAD); my $clogp = parsechangelog(); $package = $clogp->{Source}; if (@ARGV==0) { $suite = $clogp->{Distribution}; + if ($new_package) { + local ($package) = $existing_package; # this is a hack + canonicalise_suite(); + } } else { die; } + if (fetch_from_archive()) { + is_fast_fwd(lrref(), 'HEAD') or die; + } else { + die unless $new_package; + } dopush(); } sub cmd_build { + # we pass further options and args to git-buildpackage + die if defined $package; my $clogp = parsechangelog(); $suite = $clogp->{Distribution}; + $package = $clogp->{Source}; runcmd_ordryrun qw(git-buildpackage -us -uc --git-no-sign-tags), - "--git-debian-branch=".uploadbranch(), - @ARGV; + '--git-builder=dpkg-buildpackage -i\.git/ -I.git', + "--git-debian-branch=".lbranch(), + @ARGV; } sub parseopts () { @@ -519,10 +752,14 @@ sub parseopts () { $dryrun=1; } elsif (m/^--no-sign$/) { $sign=0; + } 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 "$_ ?"; } @@ -530,8 +767,13 @@ sub parseopts () { while (m/^-./s) { if (s/^-n/-/) { $dryrun=1; + } 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) { @@ -545,8 +787,8 @@ sub parseopts () { } parseopts(); +print STDERR "DRY RUN ONLY\n" if $dryrun; die unless @ARGV; my $cmd = shift @ARGV; -parseopts(); { no strict qw(refs); &{"cmd_$cmd"}(); }