X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=5fc937898d77ca14c1c031eecd933adbd81606b4;hb=17652b53bde8d7aa85a7cdd8fc6d7abcc94b2946;hp=3bfdfc46b3c53f4e98ad77f7e9d4614ffab0720a;hpb=03e6840182e85e5c0e5d9b831d942dd8d2df013b;p=dgit.git diff --git a/dgit b/dgit index 3bfdfc46..5fc93789 100755 --- a/dgit +++ b/dgit @@ -32,6 +32,8 @@ 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)"); @@ -109,8 +111,10 @@ sub cmdoutput_errok { $!=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;
}
@@ -134,6 +138,7 @@ 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://',
@@ -150,7 +155,6 @@ sub cfg {
$v = cmdoutput_errok(@git, qw(config --), $c);
};
if ($?==0) {
- chomp $v;
return $v;
} elsif ($?!=256) {
die "$c $?";
@@ -206,7 +210,7 @@ sub parsechangelog {
return $c;
}
-our $rmad;
+our %rmad;
sub archive_query () {
my $query = access_cfg('archive-query');
@@ -215,11 +219,16 @@ sub archive_query () {
my $proto = $1;
my $url = $'; #';
die unless $proto eq 'madison';
- $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite","-u$url",$package;
- $rmad =~ m/^ \s*( [^ \t|]+ )\s* \|
- \s*( [^ \t|]+ )\s* \|
+ $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) {
@@ -227,19 +236,25 @@ sub archive_query () {
print "canonical suite name for $suite is $3\n";
$suite = $3;
}
- $4 eq 'source' or die "$rmad ?";
+ 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/main/$prefix/$package/${package}_$vsn.dsc";
+ my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc";
return ($vsn,$subpath);
}
sub canonicalise_suite () {
- archive_query();
+ archive_query() or die;
}
sub get_archive_dsc () {
my ($vsn,$subpath) = archive_query();
- # fixme madison does not show us the component
+ if (!defined $vsn) { $dsc=undef; return undef; }
$dscurl = access_cfg('mirror').$subpath;
$dscdata = url_get($dscurl);
my $dscfh = new IO::File \$dscdata, '<' or die $!;
@@ -305,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);
}
@@ -355,7 +370,7 @@ committer $authline
$clogp->{Changes}
-# 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);
@@ -417,7 +432,7 @@ 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);
}
@@ -429,7 +444,7 @@ sub git_fetch_us () {
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 $?";
@@ -439,15 +454,17 @@ sub fetch_from_archive () {
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 =