X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=8b638c476f091bba7333dff8723fca79e6347daf;hp=a67c12cb09ceac540f5d4f359987cbe68abcbd5c;hb=98ff9fa866eecd50ce444ea7a506db894f2b5fac;hpb=b5c3e33d87675507eff29ba1d5e1c4998b15f3fd

diff --git a/dgit b/dgit
index a67c12cb..8b638c47 100755
--- a/dgit
+++ b/dgit
@@ -277,6 +277,10 @@ sub gbp_pq {
     return opts_opt_multi_cmd @gbp_pq;
 }
 
+sub dgit_privdir () {
+    our $dgit_privdir_made //= ensure_a_playground 'dgit';
+}
+
 #---------- remote protocol support, common ----------
 
 # remote push initiator/responder protocol:
@@ -980,8 +984,8 @@ sub commit_getclogp ($) {
     our %commit_getclogp_memo;
     my $memo = $commit_getclogp_memo{$objid};
     return $memo if $memo;
-    mkpath '.git/dgit';
-    my $mclog = ".git/dgit/clog-$objid";
+    
+    my $mclog = dgit_privdir()."clog-$objid";
     runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
 	"$objid:debian/changelog";
     $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
@@ -1672,6 +1676,7 @@ our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
 
 
 sub prep_ud () {
+    dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
     fresh_playground 'dgit/unpack';
 }
 
@@ -1709,8 +1714,8 @@ sub remove_stray_gits ($) {
 
 sub mktree_in_ud_from_only_subdir ($;$) {
     my ($what,$raw) = @_;
-
     # changes into the subdir
+
     my (@dirs) = <*/.>;
     die "expected one subdir but found @dirs ?" unless @dirs==1;
     $dirs[0] =~ m#^([^/]+)/\.$# or die;
@@ -2057,7 +2062,7 @@ sub generate_commits_from_dsc () {
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
-	my $upper_f = "../../../../$f";
+	my $upper_f = "$maindir/../$f";
 
 	printdebug "considering reusing $f: ";
 
@@ -2376,6 +2381,10 @@ END
 	local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
 	my $path = $ENV{PATH} or die;
+	
+	# we use ../../gbp-pq-output, which (given that we are in
+	# $playground/PLAYTREE, and $playground is .git/dgit/unpack,
+	# is .git/dgit.
 
 	foreach my $use_absurd (qw(0 1)) {
 	    runcmd @git, qw(checkout -q unpa);
@@ -3159,7 +3168,7 @@ END
 	my $author = clogp_authline $useclogp;
 	my $cversion = getfield $useclogp, 'Version';
 
-	my $mcf = ".git/dgit/mergecommit";
+	my $mcf = dgit_privdir()."/mergecommit";
 	open MC, ">", $mcf or die "$mcf $!";
 	print MC <<END or die $!;
 tree $tree
@@ -3219,7 +3228,6 @@ END
     fetch_from_archive_record_1($hash);
 
     if (defined $skew_warning_vsn) {
-	mkpath '.git/dgit';
 	printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
 	my $gotclogp = commit_getclogp($hash);
 	my $got_vsn = getfield $gotclogp, 'Version';
@@ -3258,8 +3266,9 @@ sub setup_mergechangelogs (;$) {
 
     my $driver = 'dpkg-mergechangelogs';
     my $cb = "merge.$driver";
-    my $attrs = '.git/info/attributes';
-    ensuredir '.git/info';
+    confess unless defined $maindir;
+    my $attrs = "$maindir_gitcommon/info/attributes";
+    ensuredir "$maindir_gitcommon/info";
 
     open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
     if (!open ATTRS, "<", $attrs) {
@@ -3304,15 +3313,16 @@ sub ensure_setup_existing_tree () {
     set_local_git_config $k, 'true';
 }
 
-sub open_gitattrs () {
-    my $gai = new IO::File ".git/info/attributes"
+sub open_main_gitattrs () {
+    confess 'internal error no maindir' unless defined $maindir;
+    my $gai = new IO::File "$maindir_gitcommon/info/attributes"
 	or $!==ENOENT
-	or die "open .git/info/attributes: $!";
+	or die "open $maindir_gitcommon/info/attributes: $!";
     return $gai;
 }
 
 sub is_gitattrs_setup () {
-    my $gai = open_gitattrs();
+    my $gai = open_main_gitattrs();
     return 0 unless $gai;
     while (<$gai>) {
 	return 1 if m{^\[attr\]dgit-defuse-attrs\s};
@@ -3332,15 +3342,15 @@ sub setup_gitattrs (;$) {
 END
 	return;
     }
-    my $af = ".git/info/attributes";
-    ensuredir '.git/info';
+    my $af = "$maindir_gitcommon/info/attributes";
+    ensuredir "$maindir_gitcommon/info";
     open GAO, "> $af.new" or die $!;
     print GAO <<END or die $!;
 *	dgit-defuse-attrs
 [attr]dgit-defuse-attrs	$negate_harmful_gitattrs
 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
 END
-    my $gai = open_gitattrs();
+    my $gai = open_main_gitattrs();
     if ($gai) {
 	while (<$gai>) {
 	    chomp;
@@ -3576,6 +3586,7 @@ sub clone ($) {
     my $multi_fetched = fork_for_multisuite(sub {
         printdebug "multi clone before fetch merge\n";
         changedir $dstdir;
+	record_maindir();
     });
     if ($multi_fetched) {
         printdebug "multi clone after fetch merge\n";
@@ -3730,7 +3741,7 @@ sub maybe_split_brain_save ($$$) {
     my ($headref, $dgitview, $msg) = @_;
     # => message fragment "$saved" describing disposition of $dgitview
     return "commit id $dgitview" unless defined $split_brain_save;
-    my @cmd = (shell_cmd "cd ../../../..",
+    my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
 	       @git, qw(update-ref -m),
 	       "dgit --dgit-view-save $msg HEAD=$headref",
 	       $split_brain_save, $dgitview);
@@ -3831,8 +3842,7 @@ sub pseudomerge_make_commit ($$$$ $$) {
 	: !length  $overwrite_version ? " --overwrite"
 	: " --overwrite=".$overwrite_version;
 
-    mkpath '.git/dgit';
-    my $pmf = ".git/dgit/pseudomerge";
+    my $pmf = dgit_privdir()."/pseudomerge";
     open MC, ">", $pmf or die "$pmf $!";
     print MC <<END or die $!;
 tree $tree
@@ -4140,7 +4150,7 @@ END
     rpush_handle_protovsn_bothends() if $we_are_initiator;
     select_tagformat();
 
-    my $clogpfn = ".git/dgit/changelog.822.tmp";
+    my $clogpfn = dgit_privdir()."/changelog.822.tmp";
     runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
 
     responder_send_file('parsed-changelog', $clogpfn);
@@ -4216,7 +4226,7 @@ END
     changedir $playground;
     progress "checking that $dscfn corresponds to HEAD";
     runcmd qw(dpkg-source -x --),
-        $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
+        $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
     my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
     check_for_vendor_patches() if madformat($dsc->{format});
     changedir $maindir;
@@ -4291,7 +4301,7 @@ END
     }
 
     my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
-				 ".git/dgit/tag");
+				 dgit_privdir()."/tag");
     my @tagobjfns;
 
     supplementary_message(<<'END');
@@ -4815,7 +4825,7 @@ sub quiltify_dpkg_commit ($$$;$) {
     my ($patchname,$author,$msg, $xinfo) = @_;
     $xinfo //= '';
 
-    mkpath '.git/dgit';
+    mkpath '.git/dgit'; # we are in playtree
     my $descfn = ".git/dgit/quilt-description.tmp";
     open O, '>', $descfn or die "$descfn: $!";
     $msg =~ s/\n+/\n\n/;
@@ -5011,8 +5021,8 @@ END
     changedir $maindir;
     # When we no longer need to support squeeze, use --create-reflog
     # instead of this:
-    ensuredir ".git/logs/refs/dgit-intern";
-    my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
+    ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
+    my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
       or die $!;
 
     my $oldcache = git_get_ref "refs/$splitbraincache";
@@ -5346,7 +5356,7 @@ END
 
     changedir $maindir;
     runcmd_ordryrun_local
-        @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
+        @git, qw(pull --ff-only -q), "$playground/work", qw(master);
 }
 
 sub quilt_fixup_mkwork ($) {
@@ -5362,7 +5372,7 @@ sub quilt_fixup_linkorigs ($$) {
     my ($upstreamversion, $fn) = @_;
     # calls $fn->($leafname);
 
-    foreach my $f (<../../../../*>) { #/){
+    foreach my $f (<$maindir/../*>) { #/){
 	my $b=$f; $b =~ s{.*/}{};
 	{
 	    local ($debuglevel) = $debuglevel-1;
@@ -5441,12 +5451,12 @@ END
                  debian/control debian/changelog);
     foreach my $maybe (qw(debian/patches debian/source/options
                           debian/tests/control)) {
-        next unless stat_exists "../../../$maybe";
+        next unless stat_exists "$maindir/$maybe";
         push @files, $maybe;
     }
 
     my $debtar= srcfn $fakeversion,'.debian.tar.gz';
-    runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
+    runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
 
     $dscaddfile->($debtar);
     close $fakedsc or die $!;
@@ -5489,8 +5499,8 @@ sub quilt_check_splitbrain_cache ($$) {
     debugcmd "|(probably)",@cmd;
     my $child = open GC, "-|";  defined $child or die $!;
     if (!$child) {
-	chdir '../../..' or die $!;
-	if (!stat ".git/logs/refs/$splitbraincache") {
+	chdir $maindir or die $!;
+	if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
 	    $! == ENOENT or die $!;
 	    printdebug ">(no reflog)\n";
 	    exit 0;
@@ -6063,12 +6073,13 @@ sub cmd_gbp_build {
     push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
 
     if ($gbp_make_orig) {
-	ensuredir '.git/dgit';
-	my $ok = '.git/dgit/origs-gen-ok';
+	my $priv = dgit_privdir();
+	my $ok = "$priv/origs-gen-ok";
 	unlink $ok or $!==&ENOENT or die $!;
 	my @origs_cmd = @cmd;
 	push @origs_cmd, qw(--git-cleaner=true);
-	push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
+	push @origs_cmd, "--git-prebuild=".
+            "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
 	push @origs_cmd, @ARGV;
 	if (act_local()) {
 	    debugcmd @origs_cmd;