X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=0953129efad8af753b362b690a6269b1bc112d5f;hb=106d8b9024555a2be827da0ae7f862e8c6891259;hp=5fc937898d77ca14c1c031eecd933adbd81606b4;hpb=17652b53bde8d7aa85a7cdd8fc6d7abcc94b2946;p=dgit.git

diff --git a/dgit b/dgit
index 5fc93789..0953129e 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';
@@ -145,7 +146,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 (@_) {
@@ -274,7 +275,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 {
@@ -336,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 $!;
@@ -362,9 +367,8 @@ 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
 
@@ -373,37 +377,46 @@ $clogp->{Changes}
 # 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
+            $outputhash = $upload_hash;
 	} else {
 	    die "version in archive is same as version in git".
 		" to-be-uploaded (upload/) branch 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;
 }
@@ -474,10 +487,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);
@@ -510,7 +524,7 @@ sub clone ($) {
     }
     fetch_from_archive() or die;
     runcmd @git, qw(reset --hard), lrref();
-    print "ready for work in $dstdir\n";
+    print "dgit ok: ready for work in $dstdir\n";
 }
 
 sub fetch () {
@@ -518,12 +532,14 @@ sub fetch () {
 	git_fetch_us();
     }
     fetch_from_archive() or die;
+    print "dgit ok: fetched into ".lrref()."\n";
 }
 
 sub pull () {
     fetch();
     runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
         lrref();
+    print "dgit ok: fetched to ".lrref()." and merged into HEAD\n";
 }
 
 sub dopush () {
@@ -579,6 +595,7 @@ sub dopush () {
     my $host = access_cfg('upload-host');
     my @hostarg = defined($host) ? ($host,) : ();
     runcmd_ordryrun @dput, @hostarg, $changesfile;
+    print "dgit ok: pushed and uploaded $dsc->{Version}\n";
 }
 
 sub cmd_clone {