X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=5bd39e70a84b92086d35041c0f4c4fd64ddb75f7;hp=13819cd05e10d1cdc4cf35dbf88322a0bce31e0a;hb=230275261f3bdec17bcd08c7005e4065355b0277;hpb=155b54307583051d4dc2924d14b286e4e189e276

diff --git a/dgit b/dgit
index 13819cd0..5bd39e70 100755
--- a/dgit
+++ b/dgit
@@ -2,7 +2,7 @@
 # dgit
 # Integration between git and Debian-style archives
 #
-# Copyright (C)2013-2015 Ian Jackson
+# Copyright (C)2013-2016 Ian Jackson
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -600,36 +600,49 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
                );
 
-our %gitcfg;
+our %gitcfgs;
+our @gitcfgsources = qw(cmdline local global system);
 
 sub git_slurp_config () {
     local ($debuglevel) = $debuglevel-2;
     local $/="\0";
 
-    my @cmd = (@git, qw(config -z --get-regexp .*));
-    debugcmd "|",@cmd;
-
-    open GITS, "-|", @cmd or die $!;
-    while (<GITS>) {
-	chomp or die;
-	printdebug "=> ", (messagequote $_), "\n";
-	m/\n/ or die "$_ ?";
-	push @{ $gitcfg{$`} }, $'; #';
+    # This algoritm is a bit subtle, but this is needed so that for
+    # options which we want to be single-valued, we allow the
+    # different config sources to override properly.  See #835858.
+    foreach my $src (@gitcfgsources) {
+	next if $src eq 'cmdline';
+	# we do this ourselves since git doesn't handle it
+	
+	my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
+	debugcmd "|",@cmd;
+
+	open GITS, "-|", @cmd or die $!;
+	while (<GITS>) {
+	    chomp or die;
+	    printdebug "=> ", (messagequote $_), "\n";
+	    m/\n/ or die "$_ ?";
+	    push @{ $gitcfgs{$src}{$`} }, $'; #';
+	}
+	$!=0; $?=0;
+	close GITS
+	    or ($!==0 && $?==256)
+	    or failedcmd @cmd;
     }
-    $!=0; $?=0;
-    close GITS
-	or ($!==0 && $?==256)
-	or failedcmd @cmd;
 }
 
 sub git_get_config ($) {
     my ($c) = @_;
-    my $l = $gitcfg{$c};
-    printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
-	if $debuglevel >= 4;
-    $l or return undef;
-    @$l==1 or badcfg "multiple values for $c" if @$l > 1;
-    return $l->[0];
+    foreach my $src (@gitcfgsources) {
+	my $l = $gitcfgs{$src}{$c};
+	printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+	    if $debuglevel >= 4;
+	$l or next;
+	@$l==1 or badcfg "multiple values for $c".
+	    " (in $src git config)" if @$l > 1;
+	return $l->[0];
+    }
+    return undef;
 }
 
 sub cfg {
@@ -3198,17 +3211,20 @@ END
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     check_for_vendor_patches() if madformat($dsc->{format});
     changedir '../../../..';
-    my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
-    my @diffcmd = (@git, qw(diff), $diffopt, $tree, $dgithead);
+    my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
     debugcmd "+",@diffcmd;
     $!=0; $?=-1;
     my $r = system @diffcmd;
     if ($r) {
 	if ($r==256) {
-	    fail "$dscfn specifies a different tree to your HEAD commit;".
-		" perhaps you forgot to build".
-		($diffopt eq '--exit-code' ? "" :
-		 " (run with -D to see full diff output)");
+	    my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
+	    fail <<END
+HEAD specifies a different tree to $dscfn:
+$diffs
+Perhaps you forgot to build.  Or perhaps there is a problem with your
+ source tree (see dgit(7) for some hints).  To see a full diff, run
+   git diff $tree HEAD
+END
 	} else {
 	    failedcmd @diffcmd;
 	}
@@ -3368,7 +3384,7 @@ sub cmd_clone {
 	    }
 	    if (stat $dstdir) {
 		rmtree($dstdir) or die "remove $dstdir: $!\n";
-	    } elsif (!grep { $! == $_ }
+	    } elsif (grep { $! == $_ }
 		     (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
 	    } else {
 		print STDERR "check whether to remove $dstdir: $!\n";
@@ -3734,22 +3750,51 @@ END
     }
 }
 
-sub quiltify_trees_differ ($$;$$) {
-    my ($x,$y,$finegrained,$ignorenamesr) = @_;
+sub quiltify_trees_differ ($$;$$$) {
+    my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
     # returns true iff the two tree objects differ other than in debian/
     # with $finegrained,
     # returns bitmask 01 - differ in upstream files except .gitignore
     #                 02 - differ in .gitignore
     # if $ignorenamesr is defined, $ingorenamesr->{$fn}
     #  is set for each modified .gitignore filename $fn
+    # if $unrepres is defined, array ref to which is appeneded
+    #  a list of unrepresentable changes (removals of upstream files
+    #  (as messages)
     local $/=undef;
-    my @cmd = (@git, qw(diff-tree --name-only -z));
-    push @cmd, qw(-r) if $finegrained;
+    my @cmd = (@git, qw(diff-tree -z));
+    push @cmd, qw(--name-only) unless $unrepres;
+    push @cmd, qw(-r) if $finegrained || $unrepres;
     push @cmd, $x, $y;
     my $diffs= cmdoutput @cmd;
     my $r = 0;
+    my @lmodes;
     foreach my $f (split /\0/, $diffs) {
+	if ($unrepres && !@lmodes) {
+	    @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
+	    next;
+	}
+	my ($oldmode,$newmode) = @lmodes;
+	@lmodes = ();
+
 	next if $f =~ m#^debian(?:/.*)?$#s;
+
+	if ($unrepres) {
+	    eval {
+	        die "deleted\n" unless $newmode =~ m/[^0]/;
+		die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
+		if ($oldmode =~ m/[^0]/) {
+		    die "mode changed\n" if $oldmode ne $newmode;
+		} else {
+		    die "non-default mode\n" unless $newmode =~ m/^100644$/;
+		}
+	    };
+	    if ($@) {
+		local $/="\n"; chomp $@;
+		push @$unrepres, [ $f, $@ ];
+	    }
+	}
+
 	my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
 	$r |= $isignore ? 02 : 01;
 	$ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
@@ -4101,6 +4146,16 @@ sub quiltify ($$$$) {
 	if (!defined $patchname) {
 	    $patchname = $title;
 	    $patchname =~ s/[.:]$//;
+            use Text::Iconv;
+	    eval {
+		my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
+		my $translitname = $converter->convert($patchname);
+		die unless defined $translitname;
+		$patchname = $translitname;
+	    };
+	    print STDERR
+		"dgit: patch title transliteration error: $@"
+		if $@;
 	    $patchname =~ y/ A-Z/-a-z/;
 	    $patchname =~ y/-a-z0-9_.+=~//cd;
 	    $patchname =~ s/^\W/x-$&/;
@@ -4493,11 +4548,13 @@ END
     # be.  This is mostly for error reporting.
 
     my %editedignores;
+    my @unrepres;
     my $diffbits = {
         # H = user's HEAD
         # O = orig, without patches applied
         # A = "applied", ie orig with H's debian/patches applied
-        O2H => quiltify_trees_differ($unapplied,$headref,   1,\%editedignores),
+        O2H => quiltify_trees_differ($unapplied,$headref,   1,
+				     \%editedignores, \@unrepres),
         H2A => quiltify_trees_differ($headref,  $oldtiptree,1),
         O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
     };
@@ -4519,6 +4576,14 @@ END
                              $dl[0], $dl[1],              $dl[3], $dl[4],
                                  $dl[2],                     $dl[5];
 
+    if (@unrepres) {
+	print STDERR "dgit:  cannot represent change: $_->[1]: $_->[0]\n"
+	    foreach @unrepres;
+	fail <<END;
+HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
+END
+    }
+
     my @failsuggestion;
     if (!($diffbits->{O2H} & $diffbits->{O2A})) {
         push @failsuggestion, "This might be a patches-unapplied branch.";
@@ -4983,8 +5048,6 @@ defvalopt '--build-products-dir','','.*',     \$buildproductsdir;
 defvalopt '--clean',       '', $cleanmode_re, \$cleanmode;
 defvalopt '--quilt',     '', $quilt_modes_re, \$quilt_mode;
 
-defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
-
 defvalopt '', '-C', '.+', sub {
     ($changesfile) = (@_);
     if ($changesfile =~ s#^(.*)/##) {
@@ -5135,6 +5198,12 @@ sub parseopts () {
 		} elsif (s/^-wc$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'check';
+		} elsif (s/^-c([^=]*)\=(.*)$//s) {
+		    push @git, '-c', $&;
+		    $gitcfgs{cmdline}{$1} = [ $2 ];
+		} elsif (s/^-c([^=]+)$//s) {
+		    push @git, '-c', $&;
+		    $gitcfgs{cmdline}{$1} = [ 'true' ];
 		} elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
 		    $val = $'; #';
 		    $val = undef unless length $val;
@@ -5160,16 +5229,18 @@ sub finalise_opts_opts () {
 	}
 
 	foreach my $c (access_cfg_cfgs("opts-$k")) {
-	    my $vl = $gitcfg{$c};
-	    printdebug "CL $c ",
-	        ($vl ? join " ", map { shellquote } @$vl : ""),
+	    my @vl =
+		map { $_ ? @$_ : () }
+		map { $gitcfgs{$_}{$c} }
+		reverse @gitcfgsources;
+	    printdebug "CL $c ", (join " ", map { shellquote } @vl),
 	        "\n" if $debuglevel >= 4;
-	    next unless $vl;
+	    next unless @vl;
 	    badcfg "cannot configure options for $k"
 		if $opts_opt_cmdonly{$k};
 	    my $insertpos = $opts_cfg_insertpos{$k};
 	    @$om = ( @$om[0..$insertpos-1],
-		     @$vl,
+		     @vl,
 		     @$om[$insertpos..$#$om] );
 	}
     }