X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=b25c4a3d9ce558007c80321bbc7b31a88a78b040;hp=9b1a9c7f45b399f5f3585468402daac1aa9dfffe;hb=2f0cebfee6ee94456b0b296ea16a30727ba9a414;hpb=9676ce51fcf429640854561edaaee1ec202bd037

diff --git a/dgit b/dgit
index 9b1a9c7f..b25c4a3d 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)");
 
@@ -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"; }
@@ -134,6 +136,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://',
@@ -216,10 +219,13 @@ sub archive_query () {
     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* \|
+    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 +233,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 $!;
@@ -429,7 +441,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 $?";
@@ -470,6 +482,7 @@ sub fetch_from_archive () {
 	    dryrun_report @upd_cmd;
 	}
     }
+    return 1;
 }
 
 sub clone ($) {
@@ -490,7 +503,7 @@ sub clone ($) {
     } else {
 	print "starting new git history\n";
     }
-    fetch_from_archive();
+    fetch_from_archive() or die;
     runcmd @git, qw(reset --hard), lrref();
     print "ready for work in $dstdir\n";
 }
@@ -499,7 +512,7 @@ sub fetch () {
     if (check_for_git()) {
 	git_fetch_us();
     }
-    fetch_from_archive();
+    fetch_from_archive() or die;
 }
 
 sub pull () {
@@ -564,6 +577,7 @@ sub dopush () {
 }
 
 sub cmd_clone {
+    parseopts();
     my $dstdir;
     die if defined $package;
     if (@ARGV==1) {
@@ -613,38 +627,50 @@ sub fetchpullargs () {
 }
 
 sub cmd_fetch {
+    parseopts();
     fetchpullargs();
     fetch();
 }
 
 sub cmd_pull {
+    parseopts();
     fetchpullargs();
     pull();
 }
 
 sub cmd_push {
+    parseopts();
     die if defined $package;
     my $clogp = parsechangelog();
     $package = $clogp->{Source};
     if (@ARGV==0) {
 	$suite = $clogp->{Distribution};
-	canonicalise_suite();
+	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};
-    canonicalise_suite();
     runcmd_ordryrun
 	qw(git-buildpackage -us -uc --git-no-sign-tags),
-            "--git-debian-branch=".lbranch(),
-            @ARGV;
+	'--git-builder=dpkg-buildpackage -i\.git/ -I.git',
+	"--git-debian-branch=".lbranch(),
+	@ARGV;
 }
 
 sub parseopts () {
@@ -658,10 +684,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 "$_ ?";
 	    }
@@ -672,6 +702,8 @@ sub parseopts () {
 		} 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) {
@@ -689,6 +721,5 @@ sub parseopts () {
 parseopts();
 die unless @ARGV;
 my $cmd = shift @ARGV;
-parseopts();
 
 { no strict qw(refs); &{"cmd_$cmd"}(); }