X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=76a073fce893ac3d3283483d51a7801a98083991;hp=265978ea53cd0841de791d9aae3e409110caf4ac;hb=4c06b83c1207a4a5d92575ef5117be6f2fab6104;hpb=b02532fd7d3c82864c76eecbfd99a1abc7e2c1b2

diff --git a/dgit b/dgit
index 265978ea..76a073fc 100755
--- a/dgit
+++ b/dgit
@@ -111,7 +111,7 @@ sub lref () { return "refs/heads/".lbranch(); }
 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
 sub rrref () { return server_ref($csuite); }
 
-sub lrfetchrefs () { return "refs/dgit-fetch/$isuite"; }
+sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
 
 sub stripepoch ($) {
     my ($vsn) = @_;
@@ -448,6 +448,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.git-user-force' => 'dgit',
 	       'dgit-distro.debian.git-proto' => 'git+ssh://',
 	       'dgit-distro.debian.git-path' => '/dgit/debian/repos',
+	       'dgit-distro.debian.git-create' => 'true',
 	       'dgit-distro.debian.git-check' => 'ssh-cmd',
  'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
 # 'dgit-distro.debian.archive-query-tls-key',
@@ -460,6 +461,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 #   '--ca-path=/etc/ssl/ca-debian',
 # ^ this is a workaround but works (only) on DSA-administered machines
 	       'dgit-distro.debian.diverts.alioth' => '/alioth',
+	       'dgit-distro.debian/push.diverts.alioth' => '/alioth',
 	       'dgit-distro.debian/alioth.git-host' => 'git.debian.org',
 	       'dgit-distro.debian/alioth.git-user-force' => '',
 	       'dgit-distro.debian/alioth.git-proto' => 'git+ssh://',
@@ -484,20 +486,35 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
                );
 
+sub git_get_config ($) {
+    my ($c) = @_;
+
+    our %git_get_config_memo;
+    if (exists $git_get_config_memo{$c}) {
+	return $git_get_config_memo{$c};
+    }
+
+    my $v;
+    my @cmd = (@git, qw(config --), $c);
+    {
+	local ($debuglevel) = $debuglevel-2;
+	$v = cmdoutput_errok @cmd;
+    };
+    if ($?==0) {
+    } elsif ($?==256) {
+	$v = undef;
+    } else {
+	failedcmd @cmd;
+    }
+    $git_get_config_memo{$c} = $v;
+    return $v;
+}
+
 sub cfg {
     foreach my $c (@_) {
 	return undef if $c =~ /RETURN-UNDEF/;
-	my @cmd = (@git, qw(config --), $c);
-	my $v;
-	{
-	    local ($debuglevel) = $debuglevel-2;
-	    $v = cmdoutput_errok @cmd;
-	};
-	if ($?==0) {
-	    return $v;
-	} elsif ($?!=256) {
-	    failedcmd @cmd;
-	}
+	my $v = git_get_config($c);
+	return $v if defined $v;
 	my $dv = $defcfg{$c};
 	return $dv if defined $dv;
     }
@@ -532,6 +549,12 @@ sub access_quirk () {
     return ('none',undef);
 }
 
+our $access_pushing = 0;
+
+sub pushing () {
+    $access_pushing = 1;
+}
+
 sub access_distros () {
     # Returns list of distros to try, in order
     #
@@ -545,7 +568,12 @@ sub access_distros () {
     my (undef,$quirkdistro) = access_quirk();
     unshift @l, $quirkdistro;
     unshift @l, $instead_distro;
-    return grep { defined } @l;
+    @l = grep { defined } @l;
+
+    if ($access_pushing) {
+	@l = map { ("$_/push", $_) } @l;
+    }
+    @l;
 }
 
 sub access_cfg (@) {
@@ -1018,9 +1046,10 @@ sub check_for_git () {
 	if ($r =~ m/^divert (\w+)$/) {
 	    my $divert=$1;
 	    my ($usedistro,) = access_distros();
+	    # NB that if we are pushing, $usedistro will be $distro/push
 	    $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
 	    $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
-	    printdebug "diverting $divert so using distro $instead_distro\n";
+	    progress "diverting to $divert (using config for $instead_distro)";
 	    return check_for_git();
 	}
 	failedcmd @cmd unless $r =~ m/^[01]$/;
@@ -1343,12 +1372,33 @@ sub ensure_we_have_orig () {
 }
 
 sub git_fetch_us () {
-    runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
-    if (deliberately_not_fast_forward) {
-	runcmd_ordryrun_local @git, qw(fetch -p), access_giturl(),
-	    map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
-	    qw(tags heads);
-    }
+    my @specs = (fetchspec());
+    push @specs,
+        map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
+        qw(tags heads);
+    runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
+
+    my %here;
+    my $tagpat = debiantag('*',access_basedistro);
+
+    git_for_each_ref("refs/tags/".$tagpat, sub {
+	my ($objid,$objtype,$fullrefname,$reftail) = @_;
+	printdebug "currently $fullrefname=$objid\n";
+	$here{$fullrefname} = $objid;
+    });
+    git_for_each_ref(lrfetchrefs."/tags/".$tagpat, sub {
+	my ($objid,$objtype,$fullrefname,$reftail) = @_;
+	my $lref = "refs".substr($fullrefname, length lrfetchrefs);
+	printdebug "offered $lref=$objid\n";
+	if (!defined $here{$lref}) {
+	    my @upd = (@git, qw(update-ref), $lref, $objid, '');
+	    runcmd_ordryrun_local @upd;
+	} elsif ($here{$lref} eq $objid) {
+	} else {
+	    print STDERR \
+		"Not updateting $lref from $here{$lref} to $objid.\n";
+	}
+    });
 }
 
 sub fetch_from_archive () {
@@ -1455,6 +1505,38 @@ END
     return 1;
 }
 
+sub set_local_git_config ($$) {
+    my ($k, $v) = @_;
+    runcmd @git, qw(config), $k, $v;
+}
+
+sub setup_mergechangelogs () {
+    my $driver = 'dpkg-mergechangelogs';
+    my $cb = "merge.$driver";
+    my $attrs = '.git/info/attributes';
+    ensuredir '.git/info';
+
+    open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
+    if (!open ATTRS, "<", $attrs) {
+	$!==ENOENT or die "$attrs: $!";
+    } else {
+	while (<ATTRS>) {
+	    chomp;
+	    next if m{^debian/changelog\s};
+	    print NATTRS $_, "\n" or die $!;
+	}
+	ATTRS->error and die $!;
+	close ATTRS;
+    }
+    print NATTRS "debian/changelog merge=$driver\n" or die $!;
+    close NATTRS;
+
+    set_local_git_config "$cb.name", 'debian/changelog merge driver';
+    set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
+
+    rename "$attrs.new", "$attrs" or die "$attrs: $!";
+}
+
 sub clone ($) {
     my ($dstdir) = @_;
     canonicalise_suite();
@@ -1465,7 +1547,7 @@ sub clone ($) {
     runcmd @git, qw(init -q);
     my $giturl = access_giturl(1);
     if (defined $giturl) {
-	runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
+	set_local_git_config "remote.$remotename.fetch", fetchspec();
 	open H, "> .git/HEAD" or die $!;
 	print H "ref: ".lref()."\n" or die $!;
 	close H or die $!;
@@ -1484,6 +1566,7 @@ sub clone ($) {
 	$vcsgiturl =~ s/\s+-b\s+\S+//g;
 	runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
+    setup_mergechangelogs();
     runcmd @git, qw(reset --hard), lrref();
     printdone "ready for work in $dstdir";
 }
@@ -1768,7 +1851,6 @@ sub dopush ($) {
     my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
     runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
     runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
-    runcmd_ordryrun @git, qw(tag -v --), $tag;
 
     if (!check_for_git()) {
 	create_remote_git_repo();
@@ -1881,6 +1963,7 @@ sub cmd_pull {
 }
 
 sub cmd_push {
+    pushing();
     parseopts();
     badusage "-p is not allowed with dgit push" if defined $package;
     check_not_dirty();
@@ -1897,10 +1980,12 @@ sub cmd_push {
     if ($new_package) {
 	local ($package) = $existing_package; # this is a hack
 	canonicalise_suite();
-    }
-    if (defined $specsuite && $specsuite ne $isuite) {
+    } else {
 	canonicalise_suite();
-	$csuite eq $specsuite or
+    }
+    if (defined $specsuite &&
+	$specsuite ne $isuite &&
+	$specsuite ne $csuite) {
 	    fail "dgit push: changelog specifies $isuite ($csuite)".
 	        " but command line specifies $specsuite";
     }
@@ -1932,6 +2017,7 @@ sub cmd_push {
 #---------- remote commands' implementation ----------
 
 sub cmd_remote_push_build_host {
+    pushing();
     my ($nrargs) = shift @ARGV;
     my (@rargs) = @ARGV[0..$nrargs-1];
     @ARGV = @ARGV[$nrargs..$#ARGV];
@@ -1992,6 +2078,7 @@ sub i_method {
 }
 
 sub cmd_rpush {
+    pushing();
     my $host = nextarg;
     my $dir;
     if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
@@ -2577,8 +2664,18 @@ sub quilt_fixup_editor () {
 sub clean_tree () {
     if ($cleanmode eq 'dpkg-source') {
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
+    } elsif ($cleanmode eq 'dpkg-source-d') {
+	runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
     } elsif ($cleanmode eq 'git') {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
+    } elsif ($cleanmode eq 'git-ff') {
+	runcmd_ordryrun_local @git, qw(clean -xdff);
+    } elsif ($cleanmode eq 'check') {
+	my $leftovers = cmdoutput @git, qw(clean -xdn);
+	if (length $leftovers) {
+	    print STDERR $leftovers, "\n" or die $!;
+	    fail "tree contains uncommitted files and --clean=check specified";
+	}
     } elsif ($cleanmode eq 'none') {
     } else {
 	die "$cleanmode ?";
@@ -2673,6 +2770,9 @@ sub build_source {
     if ($cleanmode eq 'dpkg-source') {
 	runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
 	    changesopts();
+    } elsif ($cleanmode eq 'dpkg-source-d') {
+	runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S -d)),
+	    changesopts();
     } else {
 	my $pwd = must_getcwd();
 	my $leafdir = basename $pwd;
@@ -2697,7 +2797,7 @@ sub cmd_sbuild {
     changedir "..";
     my $pat = "${package}_".(stripepoch $version)."_*.changes";
     if (act_local()) {
-	stat_exist $dscfn or fail "$dscfn (in parent directory): $!";
+	stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
 	stat_exists $sourcechanges
 	    or fail "$sourcechanges (in parent directory): $!";
 	foreach my $cf (glob $pat) {
@@ -2746,6 +2846,11 @@ sub cmd_clone_dgit_repos_server {
     exec @cmd or fail "exec git clone: $!\n";
 }
 
+sub cmd_setup_mergechangelogs {
+    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    setup_mergechangelogs();
+}
+
 #---------- argument parsing and main program ----------
 
 sub cmd_version {
@@ -2810,7 +2915,7 @@ sub parseopts () {
 	    } elsif (m/^--build-products-dir=(.*)/s) {
 		push @ropts, $_;
 		$buildproductsdir = $1;
-	    } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
+	    } elsif (m/^--clean=(dpkg-source(?:-d)?|git|git-ff|check|none)$/s) {
 		push @ropts, $_;
 		$cleanmode = $1;
 	    } elsif (m/^--clean=(.*)$/s) {
@@ -2882,9 +2987,18 @@ sub parseopts () {
 		} elsif (s/^-wg$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git';
+		} elsif (s/^-wgf$//s) {
+		    push @ropts, $&;
+		    $cleanmode = 'git-ff';
 		} elsif (s/^-wd$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';
+		} elsif (s/^-wdd$//s) {
+		    push @ropts, $&;
+		    $cleanmode = 'dpkg-source-d';
+		} elsif (s/^-wc$//s) {
+		    push @ropts, $&;
+		    $cleanmode = 'check';
 		} else {
 		    badusage "unknown short option \`$_'";
 		}