quiltify_dpkg_commit: Improve

[dgit.git] / dgit

diff --git a/dgit b/dgit
index af710657502fc822ac6a04e64e68329941890840..af9576670a3fa219e8d991e6b16872510c3fd2f6 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -163,7 +163,10 @@ sub waitstatusmsg () {
 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
 
 sub fail { 
-    die $us.($we_are_responder ? " (build host)" : "").": @_\n";
+    my $s = "@_\n";
+    my $prefix = $us.($we_are_responder ? " (build host)" : "").": ";
+    $s =~ s/^/$prefix/gm;
+    die $s;
 }
 
 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
@@ -520,9 +523,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',
@@ -664,7 +673,9 @@ sub access_runeinfo ($) {
 
 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;
 }
@@ -1039,6 +1050,12 @@ sub mktree_in_ud_here () {
     symlink '../../../../objects','.git/objects' or die $!;
 }
 
+sub git_write_tree () {
+    my $tree = cmdoutput @git, qw(write-tree);
+    $tree =~ m/^\w+$/ or die "$tree ?";
+    return $tree;
+}
+
 sub mktree_in_ud_from_only_subdir () {
     # changes into the subdir
     my (@dirs) = <*/.>;
@@ -1053,8 +1070,7 @@ sub mktree_in_ud_from_only_subdir () {
        rmtree '.pc';
     }
     runcmd @git, qw(add -Af);
-    my $tree = cmdoutput @git, qw(write-tree);
-    $tree =~ m/^\w+$/ or die "$tree ?";
+    my $tree=git_write_tree();
     return ($tree,$dir);
 }
 
@@ -1375,6 +1391,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);
@@ -1386,7 +1403,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);
@@ -2022,6 +2039,46 @@ our $dscfn;
 
 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
 
+sub quiltify_dpkg_commit ($$$;$) {
+    my ($patchname,$author,$msg, $xinfo) = @_;
+    $xinfo //= '';
+
+    mkpath '.git/dgit';
+    my $descfn = ".git/dgit/quilt-description.tmp";
+    open O, '>', $descfn or die "$descfn: $!";
+    $msg =~ s/\s+$//g;
+    $msg =~ s/\n/\n /g;
+    $msg =~ s/^\s+$/ ./mg;
+    print O <<END or die $!;
+Description: $msg
+Author: $author
+$xinfo
+---
+
+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 quiltify ($$) {
+    my ($clogp,$headref) = @_;
+
+    my $time = time;
+    my $ncommits = 3;
+    my $msg = cmdoutput @git, qw(log), "-n$ncommits";
+
+    quiltify_dpkg_commit "auto-$version-$headref-$time",
+        (getfield $clogp, 'Maintainer'),
+        "Automatically generated patch ($clogp->{Version})\n".
+        "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
+}
+
 sub build_maybe_quilt_fixup () {
     my $format=get_source_format;
     return unless madformat $format;
@@ -2140,33 +2197,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 $!;