X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=87a038009a006ad1feaa5d28b7721caa122f7959;hb=3b8d3ae177321d340de16b1dced5c9d262e56f72;hp=3c311400afeaec6ef64dccc64cbc5a4129e59c66;hpb=1c920a62c188ff676127973a548855fa7b02841c;p=dgit.git

diff --git a/dgit b/dgit
index 3c311400..87a03800 100755
--- a/dgit
+++ b/dgit
@@ -102,6 +102,7 @@ our $remotename = 'dgit';
 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
 our $branchprefix = 'dgit';
 our $csuite;
+our $instead_distro;
 
 sub lbranch () { return "$branchprefix/$csuite"; }
 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
@@ -519,9 +520,15 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit.default.archive-query' => 'madison:',
 	       'dgit.default.sshpsql-dbname' => 'service=projectb',
 	       'dgit-distro.debian.archive-query' => 'sshpsql:',
-	       'dgit-distro.debian.git-host' => 'git.debian.org',
+	       'dgit-distro.debian.git-host' => 'dgit-git.debian.net',
+	       'dgit-distro.debian.git-user-force' => 'dgit',
 	       'dgit-distro.debian.git-proto' => 'git+ssh://',
-	       'dgit-distro.debian.git-path' => '/git/dgit-repos/repos',
+	       'dgit-distro.debian.git-path' => '/dgit/debian/repos',
+	       'dgit-distro.debian.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://',
+	       'dgit-distro.debian/alioth.git-path' => '/git/dgit-repos/repos',
 	       'dgit-distro.debian.git-check' => 'ssh-cmd',
 	       'dgit-distro.debian.git-create' => 'ssh-cmd',
 	       'dgit-distro.debian.sshpsql-host' => 'mirror.ftp-master.debian.org',
@@ -595,15 +602,16 @@ sub access_distros () {
     # Returns list of distros to try, in order
     #
     # We want to try:
+    #    0. `instead of' distro name(s) we have been pointed to
     #    1. the access_quirk distro, if any
     #    2a. the user's specified distro, or failing that  } basedistro
     #    2b. the distro calculated from the suite          }
     my @l = access_basedistro();
 
     my (undef,$quirkdistro) = access_quirk();
-    unshift @l, $quirkdistro if defined $quirkdistro;
-
-    return @l;
+    unshift @l, $quirkdistro;
+    unshift @l, $instead_distro;
+    return grep { defined } @l;
 }
 
 sub access_cfg (@) {
@@ -655,9 +663,16 @@ sub access_cfg_ssh () {
     }
 }
 
+sub access_runeinfo ($) {
+    my ($info) = @_;
+    return ": dgit ".access_basedistro()." $info ;";
+}
+
 sub access_someuserhost ($) {
     my ($some) = @_;
-    my $user = access_cfg("$some-user",'username');
+    my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
+    defined($user) && length($user) or
+	$user = access_cfg("$some-user",'username');
     my $host = access_cfg("$some-host");
     return length($user) ? "$user\@$host" : $host;
 }
@@ -819,8 +834,8 @@ sub canonicalise_suite_madison {
     return $r[0][2];
 }
 
-sub sshpsql ($$) {
-    my ($data,$sql) = @_;
+sub sshpsql ($$$) {
+    my ($data,$runeinfo,$sql) = @_;
     if (!length $data) {
 	$data= access_someuserhost('sshpsql').':'.
 	    access_cfg('sshpsql-dbname');
@@ -829,7 +844,9 @@ sub sshpsql ($$) {
     my ($userhost,$dbname) = ($`,$'); #';
     my @rows;
     my @cmd = (access_cfg_ssh, $userhost,
-	       "export LANG=C; ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
+	       access_runeinfo("ssh-psql $runeinfo").
+	       " export LANG=C;".
+	       " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
     printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
     open P, "-|", @cmd or die $!;
     while (<P>) {
@@ -849,13 +866,13 @@ sub sshpsql ($$) {
 }
 
 sub sql_injection_check {
-    foreach (@_) { die "$_ $& ?" if m/[']/; }
+    foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
 }
 
 sub archive_query_sshpsql ($$) {
     my ($proto,$data) = @_;
     sql_injection_check $isuite, $package;
-    my @rows = sshpsql($data, <<END);
+    my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
         SELECT source.version, component.name, files.filename, files.sha256sum
           FROM source
           JOIN src_associations ON source.id = src_associations.source
@@ -880,7 +897,7 @@ END
 sub canonicalise_suite_sshpsql ($$) {
     my ($proto,$data) = @_;
     sql_injection_check $isuite;
-    my @rows = sshpsql($data, <<END);
+    my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
         SELECT suite.codename
           FROM suite where suite_name='$isuite' or codename='$isuite';
 END
@@ -969,15 +986,25 @@ sub get_archive_dsc () {
     $dsc = undef;
 }
 
+sub check_for_git ();
 sub check_for_git () {
     # returns 0 or 1
     my $how = access_cfg('git-check');
     if ($how eq 'ssh-cmd') {
 	my @cmd =
 	    (access_cfg_ssh, access_gituserhost(),
+	     access_runeinfo("git-check $package").
 	     " set -e; cd ".access_cfg('git-path').";".
 	     " if test -d $package.git; then echo 1; else echo 0; fi");
 	my $r= cmdoutput @cmd;
+	if ($r =~ m/^divert (\w+)$/) {
+	    my $divert=$1;
+	    my ($usedistro,) = access_distros();
+	    $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
+	    $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
+	    printdebug "diverting $divert so using distro $instead_distro\n";
+	    return check_for_git();
+	}
 	failedcmd @cmd unless $r =~ m/^[01]$/;
 	return $r+0;
     } elsif ($how eq 'true') {
@@ -994,6 +1021,7 @@ sub create_remote_git_repo () {
     if ($how eq 'ssh-cmd') {
 	runcmd_ordryrun
 	    (access_cfg_ssh, access_gituserhost(),
+	     access_runeinfo("git-create $package").
 	     "set -e; cd ".access_cfg('git-path').";".
 	     " cp -a _template $package.git");
     } elsif ($how eq 'true') {
@@ -1355,6 +1383,7 @@ sub clone ($) {
     my ($dstdir) = @_;
     canonicalise_suite();
     badusage "dry run makes no sense with clone" unless act_local();
+    my $hasgit = check_for_git();
     mkdir $dstdir or die "$dstdir $!";
     changedir $dstdir;
     runcmd @git, qw(init -q);
@@ -1366,7 +1395,7 @@ sub clone ($) {
 	close H or die $!;
 	runcmd @git, qw(remote add), 'origin', $giturl;
     }
-    if (check_for_git()) {
+    if ($hasgit) {
 	progress "fetching existing git history";
 	git_fetch_us();
 	runcmd_ordryrun_local @git, qw(fetch origin);
@@ -2002,6 +2031,38 @@ our $dscfn;
 
 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
 
+sub quiltify ($$) {
+    my ($clogp,$headref) = @_;
+
+    my $author = getfield $clogp, 'Maintainer';
+    my $time = time;
+    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;
+    $msg =~ s/^\s+$/ ./mg;
+    print O <<END or die $!;
+Description: Automatically generated patch ($clogp->{Version})
+ Last (up to) $ncommits git changes, FYI:
+ .
+ $msg
+Author: $author
+
+---
+
+END
+    close O or die $!;
+    {
+	local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
+	local $ENV{'VISUAL'} = $ENV{'EDITOR'};
+	local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
+	runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
+    }
+}
+
 sub build_maybe_quilt_fixup () {
     my $format=get_source_format;
     return unless madformat $format;
@@ -2120,33 +2181,7 @@ END
         rename '../fake/.pc','.pc' or die $!;
     }
 
-    my $author = getfield $clogp, 'Maintainer';
-    my $time = time;
-    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;
-    $msg =~ s/^\s+$/ ./mg;
-    print O <<END or die $!;
-Description: Automatically generated patch ($clogp->{Version})
- Last (up to) $ncommits git changes, FYI:
- .
- $msg
-Author: $author
-
----
-
-END
-    close O or die $!;
-    {
-	local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
-	local $ENV{'VISUAL'} = $ENV{'EDITOR'};
-	local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
-	runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
-    }
+    quiltify($clogp,$headref);
 
     if (!open P, '>>', ".pc/applied-patches") {
 	$!==&ENOENT or die $!;