X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=fd59eeefa9052b71499f92b991c9d0fecdd58aa4;hb=768ff5909deb2493f1435ed5ab93019cdd75682a;hp=a21cddec32952c26243ae029a9edd490cb39d3a3;hpb=985e8045f860fb0be72b56b6859034b8c8746db9;p=dgit.git

diff --git a/dgit b/dgit
index a21cddec..fd59eeef 100755
--- a/dgit
+++ b/dgit
@@ -28,6 +28,8 @@ use File::Basename;
 use Dpkg::Version;
 use POSIX;
 
+our $dgit_version = 0.14;
+
 our $isuite = 'unstable';
 our $idistro;
 our $package;
@@ -230,7 +232,7 @@ sub badusage {
     exit 8;
 }
 
-sub helponly () {
+sub cmd_help () {
     print $helpmsg or die $!;
     exit 0;
 }
@@ -247,6 +249,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org',
 	       'dgit-distro.debian.sshdakls-dir' =>
 	           '/srv/ftp-master.debian.org/ftp/dists',
+	       'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
 	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
 
 sub cfg {
@@ -443,8 +446,6 @@ sub get_archive_dsc () {
 	$dscurl = access_cfg('mirror').$subpath;
 	$dscdata = url_get($dscurl);
 	next unless defined $dscdata;
-	$dscurl = access_cfg('mirror').$subpath;
-	$dscdata = url_get($dscurl);
 	my $dscfh = new IO::File \$dscdata, '<' or die $!;
 	print DEBUG Dumper($dscdata) if $debug>1;
 	$dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
@@ -513,21 +514,19 @@ sub mktree_in_ud_from_only_subdir () {
 }
 
 sub dsc_files_info () {
-    foreach my $csum (qw(Sha256 Sha1 MD5)) {
-	my $fname = $csum eq 'MD5' ? 'Files' : "Checksums-$csum";
+    foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
+		       ['Checksums-Sha1',  'Digest::SHA', 'new(1)'],
+		       ['Files',           'Digest::MD5', 'new()']) {
+	my ($fname, $module, $method) = @$csumi;
 	my $field = $dsc->{$fname};
 	next unless defined $field;
-	my $digest = uc $csum;
-	if (!eval "use Digest::$digest; 1;") {
-	    print DEBUG "ignoring $fname because $@\n";
-	    next;
-	}
+	eval "use $module; 1;" or die $@;
 	my @out;
 	foreach (split /\n/, $field) {
 	    next unless m/\S/;
 	    m/^(\w+) (\d+) (\S+)$/ or
 		fail "could not parse .dsc $fname line \`$_'";
-	    my $digester = eval "Digest::$digest->new;" or die $@;
+	    my $digester = eval "$module"."->$method;" or die $@;
 	    push @out, {
 		Hash => $1,
 		Bytes => $2,
@@ -639,10 +638,20 @@ END
 }
 
 sub ensure_we_have_orig () {
-    foreach my $f (dsc_files()) {
+    foreach my $fi (dsc_files_info()) {
+	my $f = $fi->{Filename};
 	next unless is_orig_file($f);
-	if (stat "../$f") {
-	    die "$f ?" unless -f _;
+	if (open F, "<", "../$f") {
+	    $fi->{Digester}->reset();
+	    $fi->{Digester}->addfile(*F);
+	    F->error and die $!;
+	    my $got = $fi->{Digester}->hexdigest();
+	    $got eq $fi->{Hash} or
+		fail "existing file $f has hash $got but .dsc".
+		    " demands hash $fi->{Hash}".
+		    " (perhaps you should delete this file?)";
+	    print "using existing $f\n";
+	    next;
 	} else {
 	    die "$f $!" unless $!==&ENOENT;
 	}
@@ -673,8 +682,7 @@ sub is_fast_fwd ($$) {
 }
 
 sub git_fetch_us () {
-    badusage "cannot dry run with fetch" if $dryrun;
-    runcmd @git, qw(fetch),access_giturl(),fetchspec();
+    runcmd_ordryrun @git, qw(fetch),access_giturl(),fetchspec();
 }
 
 sub fetch_from_archive () {
@@ -761,7 +769,7 @@ sub clone ($) {
     if (check_for_git()) {
 	print "fetching existing git history\n";
 	git_fetch_us();
-	runcmd @git, qw(fetch origin);
+	runcmd_ordryrun @git, qw(fetch origin);
     } else {
 	print "starting new git history\n";
     }
@@ -905,6 +913,7 @@ sub dopush () {
 	create_remote_git_repo();
     }
     runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
+    runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
     if (!$dryrun) {
 	rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
     } else {
@@ -915,7 +924,7 @@ sub dopush () {
 	    $keyid = access_cfg('keyid','RETURN-UNDEF');
 	}
 	my @tag_cmd = (@git, qw(tag -s -m),
-		       "Release $dversion for $csuite [dgit]");
+		       "$package release $dversion for $csuite [dgit]");
 	push @tag_cmd, qw(-u),$keyid if defined $keyid;
 	push @tag_cmd, $tag;
 	runcmd_ordryrun @tag_cmd;
@@ -1048,6 +1057,7 @@ sub build_maybe_quilt_fixup () {
     my $ncommits = 3;
     my $patchname = "auto-$version-$headref-$time";
     my $msg = cmdoutput @git, qw(log), "-n$ncommits";
+    mkpath '.git/dgit';
     my $descfn = ".git/dgit/quilt-description.tmp";
     open O, '>', $descfn or die "$descfn: $!";
     $msg =~ s/\n/\n /g;
@@ -1191,6 +1201,10 @@ sub cmd_quilt_fixup {
     build_maybe_quilt_fixup();
 }
 
+sub cmd_version {
+	print "dgit version $dgit_version\n";
+}
+
 sub parseopts () {
     my $om;
     while (@ARGV) {
@@ -1203,7 +1217,7 @@ sub parseopts () {
 	    } elsif (m/^--no-sign$/) {
 		$sign=0;
 	    } elsif (m/^--help$/) {
-		helponly();
+		cmd_help();
 	    } elsif (m/^--new$/) {
 		$new_package=1;
 	    } elsif (m/^--(\w+)=(.*)/s &&
@@ -1233,7 +1247,7 @@ sub parseopts () {
 		if (s/^-n/-/) {
 		    $dryrun=1;
 		} elsif (s/^-h/-/) {
-		    helponly();
+		    cmd_help();
 		} elsif (s/^-D/-/) {
 		    open DEBUG, ">&STDERR" or die $!;
 		    $debug++;