X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=b0c60c4a86e377b3b047b8a95e8ac47289fb6f15;hb=e473bf523d358431f9eac1356b3807636a951f85;hp=f1b322ad68450760d395ce4a1e71e0fa9ef29635;hpb=f52d69c4c3fd99b72b5402afb34fb1dbe5b64303;p=dgit.git

diff --git a/dgit b/dgit
index f1b322ad..b0c60c4a 100755
--- a/dgit
+++ b/dgit
@@ -176,6 +176,7 @@ autoflush STDOUT 1;
 
 our $supplementary_message = '';
 our $split_brain = 0;
+our $do_split_brain = 0;
 
 END {
     local ($@, $?);
@@ -4492,6 +4493,7 @@ END
     if (madformat_wantfixup($format)) {
 	# user might have not used dgit build, so maybe do this now:
 	if (quiltmode_splitbrain()) {
+	    $do_split_brain = 1;
 	    changedir $playground;
 	    quilt_make_fake_dsc($upstreamversion);
 	    my $cachekey;
@@ -4501,17 +4503,22 @@ END
  "--quilt=%s but no cached dgit view:
  perhaps HEAD changed since dgit build[-source] ?",
                               $quilt_mode;
-	    $split_brain = 1;
-	    $dgithead = splitbrain_pseudomerge($clogp,
-					       $actualhead, $dgithead,
-					       $archive_hash);
-	    $maintviewhead = $actualhead;
-	    changedir $maindir;
-	    prep_ud(); # so _only_subdir() works, below
-	} else {
+	}
+	if (!$do_split_brain) {
+	    # In split brain mode, do not attempt to incorporate dirty
+	    # stuff from the user's working tree.  That would be mad.
 	    commit_quilty_patch();
 	}
     }
+    if ($do_split_brain) {
+	$split_brain = 1;
+	$dgithead = splitbrain_pseudomerge($clogp,
+					   $actualhead, $dgithead,
+					   $archive_hash);
+	$maintviewhead = $actualhead;
+	changedir $maindir;
+	prep_ud(); # so _only_subdir() works, below
+    }
 
     if (defined $overwrite_version && !defined $maintviewhead
 	&& $archive_hash) {
@@ -5374,14 +5381,6 @@ sub quiltify_tree_sentinelfiles ($) {
     return $r;
 }
 
-sub quiltify_splitbrain_needed () {
-    if (!$split_brain) {
-	progress __ "dgit view: changes are required...";
-	runcmd @git, qw(checkout -q -b dgit-view);
-	$split_brain = 1;
-    }
-}
-
 sub quiltify_splitbrain ($$$$$$$) {
     my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
 	$editedignores, $cachekey) = @_;
@@ -5401,6 +5400,8 @@ sub quiltify_splitbrain ($$$$$$$) {
     local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
     local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
+    die unless $do_split_brain;
+
     my $fulldiffhint = sub {
 	my ($x,$y) = @_;
 	my $cmd = "git diff $x $y -- :/ ':!debian'";
@@ -5431,7 +5432,6 @@ END
     }
     if ($quilt_mode =~ m/gbp|unapplied/ &&
 	($diffbits->{O2A} & 01)) { # some patches
-	quiltify_splitbrain_needed();
 	progress __ "dgit view: creating patches-applied version using gbp pq";
 	runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
 	# gbp pq import creates a fresh branch; push back to dgit-view
@@ -5448,7 +5448,6 @@ END
     }
     if (($diffbits->{O2H} & 02) && # user has modified .gitignore
 	!($diffbits->{O2A} & 02)) { # patches do not change .gitignore
-	quiltify_splitbrain_needed();
 	progress __
 	    "dgit view: creating patch to represent .gitignore changes";
         ensuredir "debian/patches";
@@ -5789,12 +5788,7 @@ sub build_maybe_quilt_fixup () {
 
     check_for_vendor_patches();
 
-    if (quiltmode_splitbrain) {
-	fail <<END unless access_cfg_tagformats_can_splitbrain;
-quilt mode $quilt_mode requires split view so server needs to support
- both "new" and "maint" tag formats, but config says it doesn't.
-END
-    }
+    $do_split_brain = 1 if quiltmode_splitbrain();
 
     my $clogp = parsechangelog();
     my $headref = git_rev_parse('HEAD');
@@ -5845,12 +5839,29 @@ END
         @git, qw(pull --ff-only -q), "$playground/work", qw(master);
 }
 
-sub unpack_playtree_mkwork ($) {
+sub build_check_quilt_splitbrain () {
+    build_maybe_quilt_fixup();
+
+    if ($do_split_brain) {
+	fail <<END unless access_cfg_tagformats_can_splitbrain;
+quilt mode $quilt_mode requires split view so server needs to support
+ both "new" and "maint" tag formats, but config says it doesn't.
+END
+    }
+}
+
+sub unpack_playtree_need_cd_work ($) {
     my ($headref) = @_;
 
-    mkdir "work" or confess "$!";
-    changedir "work";
-    mktree_in_ud_here();
+    # prep_ud() must have been called already.
+    if (!chdir "work") {
+	# Check in the filesystem because sometimes we run prep_ud
+	# in between multiple calls to unpack_playtree_need_cd_work.
+	confess "$!" unless $!==ENOENT;
+	mkdir "work" or confess "$!";
+	changedir "work";
+	mktree_in_ud_here();
+    }
     runcmd @git, qw(reset -q --hard), $headref;
 }
 
@@ -5899,7 +5910,7 @@ sub quilt_fixup_singlepatch ($$$) {
     # necessary to build the source package.
 
     unpack_playtree_linkorigs($upstreamversion, sub { });
-    unpack_playtree_mkwork($headref);
+    unpack_playtree_need_cd_work($headref);
 
     rmtree("debian/patches");
 
@@ -6021,7 +6032,7 @@ sub quilt_check_splitbrain_cache ($$) {
 	"refs/$splitbraincache", $splitbrain_cachekey;
 
     if ($cachehit) {
-	unpack_playtree_mkwork($headref);
+	unpack_playtree_need_cd_work($headref);
 	my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
 	if ($cachehit ne $headref) {
 	    progress f_ "dgit view: found cached (%s)", $saved;
@@ -6140,7 +6151,7 @@ END
 
     changedir '..';
 
-    unpack_playtree_mkwork($headref);
+    unpack_playtree_need_cd_work($headref);
 
     my $mustdeletepc=0;
     if (stat_exists ".pc") {
@@ -6217,6 +6228,11 @@ END
     push @failsuggestion, [ 'origs', __
  "Maybe orig tarball(s) are not identical to git representation?" ];
 
+    if ($do_split_brain) {
+	runcmd @git, qw(checkout -q -b dgit-view);
+	die if $split_brain;
+	$split_brain = 1;
+    }
     if (quiltmode_splitbrain()) {
 	quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
                             $diffbits, \%editedignores,
@@ -6399,7 +6415,7 @@ sub build_prep ($) {
 	# said -wc we should still do the check.
 	clean_tree_check();
     }
-    build_maybe_quilt_fixup();
+    build_check_quilt_splitbrain();
     if ($rmchanges) {
 	my $pat = changespat $version;
 	foreach my $f (glob "$buildproductsdir/$pat") {
@@ -6712,7 +6728,7 @@ sub build_source {
         unless ($split_brain) {
             my $upstreamversion = upstreamversion $version;
             unpack_playtree_linkorigs($upstreamversion, sub { });
-            unpack_playtree_mkwork($headref);
+            unpack_playtree_need_cd_work($headref);
             changedir '..';
         }
     } else {
@@ -6779,7 +6795,7 @@ sub cmd_push_source {
 	"dgit push-source: --include-dirty/--ignore-dirty does not make".
 	"sense with push-source!"
 	if $includedirty;
-    build_maybe_quilt_fixup();
+    build_check_quilt_splitbrain();
     if ($changesfile) {
         my $changes = parsecontrol("$buildproductsdir/$changesfile",
                                    __ "source changes file");