X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=5c9cdc3e2a8d24819199c69d4f61b4735a18d78f;hb=866feb162b8f7e84039ed80e206c0df0def5f6c5;hp=4535d8c3e67e5eab5e23cc493240ae7db0d17921;hpb=630bf678ac46457cb33f8f15ab4cdeed3c64ebe1;p=dgit.git

diff --git a/dgit b/dgit
index 4535d8c3..5c9cdc3e 100755
--- a/dgit
+++ b/dgit
@@ -617,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"
@@ -2757,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
@@ -3716,6 +3722,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();
 }
 
@@ -4296,7 +4316,8 @@ END
 	}
     }
 
-    if (defined $overwrite_version && !defined $maintviewhead) {
+    if (defined $overwrite_version && !defined $maintviewhead
+	&& $archive_hash) {
 	$dgithead = plain_overwrite_pseudomerge($clogp,
 						$dgithead,
 						$archive_hash);
@@ -4615,6 +4636,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();
@@ -5065,10 +5133,12 @@ sub quiltify_splitbrain_needed () {
 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);
@@ -5079,11 +5149,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?";
@@ -5092,7 +5170,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
@@ -5108,7 +5186,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.
@@ -5316,7 +5394,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";
 	    }
@@ -5491,8 +5569,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;
 	}