X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=bbfaea1ec6fe326a3f8f0a6022bc06453b607c55;hp=ebf44de800ed399aa56644928f01461c9694d67a;hb=11c8c965c3419fddf2444a7497b45b65f05d3db5;hpb=4eee70a2b1710c1a8fc71fbd3cdc7064682a799c

diff --git a/dgit b/dgit
index ebf44de8..bbfaea1e 100755
--- a/dgit
+++ b/dgit
@@ -561,11 +561,6 @@ sub runcmd_ordryrun_local {
     }
 }
 
-sub shell_cmd {
-    my ($first_shell, @cmd) = @_;
-    return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
-}
-
 our $helpmsg = <<END;
 main usages:
   dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
@@ -622,6 +617,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit.dsc-url-proto-ok.http'    => 'true',
 	       'dgit.dsc-url-proto-ok.https'   => 'true',
 	       'dgit.dsc-url-proto-ok.git'     => 'true',
+	       'dgit.vcs-git.suites',          => 'sid', # ;-separated
 	       'dgit.default.dsc-url-proto-ok' => 'false',
 	       # old means "repo server accepts pushes with old dgit tags"
 	       # new means "repo server accepts pushes with new dgit tags"
@@ -2762,6 +2758,11 @@ END
 	    my $want = $wantr{$rrefname};
 	    next if $got eq $want;
 	    if (!defined $objgot{$want}) {
+		fail <<END unless act_local();
+--dry-run specified but we actually wanted the results of git fetch,
+so this is not going to work.  Try running dgit fetch first,
+or using --damp-run instead of --dry-run.
+END
 		print STDERR <<END;
 warning: git ls-remote suggests we want $lrefname
 warning:  and it should refer to $want
@@ -2850,15 +2851,14 @@ sub mergeinfo_version ($) {
 
 sub fetch_from_archive_record_1 ($) {
     my ($hash) = @_;
-    runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
-	    'DGIT_ARCHIVE', $hash;
+    runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
     cmdoutput @git, qw(log -n2), $hash;
     # ... gives git a chance to complain if our commit is malformed
 }
 
 sub fetch_from_archive_record_2 ($) {
     my ($hash) = @_;
-    my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
+    my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
     if (act_local()) {
 	cmdoutput @upd_cmd;
     } else {
@@ -3393,38 +3393,57 @@ sub open_main_gitattrs () {
     return $gai;
 }
 
+our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
+
 sub is_gitattrs_setup () {
+    # return values:
+    #  trueish
+    #     1: gitattributes set up and should be left alone
+    #  falseish
+    #     0: there is a dgit-defuse-attrs but it needs fixing
+    #     undef: there is none
     my $gai = open_main_gitattrs();
     return 0 unless $gai;
     while (<$gai>) {
-	return 1 if m{^\[attr\]dgit-defuse-attrs\s};
+	next unless m{$gitattrs_ourmacro_re};
+	return 1 if m{\s-working-tree-encoding\s};
+	printdebug "is_gitattrs_setup: found old macro\n";
+	return 0;
     }
     $gai->error and die $!;
-    return 0;
+    printdebug "is_gitattrs_setup: found nothing\n";
+    return undef;
 }    
 
 sub setup_gitattrs (;$) {
     my ($always) = @_;
     return unless $always || access_cfg_bool(1, 'setup-gitattributes');
 
-    if (is_gitattrs_setup()) {
+    my $already = is_gitattrs_setup();
+    if ($already) {
 	progress <<END;
-[attr]dgit-defuse-attrs already found in .git/info/attributes
+[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
  not doing further gitattributes setup
 END
 	return;
     }
+    my $new = "[attr]dgit-defuse-attrs	$negate_harmful_gitattrs";
     my $af = "$maindir_gitcommon/info/attributes";
     ensuredir "$maindir_gitcommon/info";
+
     open GAO, "> $af.new" or die $!;
-    print GAO <<END or die $!;
+    print GAO <<END or die $! unless defined $already;
 *	dgit-defuse-attrs
-[attr]dgit-defuse-attrs	$negate_harmful_gitattrs
+$new
 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
 END
     my $gai = open_main_gitattrs();
     if ($gai) {
 	while (<$gai>) {
+	    if (m{$gitattrs_ourmacro_re}) {
+		die unless defined $already;
+		$_ = $new;
+	    }
 	    chomp;
 	    print GAO $_, "\n" or die $!;
 	}
@@ -3459,7 +3478,7 @@ sub check_gitattrs ($$) {
 	# oh dear, found one
 	print STDERR <<END;
 dgit: warning: $what contains .gitattributes
-dgit: .gitattributes have not been defused.  Recommended: dgit setup-new-tree.
+dgit: .gitattributes not (fully) defused.  Recommended: dgit setup-new-tree.
 END
 	close $gafl;
 	return;
@@ -3702,6 +3721,20 @@ sub fetch () {
 	git_fetch_us();
     }
     fetch_from_archive() or no_such_package();
+    
+    my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
+    if (length $vcsgiturl and
+	(grep { $csuite eq $_ }
+	 split /\;/,
+	 cfg 'dgit.vcs-git.suites')) {
+	my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
+	if (defined $current && $current ne $vcsgiturl) {
+	    print STDERR <<END;
+FYI: Vcs-Git in $csuite has different url to your vcs-git remote.
+ Your vcs-git remote url may be out of date.  Use dgit update-vcs-git ?
+END
+	}
+    }
     printdone "fetched into ".lrref();
 }
 
@@ -3746,7 +3779,7 @@ sub commit_quilty_patch () {
     my %adds;
     foreach my $l (split /\n/, $output) {
 	next unless $l =~ m/\S/;
-	if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
+	if ($l =~ m{^(?:\?\?| [MADRC]) (.pc|debian/patches)}) {
 	    $adds{$1}++;
 	}
     }
@@ -3816,7 +3849,7 @@ sub maybe_split_brain_save ($$$) {
     # => message fragment "$saved" describing disposition of $dgitview
     return "commit id $dgitview" unless defined $split_brain_save;
     my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
-	       @git, qw(update-ref -m),
+	       git_update_ref_cmd
 	       "dgit --dgit-view-save $msg HEAD=$headref",
 	       $split_brain_save, $dgitview);
     runcmd @cmd;
@@ -4016,7 +4049,7 @@ sub plain_overwrite_pseudomerge ($$$) {
 	$clogp, $head, $archive_hash, $i_arch_v,
 	"dgit", $m;
 
-    runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
+    runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
 
     progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
     return $r;
@@ -4282,7 +4315,8 @@ END
 	}
     }
 
-    if (defined $overwrite_version && !defined $maintviewhead) {
+    if (defined $overwrite_version && !defined $maintviewhead
+	&& $archive_hash) {
 	$dgithead = plain_overwrite_pseudomerge($clogp,
 						$dgithead,
 						$archive_hash);
@@ -4461,7 +4495,7 @@ END
 
     runcmd_ordryrun @git,
 	qw(-c push.followTags=false push), access_giturl(), @pushrefs;
-    runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
+    runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
 
     supplementary_message(<<'END');
 Push failed, while obtaining signatures on the .changes and .dsc.
@@ -4601,6 +4635,53 @@ END
     pull();
 }
 
+sub cmd_update_vcs_git () {
+    my $specsuite;
+    if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
+	($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
+    } else {
+	($specsuite) = (@ARGV);
+	shift @ARGV;
+    }
+    my $dofetch=1;
+    if (@ARGV) {
+	if ($ARGV[0] eq '-') {
+	    $dofetch = 0;
+	} elsif ($ARGV[0] eq '-') {
+	    shift;
+	}
+    }
+
+    my $sourcep = parsecontrol 'debian/control', 'debian/control';
+    $package = getfield $sourcep, 'Source';
+    my $ctrl;
+    if ($specsuite eq '.') {
+	$ctrl = $sourcep;
+    } else {
+	$isuite = $specsuite;
+	get_archive_dsc();
+	$ctrl = $dsc;
+    }
+    my $url = getfield $ctrl, 'Vcs-Git';
+
+    my @cmd;
+    my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
+    if (!defined $orgurl) {
+	print STDERR "setting up vcs-git: $url\n";
+	@cmd = (@git, qw(remote add vcs-git), $url);
+    } elsif ($orgurl eq $url) {
+	print STDERR "vcs git already configured: $url\n";
+    } else {
+	print STDERR "changing vcs-git url to: $url\n";
+	@cmd = (@git, qw(remote set-url vcs-git), $url);
+    }
+    runcmd_ordryrun_local @cmd;
+    if ($dofetch) {
+	print "fetching (@ARGV)\n";
+	runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
+    }
+}
+
 sub prep_push () {
     parseopts();
     build_or_push_prep_early();
@@ -5048,13 +5129,15 @@ sub quiltify_splitbrain_needed () {
     }
 }
 
-sub quiltify_splitbrain ($$$$$$) {
-    my ($clogp, $unapplied, $headref, $diffbits,
+sub quiltify_splitbrain ($$$$$$$) {
+    my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
 	$editedignores, $cachekey) = @_;
+    my $gitignore_special = 1;
     if ($quilt_mode !~ m/gbp|dpm/) {
 	# treat .gitignore just like any other upstream file
 	$diffbits = { %$diffbits };
 	$_ = !!$_ foreach values %$diffbits;
+	$gitignore_special = 0;
     }
     # We would like any commits we generate to be reproducible
     my @authline = clogp_authline($clogp);
@@ -5065,11 +5148,19 @@ sub quiltify_splitbrain ($$$$$$) {
     local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
     local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
+    my $fulldiffhint = sub {
+	my ($x,$y) = @_;
+	my $cmd = "git diff $x $y -- :/ ':!debian'";
+	$cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
+	return "\nFor full diff showing the problem(s), type:\n $cmd\n";
+    };
+
     if ($quilt_mode =~ m/gbp|unapplied/ &&
 	($diffbits->{O2H} & 01)) {
 	my $msg =
  "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
  " but git tree differs from orig in upstream files.";
+	$msg .= $fulldiffhint->($unapplied, 'HEAD');
 	if (!stat_exists "debian/patches") {
 	    $msg .=
  "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
@@ -5078,7 +5169,7 @@ sub quiltify_splitbrain ($$$$$$) {
     }
     if ($quilt_mode =~ m/dpm/ &&
 	($diffbits->{H2A} & 01)) {
-	fail <<END;
+	fail <<END. $fulldiffhint->($oldtiptree,'HEAD');
 --quilt=$quilt_mode specified, implying patches-applied git tree
  but git tree differs from result of applying debian/patches to upstream
 END
@@ -5094,7 +5185,7 @@ END
     }
     if ($quilt_mode =~ m/gbp|dpm/ &&
 	($diffbits->{O2A} & 02)) {
-	fail <<END
+	fail <<END;
 --quilt=$quilt_mode specified, implying that HEAD is for use with a
  tool which does not create patches for changes to upstream
  .gitignores: but, such patches exist in debian/patches.
@@ -5302,7 +5393,7 @@ sub quiltify ($$$$) {
 	    return $s;
 	};
 	if ($quilt_mode eq 'linear') {
-	    print STDERR "$us: quilt fixup cannot be linear.  Stopped at:\n";
+	    print STDERR "\n$us: error: quilt fixup cannot be linear.  Stopped at:\n";
 	    foreach my $notp (@nots) {
 		print STDERR "$us:  ", $reportnot->($notp), "\n";
 	    }
@@ -5477,8 +5568,9 @@ END
 		      make-patches --quiet-would-amend));
 	# We tolerate soe snags that gdr wouldn't, by default.
 	if (act_local()) {
+	    debugcmd "+",@cmd;
 	    $!=0; $?=-1;
-	    failedcmd @cmd if system @cmd and $?!=7;
+	    failedcmd @cmd if system @cmd and $?!=7*256;
 	} else {
 	    dryrun_report @cmd;
 	}
@@ -5862,7 +5954,7 @@ END
         " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
 
     if (quiltmode_splitbrain()) {
-	quiltify_splitbrain($clogp, $unapplied, $headref,
+	quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
                             $diffbits, \%editedignores,
 			    $splitbrain_cachekey);
 	return;
@@ -6004,13 +6096,21 @@ sub changesopts_initial () {
 
 sub changesopts_version () {
     if (!defined $changes_since_version) {
-	my @vsns = archive_query('archive_query');
-	my @quirk = access_quirk();
-	if ($quirk[0] eq 'backports') {
-	    local $isuite = $quirk[2];
-	    local $csuite;
-	    canonicalise_suite();
-	    push @vsns, archive_query('archive_query');
+	my @vsns;
+	unless (eval {
+	    @vsns = archive_query('archive_query');
+	    my @quirk = access_quirk();
+	    if ($quirk[0] eq 'backports') {
+		local $isuite = $quirk[2];
+		local $csuite;
+		canonicalise_suite();
+		push @vsns, archive_query('archive_query');
+	    }
+	    1;
+	}) {
+	    print STDERR $@;
+	    fail
+ "archive query failed (queried because --since-version not specified)";
 	}
 	if (@vsns) {
 	    @vsns = map { $_->[0] } @vsns;
@@ -6336,7 +6436,7 @@ sub cmd_quilt_fixup {
 
 sub import_dsc_result {
     my ($dstref, $newhash, $what_log, $what_msg) = @_;
-    my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
+    my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
     runcmd @cmd;
     check_gitattrs($newhash, "source tree");