X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=819ea55801dc82e2c5a8a62de2f82e9d7a6817cd;hb=0b8c9c9b901a8a391dea79f643a08d089a67f679;hp=7e464fe0a34fd08fc076385b980545bef8a20502;hpb=6810652456326f572e2a465a3d12519e4fcef4cf;p=dgit.git diff --git a/dgit b/dgit index 7e464fe0..819ea558 100755 --- a/dgit +++ b/dgit @@ -26,13 +26,14 @@ use Dpkg::Control::Hash; use File::Path; use POSIX; -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 %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -42,6 +43,7 @@ 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, @@ -49,7 +51,7 @@ our %opts_opt_map = ('dget' => \@dget, 'debsign' => \@debsign); our $remotename = 'dgit'; -our $ourdscfield = 'Vcs-Git-Master'; +our $ourdscfield = 'Vcs-Dgit-Master'; our $branchprefix = 'dgit'; sub lbranch () { return "$branchprefix/$suite"; } @@ -96,20 +98,23 @@ sub printcmd { } sub runcmd { - printcmd(\*DEBUG,"+",@_); + printcmd(\*DEBUG,"+",@_) if $debug>0; $!=0; $?=0; die "@_ $! $?" if system @_; } sub cmdoutput_errok { - printcmd(\*DEBUG,"|",@_); + 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; } @@ -133,17 +138,23 @@ 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.git-create' => 'ssh-cmd', + 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/'); sub cfg { foreach my $c (@_) { - my $v = cmdoutput_errok qw(git config --), $c; + my $v; + { + local ($debug) = $debug-1; + $v = cmdoutput_errok(@git, qw(config --), $c); + }; if ($?==0) { - chomp $v; return $v; } elsif ($?!=256) { die "$c $?"; @@ -154,10 +165,14 @@ sub cfg { return undef; } +sub access_distro () { + return cfg("dgit-suite.$suite.distro", + "dgit.default.distro"); +} + sub access_cfg ($) { my ($key) = @_; - my $distro = cfg("dgit-suite.$suite.distro", - "dgit.default.distro"); }); + my $distro = access_distro(); my $value = cfg("dgit-distro.$distro.$key", "dgit.default.$key"); return $value; @@ -171,11 +186,13 @@ sub access_gituserhost () { sub access_giturl () { my $url = access_cfg('git-url'); - return $url if defined $url; - return - access_cfg('git-proto'). - access_gituserhost(). - access_cfg('git-path'); + if (!defined $url) { + $url = + access_cfg('git-proto'). + access_gituserhost(). + access_cfg('git-path'); + } + return "$url/$package.git"; } sub parsecontrol { @@ -193,14 +210,25 @@ sub parsechangelog { return $c; } -our $rmad; - -sub askmadison () { - $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; if ($suite ne $3) { @@ -208,41 +236,45 @@ sub askmadison () { print "canonical suite name for $suite is $3\n"; $suite = $3; } - $4 eq 'source' or die "$rmad ?"; - return $vsn; + my $component; + if (defined $4) { + $component = $4; + } else { + $component = access_cfg('archive-query-default-component'); + } + $5 eq 'source' or die "$rmad ?"; + my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1); + my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc"; + return ($vsn,$subpath); } sub canonicalise_suite () { - askmadison(); + archive_query() or die; } 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(); + 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); + 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 $format_ok{$fmt}; } sub check_for_git () { # returns 0 or 1 - my $how = access_config('git-check'); + my $how = access_cfg('git-check'); if ($how eq 'ssh-cmd') { - my $r= cmd_getoutput 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 "$cmd\n"; - open P, "$cmd |" or die $!; - $!=0; $?=0; - my $r =
; close P;
- print DEBUG ">$r<\n";
+ 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");
+ print DEBUG "got \`$r'\n";
die "$r $! $?" unless $r =~ m/^[01]$/;
return $r+0;
} else {
@@ -251,13 +283,14 @@ sub check_for_git () {
}
sub create_remote_git_repo () {
- my $how = access_config('git-create');
+ 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";
+ 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 ?";
}
@@ -287,7 +320,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);
}
@@ -303,6 +336,11 @@ 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 $!;
@@ -329,21 +367,33 @@ 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 <