X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=6d7e5740638ed259cd583e9d6f0ca89497f37988;hp=1fd15d73ae63bedd54959abf82401310a3b1f8a6;hb=802c7301eadda1f7664c0efe3193050e5a70cc2d;hpb=7474327d959d0478a501d9a222876d00384bd7d2

diff --git a/dgit b/dgit
index 1fd15d73..6d7e5740 100755
--- a/dgit
+++ b/dgit
@@ -24,6 +24,7 @@ use Data::Dumper;
 use LWP::UserAgent;
 use Dpkg::Control::Hash;
 use File::Path;
+use Dpkg::Version;
 use POSIX;
 
 our $suite = 'sid';
@@ -33,6 +34,7 @@ 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)");
 
@@ -102,6 +104,14 @@ sub runcmd {
     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;
@@ -110,8 +120,10 @@ sub cmdoutput_errok {
     $!=0; $?=0;
     { local $/ = undef; $d = <P>; }
     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;
 }
 
@@ -142,7 +154,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       '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://ftp.debian.org/debian/');
+	       'dgit-distro.debian.mirror' => 'http://http.debian.net/debian/');
 
 sub cfg {
     foreach my $c (@_) {
@@ -152,7 +164,6 @@ sub cfg {
 	    $v = cmdoutput_errok(@git, qw(config --), $c);
 	};
 	if ($?==0) {
-	    chomp $v;
 	    return $v;
 	} elsif ($?!=256) {
 	    die "$c $?";
@@ -208,7 +219,7 @@ sub parsechangelog {
     return $c;
 }
 
-our $rmad;
+our %rmad;
 
 sub archive_query () {
     my $query = access_cfg('archive-query');
@@ -217,13 +228,15 @@ sub archive_query () {
     my $proto = $1;
     my $url = $'; #';
     die unless $proto eq 'madison';
-    $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite","-u$url",$package;
+    $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|/]+ )(?:/([^ \t|/]+)) \s* \|
+                 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
                  \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
     $1 eq $package or die "$rmad $package ?";
     my $vsn = $2;
@@ -245,7 +258,7 @@ sub archive_query () {
 }
 
 sub canonicalise_suite () {
-    archive_query();
+    archive_query() or die;
 }
 
 sub get_archive_dsc () {
@@ -270,7 +283,6 @@ sub check_for_git () {
 	    (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 {
@@ -316,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);
 }
 
@@ -332,6 +344,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 $!;
@@ -358,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 <<END or die $!;
+tree $tree
 author $authline
 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);
+    my $outputhash = make_commit qw(../commit.tmp);
     print "synthesised git commit from .dsc $clogp->{Version}\n";
-    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 <<END or die $!;
+tree $tree
+parent $upload_hash
+parent $outputhash
+author $authline
+committer $authline
+
+Record $package ($clogp->{Version}) in archive suite $suite
+END
+            $outputhash = make_commit qw(../commit2.tmp);
+	} elsif ($vcmp > 0) {
 	    print STDERR <<END or die $!;
 Version actually in archive:    $clogp->{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;
 }
@@ -428,7 +454,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);
 }
 
@@ -450,15 +476,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 = <H>;
+	chomp $upload_hash;
+	die "$lrref_fn $upload_hash ?" unless $upload_hash =~ m/^\w+$/;
+    } elsif ($! == &ENOENT) {
 	$upload_hash = '';
     } else {
-	die $?;
+	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"
@@ -468,10 +496,11 @@ 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', lrref(), $hash);
@@ -504,7 +533,7 @@ sub clone ($) {
     }
     fetch_from_archive() or die;
     runcmd @git, qw(reset --hard), lrref();
-    print "ready for work in $dstdir\n";
+    printdone "ready for work in $dstdir";
 }
 
 sub fetch () {
@@ -512,21 +541,60 @@ sub fetch () {
 	git_fetch_us();
     }
     fetch_from_archive() or die;
+    printdone "fetched into ".lrref();
 }
 
 sub pull () {
     fetch();
     runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
         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";
@@ -573,9 +641,11 @@ sub dopush () {
     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) {
@@ -595,7 +665,6 @@ sub cmd_clone {
 
 sub branchsuite () {
     my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
-    chomp $branch;
     if ($branch =~ m#$lbranch_re#o) {
 	return $1;
     } else {
@@ -625,23 +694,27 @@ sub fetchpullargs () {
 }
 
 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) = 'dpkg';
+	    local ($package) = $existing_package; # this is a hack
 	    canonicalise_suite();
 	}
     } else {
@@ -656,15 +729,16 @@ sub cmd_push {
 }
 
 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 () {
@@ -684,6 +758,8 @@ sub parseopts () {
 		$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 "$_ ?";
 	    }
@@ -711,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"}(); }