X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=97274e9e6890a98d3fe223438b6eca1a16381c74;hp=1477d1725ac6d3ed09384f2cd0b901173ad890ce;hb=64e588df2a1ea4abc31c85f405f25b2f06d8f4ba;hpb=fe35a91d6432d5e008814e8b1b24785248cf3d88

diff --git a/dgit b/dgit
index 1477d172..97274e9e 100755
--- a/dgit
+++ b/dgit
@@ -64,6 +64,7 @@ our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|unapplied';
 our $we_are_responder;
 our $initiator_tempdir;
+our $patches_applied_dirtily = 00;
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
@@ -86,7 +87,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
@@ -101,6 +102,7 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'dpkg-source' => \@dpkgsource,
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
                      'dpkg-genchanges' => \@dpkggenchanges,
+                     'gbp' => \@gbp,
                      'ch' => \@changesopts,
                      'mergechanges' => \@mergechanges);
 
@@ -1446,7 +1448,7 @@ END
     my $cversion = getfield $clogp, 'Version';
     progress "synthesised git commit from .dsc $cversion";
     if ($lastpush_hash) {
-	runcmd @git, qw(reset --hard), $lastpush_hash;
+	runcmd @git, qw(reset -q --hard), $lastpush_hash;
 	runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
 	my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
 	my $oversion = getfield $oldclogp, 'Version';
@@ -1848,11 +1850,15 @@ sub get_source_format () {
 sub madformat ($) {
     my ($format) = @_;
     return 0 unless $format eq '3.0 (quilt)';
+    our $quilt_mode_warned;
     if ($quilt_mode eq 'nocheck') {
-	progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
+	progress "Not doing any fixup of \`$format' due to".
+	    " ----no-quilt-fixup or --quilt=nocheck"
+	    unless $quilt_mode_warned++;
 	return 0;
     }
-    progress "Format \`$format', checking/updating patch stack";
+    progress "Format \`$format', need to check/update patch stack"
+	unless $quilt_mode_warned++;
     return 1;
 }
 
@@ -1988,10 +1994,14 @@ END
 
     my $format = getfield $dsc, 'Format';
     printdebug "format $format\n";
+
     if (madformat($format)) {
 	# user might have not used dgit build, so maybe do this now:
 	commit_quilty_patch();
     }
+
+    die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)' if $split_brain;
+
     check_not_dirty();
     changedir $ud;
     progress "checking that $dscfn corresponds to HEAD";
@@ -2551,11 +2561,11 @@ sub quiltify_tree_sentinelfiles ($) {
         qw(-- debian/rules debian/control);
     $r =~ s/\n/,/g;
     return $r;
-				 }
+}
 
 sub quiltify_splitbrain_needed () {
     if (!$split_brain) {
-	progress "creating dgit view";
+	progress "dgit view: changes are required...";
 	runcmd @git, qw(checkout -q -b dgit-view);
 	$split_brain = 1;
     }
@@ -2574,21 +2584,31 @@ 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";
-	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
+	progress "dgit view: creating patches-applied version using gbp pq";
+	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);
     }
     if (($diffbits->{H2O} & 02) && # user has modified .gitignore
 	!($diffbits->{O2A} & 02)) { # patches do not change .gitignore
 	quiltify_splitbrain_needed();
-	progress "creating patch to represent .gitignore changes";
+	progress "dgit view: creating patch to represent .gitignore changes";
         ensuredir "debian/patches";
 	my $gipatch = "debian/patches/auto-gitignore";
 	open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
@@ -2628,7 +2648,8 @@ END
     runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
 	$dgitview;
 
-    die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)';
+    progress "dgit view: created (commit id $dgitview)";
+
     changedir '.git/dgit/unpack/work';
 }
 
@@ -2865,6 +2886,8 @@ sub build_maybe_quilt_fixup () {
 	quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
     }
 
+    die 'bug' if $split_brain && !$need_split_build_invocation;
+
     changedir '../../../..';
     runcmd_ordryrun_local
         @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
@@ -2924,14 +2947,55 @@ sub quilt_fixup_singlepatch ($$$) {
 
     chdir "work";
     commit_quilty_patch();
+}
+
+sub quilt_make_fake_dsc ($) {
+    my ($upstreamversion) = @_;
+
+    my $fakeversion="$upstreamversion-~~DGITFAKE";
+
+    my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
+    print $fakedsc <<END or die $!;
+Format: 3.0 (quilt)
+Source: $package
+Version: $fakeversion
+Files:
+END
 
-    
+    my $dscaddfile=sub {
+        my ($b) = @_;
+        
+	my $md = new Digest::MD5;
+
+	my $fh = new IO::File $b, '<' or die "$b $!";
+	stat $fh or die $!;
+	my $size = -s _;
+
+	$md->addfile($fh);
+	print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
+    };
+
+    quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
+
+    my @files=qw(debian/source/format debian/rules
+                 debian/control debian/changelog);
+    foreach my $maybe (qw(debian/patches debian/source/options
+                          debian/tests/control)) {
+        next unless stat_exists "../../../$maybe";
+        push @files, $maybe;
+    }
+
+    my $debtar= srcfn $fakeversion,'.debian.tar.gz';
+    runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
+
+    $dscaddfile->($debtar);
+    close $fakedsc or die $!;
 }
 
 sub quilt_fixup_multipatch ($$$) {
     my ($clogp, $headref, $upstreamversion) = @_;
 
-    progress "starting quiltify (multiple patches, $quilt_mode mode)";
+    progress "examining quilt state (multiple patches, $quilt_mode mode)";
 
     # Our objective is:
     #  - honour any existing .pc in case it has any strangeness
@@ -3002,51 +3066,17 @@ sub quilt_fixup_multipatch ($$$) {
     # afterwards with dpkg-source --before-build.  That lets us save a
     # tree object corresponding to .origs.
 
-    my $fakeversion="$upstreamversion-~~DGITFAKE";
-
-    my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
-    print $fakedsc <<END or die $!;
-Format: 3.0 (quilt)
-Source: $package
-Version: $fakeversion
-Files:
-END
-
-    my $dscaddfile=sub {
-        my ($b) = @_;
-        
-	my $md = new Digest::MD5;
-
-	my $fh = new IO::File $b, '<' or die "$b $!";
-	stat $fh or die $!;
-	my $size = -s _;
-
-	$md->addfile($fh);
-	print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
-    };
-
-    quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
-
-    my @files=qw(debian/source/format debian/rules
-                 debian/control debian/changelog);
-    foreach my $maybe (qw(debian/patches debian/source/options
-                          debian/tests/control)) {
-        next unless stat_exists "../../../$maybe";
-        push @files, $maybe;
-    }
-
-    my $debtar= srcfn $fakeversion,'.debian.tar.gz';
-    runcmd qw(env GZIP=-1 tar -zcf), "./$debtar", qw(-C ../../..), @files;
-
-    $dscaddfile->($debtar);
-    close $fakedsc or die $!;
+    quilt_make_fake_dsc($upstreamversion);
 
     my $splitbrain_cachekey;
     if (quiltmode_splitbrain()) {
+	progress
+ "dgit: split brain (separate dgit view) may needed (--quilt=$quilt_mode).";
 	# we look in the reflog of dgit-intern/quilt-cache
 	# 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');
@@ -3083,13 +3113,12 @@ END
 	    my $cachehit = $1;
 	    quilt_fixup_mkwork($headref);
 	    if ($cachehit ne $headref) {
-		progress "quilt fixup ($quilt_mode mode) found cached tree";
+		progress "dgit view: found cached (commit id $cachehit)";
 		runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
 		$split_brain = 1;
 		return;
 	    }
-	    progress "quilt fixup ($quilt_mode mode)".
-	      " found cached indication that no changes needed";
+	    progress "dgit view: found cached, no changes required";
 	    return;
 	}
 	die $! if GC->error;
@@ -3184,6 +3213,7 @@ END
 	return;
     }
 
+    progress "starting quiltify (multiple patches, $quilt_mode mode)";
     quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
 
     if (!open P, '>>', ".pc/applied-patches") {
@@ -3218,15 +3248,44 @@ sub quilt_fixup_editor () {
     exit 0;
 }
 
+sub maybe_apply_patches_dirtily () {
+    return unless $quilt_mode =~ m/gbp|unapplied/;
+    print STDERR <<END or die $!;
+
+dgit: Building, or cleaning with rules target, in patches-unapplied tree.
+dgit: Have to apply the patches - making the tree dirty.
+dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
+
+END
+    $patches_applied_dirtily = 01;
+    $patches_applied_dirtily |= 02 unless stat_exists '.pc';
+    runcmd qw(dpkg-source --before-build .);
+}
+
+sub maybe_unapply_patches_again () {
+    progress "dgit: Unapplying patches again to tidy up the tree."
+	if $patches_applied_dirtily;
+    runcmd qw(dpkg-source --after-build .)
+	if $patches_applied_dirtily & 01;
+    rmtree '.pc'
+	if $patches_applied_dirtily & 02;
+}
+
 #----- other building -----
 
-our $suppress_clean;
+our $clean_using_builder;
+# ^ tree is to be cleaned by dpkg-source's builtin idea that it should
+#   clean the tree before building (perhaps invoked indirectly by
+#   whatever we are using to run the build), rather than separately
+#   and explicitly by us.
 
 sub clean_tree () {
-    return if $suppress_clean;
+    return if $clean_using_builder;
     if ($cleanmode eq 'dpkg-source') {
+	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
     } elsif ($cleanmode eq 'dpkg-source-d') {
+	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
     } elsif ($cleanmode eq 'git') {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
@@ -3248,6 +3307,7 @@ sub cmd_clean () {
     badusage "clean takes no additional arguments" if @ARGV;
     notpushing();
     clean_tree();
+    maybe_unapply_patches_again();
 }
 
 sub build_prep () {
@@ -3328,7 +3388,7 @@ sub massage_dbp_args ($;$) {
     debugcmd '#massaging#', @$cmd if $debuglevel>1;
 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
     if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
-	$suppress_clean = 1;
+	$clean_using_builder = 1;
 	return 0;
     }
     # -nc has the side effect of specifying -b if nothing else specified
@@ -3347,11 +3407,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;
@@ -3367,8 +3429,10 @@ sub cmd_build {
     }
     if ($wantsrc < 2) {
 	push @dbp, changesopts_version();
+	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @dbp;
     }
+    maybe_unapply_patches_again();
     printdone "build successful\n";
 }
 
@@ -3388,7 +3452,7 @@ sub cmd_gbp_build {
     if ($wantsrc > 0) {
 	build_source();
     } else {
-	if (!$suppress_clean) {
+	if (!$clean_using_builder) {
 	    push @cmd, '--git-cleaner=true';
 	}
 	build_prep();
@@ -3399,16 +3463,27 @@ sub cmd_gbp_build {
 	    push @cmd, "--git-debian-branch=".lbranch();
 	}
 	push @cmd, changesopts();
+	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @cmd, @ARGV;
     }
+    maybe_unapply_patches_again();
     printdone "build successful\n";
 }
 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
 
 sub build_source {
-    if ($cleanmode =~ m/^dpkg-source/) {
-	# dpkg-source will clean, so we shouldn't
-	$suppress_clean = 1;
+    my $our_cleanmode = $cleanmode;
+    if ($need_split_build_invocation) {
+	# Pretend that clean is being done some other way.  This
+	# forces us not to try to use dpkg-buildpackage to clean and
+	# build source all in one go; and instead we run dpkg-source
+	# (and build_prep() will do the clean since $clean_using_builder
+	# is false).
+	$our_cleanmode = 'ELSEWHERE';
+    }
+    if ($our_cleanmode =~ m/^dpkg-source/) {
+	# dpkg-source invocation (below) will clean, so build_prep shouldn't
+	$clean_using_builder = 1;
     }
     build_prep();
     $sourcechanges = changespat $version,'source';
@@ -3417,18 +3492,38 @@ sub build_source {
 	    or fail "remove $sourcechanges: $!";
     }
     $dscfn = dscfn($version);
-    if ($cleanmode eq 'dpkg-source') {
+    if ($our_cleanmode eq 'dpkg-source') {
+	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
-			       changesopts();
-    } elsif ($cleanmode eq 'dpkg-source-d') {
+	    changesopts();
+    } elsif ($our_cleanmode eq 'dpkg-source-d') {
+	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
-			       changesopts();
+	    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",
@@ -3439,6 +3534,7 @@ sub build_source {
 sub cmd_build_source {
     badusage "build-source takes no additional arguments" if @ARGV;
     build_source();
+    maybe_unapply_patches_again();
     printdone "source built, results in $dscfn and $sourcechanges";
 }
 
@@ -3481,6 +3577,7 @@ sub cmd_sbuild {
 	    rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
 	}
     }
+    maybe_unapply_patches_again();
     printdone "build successful, results in $multichanges\n" or die $!;
 }    
 
@@ -3769,6 +3866,8 @@ if (!defined $quilt_mode) {
     $quilt_mode = $1;
 }
 
+$need_split_build_invocation ||= quiltmode_splitbrain();
+
 if (!defined $cleanmode) {
     local $access_forpush;
     $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');