X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=455b375e96e13a7c0f790514e8169fe75ab39490;hb=411fe55e96c646557ec19614888658a6cea693b4;hp=9763bbfd6c99fce35d768559fec144416f1dc710;hpb=1ca959f4e5d5452052ca2abb7dfaf29c958f43c7;p=dgit.git

diff --git a/dgit b/dgit
index 9763bbfd..455b375e 100755
--- a/dgit
+++ b/dgit
@@ -86,7 +86,7 @@ our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
 our (@dpkggenchanges) = qw(dpkg-genchanges);
 our (@mergechanges) = qw(mergechanges -f);
-our (@gbppq) = qw(gbp-pq);
+our (@gbp) = qw(gbp);
 our (@changesopts) = ('');
 
 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
@@ -2578,14 +2578,25 @@ sub quiltify_splitbrain ($$$$$$) {
     local $ENV{GIT_COMMITTER_NAME} =  $authline[0];
     local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
     local $ENV{GIT_COMMITTER_DATE} =  $authline[2];
+	
     if ($quilt_mode =~ m/gbp|unapplied/ &&
-	($diffbits->{O2A} & 01) && # some patches
-	!($diffbits->{H2O} & 01)) { # but HEAD is like orig
+	($diffbits->{H2O} & 01)) {
+	my $msg =
+ "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
+ " but git tree differs from orig in upstream files.";
+	if (!stat_exists "debian/patches") {
+	    $msg .=
+ "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
+	}  
+	fail $msg;
+    }
+    if ($quilt_mode =~ m/gbp|unapplied/ &&
+	($diffbits->{O2A} & 01)) { # some patches
 	quiltify_splitbrain_needed();
-	progress "creating patches-applied version using gbp-pq";
+	progress "creating patches-applied version using gbp pq";
 	open STDOUT, ">/dev/null" or die $!;
-	runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
-	# gbp-pq import creates a fresh branch; push back to dgit-view
+	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+	# gbp pq import creates a fresh branch; push back to dgit-view
 	runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
 	runcmd @git, qw(checkout -q dgit-view);
     }
@@ -3052,6 +3063,7 @@ END
 	# we look for an entry whose message is the key for the cache lookup
 	my @cachekey = (qw(dgit), $our_version);
 	push @cachekey, $upstreamversion;
+	push @cachekey, $quilt_mode;
 	push @cachekey, $headref;
 
 	push @cachekey, hashfile('fake.dsc');
@@ -3356,11 +3368,13 @@ sub massage_dbp_args ($;$) {
 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
     my $r = 0;
     if ($need_split_build_invocation) {
+	printdebug "massage split $dmode.\n";
 	$r = $dmode =~ m/[S]/     ? +2 :
 	     $dmode =~ y/gGF/ABb/ ? +1 :
 	     $dmode =~ m/[ABb]/   ?  0 :
 	     die "$dmode ?";
     }
+    printdebug "massage done $r $dmode.\n";
     push @$cmd, $dmode;
 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
     return $r;
@@ -3442,11 +3456,29 @@ sub build_source {
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
 	    changesopts();
     } else {
-	my $pwd = must_getcwd();
-	my $leafdir = basename $pwd;
-	changedir "..";
-	runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
-	changedir $pwd;
+	my @cmd = (@dpkgsource, qw(-b --));
+	if ($split_brain) {
+	    changedir $ud;
+	    runcmd_ordryrun_local @cmd, "work";
+	    my @udfiles = <${package}_*>;
+	    changedir "../../..";
+	    foreach my $f (@udfiles) {
+		printdebug "source copy, found $f\n";
+		next unless
+		    $f eq $dscfn or
+		    ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
+		     $f eq srcfn($version, $&));
+		printdebug "source copy, found $f - renaming\n";
+		rename "$ud/$f", "../$f" or $!==ENOENT
+		    or fail "put in place new source file ($f): $!";
+	    }
+	} else {
+	    my $pwd = must_getcwd();
+	    my $leafdir = basename $pwd;
+	    changedir "..";
+	    runcmd_ordryrun_local @cmd, $leafdir;
+	    changedir $pwd;
+	}
 	runcmd_ordryrun_local qw(sh -ec),
 	    'exec >$1; shift; exec "$@"','x',
 	    "../$sourcechanges",