X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=82754b66995728a55b6f0c91c77153c938a6db17;hp=b3ade7a2085939ad3336938f7c099721387854a8;hb=2eaa8bbe4d7197de7c1820f1ce5f5bd35644a0b5;hpb=df7ba00074962054c79a540a83cf27bf55b3c403;ds=sidebyside

diff --git a/dgit b/dgit
index b3ade7a2..82754b66 100755
--- a/dgit
+++ b/dgit
@@ -38,13 +38,15 @@ our $alioth_git = "git+ssh://$aliothname/$aliothpath";
 our $alioth_sshtestbodge = [$aliothname,$aliothpath];
 
 our (@dget_opts) = qw(-u);
+our (@git_tag_opts);
 
 our $remotename = 'dgit';
+our $ourdscfield = 'Vcs-git-master';
 
-sub mainbranch () { return "dgit/$suite"; }
-sub uploadbranch () { return "dgit/$suite.upload"; }
+sub uploadbranch () { return "dgit/$suite"; }
 sub lref ($) { return "refs/heads/$_[0]"; }
 sub rref ($) { return "refs/remotes/$remotename/$_[0]"; }
+sub debiantag ($) { return "debian/$_[0]"; }
 
 our $ua;
 
@@ -131,7 +133,7 @@ sub check_for_git () {
     return $r+0;
 }
 
-our ($dsc_hash,$lastupl_hash);
+our ($dsc_hash,$upload_hash);
 
 our $ud = '.git/dgit/unpack';
 
@@ -189,7 +191,7 @@ sub generate_commit_from_dsc () {
     $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline;
     open C, ">../commit.tmp" or die $!;
     print C "tree $tree\n" or die $!;
-    print C "parent $lastupl_hash\n" or die $! if defined $lastupl_hash;
+    print C "parent $upload_hash\n" or die $! if defined $upload_hash;
     print C <<END or die $!;
 author $authline
 committer $authline
@@ -207,9 +209,9 @@ END
     cmdoutput qw(git log -n2), $commithash;
     # ... gives git a chance to complain if our commit is malformed
     my $outputhash = $commithash;
-    if (defined $lastupl_hash) {
+    if (defined $upload_hash) {
 	chdir "$ud/$dir" or die $!;
-	runcmd qw(git reset --hard), $lastupl_hash;
+	runcmd qw(git 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;
@@ -240,37 +242,39 @@ sub rev_parse ($) {
 
 sub is_fast_fwd ($$) {
     my ($ancestor,$child) = @_;
-    my $mb = cmdoutput qw(git merge-base), $dsc_hash, $lastupl_hash;
+    my $mb = cmdoutput qw(git merge-base), $dsc_hash, $upload_hash;
     return rev_parse($mb) eq rev_parse($ancestor);
 }
 
 sub fetch_from_archive () {
     # ensures that rref(uploadbranch()) is what is actually in the archive,
     #  one way or another
-    my $lastupl_ref = rref(uploadbranch());
-    $!=0; $lastupl_hash = `git show-ref --heads $lastupl_ref`;
+    my $upload_ref = rref(uploadbranch());
+    $!=0; $upload_hash = `git show-ref --heads $upload_ref`;
     die $! if $!;
-    die $? unless ($?==0 && chomp $lastupl_hash) 
-	or ($?==128 && !length $lastupl_hash);
+    die $? unless ($?==0 && chomp $upload_hash) 
+	or ($?==128 && !length $upload_hash);
     my $hash;
     if (defined $dsc_hash) {
+	die "missing git history even though dsc has hash"
+	    unless length $upload_hash;
 	$hash = $dsc_hash;
     } else {
 	$hash = generate_commit_from_dsc();
     }
-    if ($lastupl_hash) {
+    if (length $upload_hash) {
 	die "not fast forward on last upload branch!".
 	    " (archive's version left in DGIT_ARCHIVE)"
-	    unless is_fast_fwd($lastupl_hash, $dsc_hash);
+	    unless is_fast_fwd($dsc_hash, $upload_hash);
     }
-    if ($lastupl_ref ne $hash) {
-	cmdoutput qw(git update-ref -m), 'dgit fetch', $lastupl_ref, $hash;
+    if ($upload_hash ne $hash) {
+	cmdoutput qw(git update-ref -m), 'dgit fetch', $upload_ref, $hash;
     }
 }
 
 sub clone () {
     get_archive_dsc();
-    $dsc_hash = $dsc->{'Vcs-git-master'};
+    $dsc_hash = $dsc->{$ourdscfield};
     if (defined $dsc_hash) {
 	$dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
 	$dsc_hash = $&;
@@ -287,17 +291,16 @@ sub clone () {
 	fetch_from_archive();
 	runcmd qw(git reset --hard), rref(uploadbranch());
     } else {
-	die "missing git history even though dsc has hash" if defined $dsc_hash;
 	print "starting new git history\n";
 	mkdir $dstdir or die "$dstdir $!";
 	chdir "$dstdir" or die "$dstdir $!";
 	runcmd qw(git init -q);
 	open H, "> .git/HEAD" or die $!;
-	print H "ref: ".lref(mainbranch())."\n" or die $!;
+	print H "ref: ".lref(uploadbranch())."\n" or die $!;
 	close H or die $!;
 	runcmd qw(git remote add), $remotename, $alioth_git;
 	runcmd "git config branch.$suite.remote $remotename";
-	runcmd "git config branch.$suite.merge ".lref(mainbranch());
+	runcmd "git config branch.$suite.merge ".lref(uploadbranch());
 	my $newhash = generate_commit_from_dsc();
 	runcmd qw(git reset --hard), $newhash;
     }
@@ -305,10 +308,19 @@ sub clone () {
 }
 
 sub fetch () {
-    
+    if (check_for_git()) {
+	runcmd qw(git fetch -p),$remotename,
+	    '+refs/heads/*:refs/remotes/origin/*';
+    }
+    fetch_from_archive();
+}
+
+sub pull () {
+    fetch();
+    runcmd qw(git merge -m),"Merge from $suite [dgit]",lref(uploadbranch());
 }
 
-sub push () {
+sub dopush () {
     runcmd qw(git diff --quiet HEAD);
     my $clogp = parsechangelog();
     $package = $clogp->{Source};
@@ -322,20 +334,26 @@ sub push () {
     my $tree = mktree_in_ud_from_only_subdir();
     chdir '../../../..' or die $!;
     runcmd qw(git diff --exit-code), $tree;
-    runcmd qw(git fetch), $alioth_git,
-        map { lref($_).":".rref($_) }
-        (mainbranch(), uploadbranch());
-    die <<END;
-    if (!is_fast_fwd(mainbranch
-xxx introduce remote_lref
-xxx use remote_lref everywhere
-
-fetch from alioth
-do fast forward check and maybe fake merge
-push to uploading
-dput
-push to main
-END
+#fetch from alioth
+#do fast forward check and maybe fake merge
+#    if (!is_fast_fwd(mainbranch
+#    runcmd qw(git fetch -p ), $alioth_git,
+#        map { lref($_).":".rref($_) }
+#        (uploadbranch());
+    $dsc->{$ourdscfield} = rev_parse('HEAD');
+    $dsc->save("../$dscfn.tmp") or die $!;
+    rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
+    if ($sign) {
+	runcmd qw(git tag -s),@git_tag_opts,qw(-m),
+	    "Release $dsc->{Version} for $suite [dgit]";
+	unlink "../$dscfn.asc" or $!==&ENOENT or die "$dscfn.asc $!";
+	runcmd qw(gpg --clearsign),@gpg_opts,"../$dscfn";
+	rename "../$dscfn.asc","../$dscfn" or die "$dscfn $!";
+    }
+    if (!$nopush) {
+	runcmd qw(git push),$remotename,"HEAD:".lref(uploadbranch());
+	runcmd qw(dput),"../$dscfn";
+    }
 }
 
 sub cmd_clone {
@@ -349,6 +367,41 @@ sub cmd_clone {
     clone();
 }
 
+sub branchsuite () {
+    $branch = `git-symbolic-ref HEAD`;
+    if ($branch =~ m#^refs/heads/dgit/([^/.]+)$#) {
+	return $1;
+    } else {
+	return undef;
+    }
+}
+
+sub cmd_fetch {
+    my $clogp = parsechangelog();
+    $package = $clogp->{Source};
+    if (@ARGV==0) {
+	$suite = branchsuite();
+	$suite ||= $clogp->{Distribution};
+	print "fetching from suite $suite\n";
+    } elsif (@ARGV==1) {
+	($suite) = @ARGV;
+    } else {
+	die;
+    }
+    fetch();
+}
+
+sub cmd_push {
+    my $clogp = parsechangelog();
+    $package = $clogp->{Source};
+    if (@ARGV==0) {
+	$suite = $clogp->{Distribution};
+    } else {
+	die;
+    }
+    dopush();
+}
+
 sub parseopts () {
     die if @ARGV && $ARGV[0] =~ m/^\-/;
 }