playground refactoring: Dgit.pm: Expose $local_git_cfg

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e25a3af8339b4a659eff47fa4de9e42f871cd26f..515a32f600b805634a8b3991e21b702c603dc56d 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -30,7 +30,6 @@ use Digest::SHA;
 use Data::Dumper;
 use IPC::Open2;
 use File::Path;
-use File::Basename;
 
 BEGIN {
     use Exporter   ();
@@ -44,7 +43,7 @@ BEGIN {
                      server_branch server_ref
                       stat_exists link_ltarget
                      hashfile
-                      fail ensuredir executable_on_path
+                      fail ensuredir must_getcwd executable_on_path
                       waitstatusmsg failedcmd_waitstatus
                      failedcmd_report_cmd failedcmd
                       runcmd cmdoutput cmdoutput_errok
@@ -60,11 +59,12 @@ BEGIN {
                       shellquote printcmd messagequote
                       $negate_harmful_gitattrs
                      changedir git_slurp_config_src
-                     workarea_setup
-                     fresh_workarea in_workarea);
+                     playtree_setup);
     # implicitly uses $main::us
-    %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO NOCOMMITCHECK)] );
-    @EXPORT_OK   = ( qw($wa), @{ $EXPORT_TAGS{policyflags} } );
+    %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO NOCOMMITCHECK)],
+                    playground => [qw($local_git_cfg)]);
+    @EXPORT_OK   = ( @{ $EXPORT_TAGS{policyflags} },
+                    @{ $EXPORT_TAGS{playground} } );
 }
 
 our @EXPORT_OK;
@@ -224,6 +224,12 @@ sub ensuredir ($) {
     die "mkdir $dir: $!";
 }
 
+sub must_getcwd () {
+    my $d = getcwd();
+    defined $d or fail "getcwd failed: $!";
+    return $d;
+}
+
 sub executable_on_path ($) {
     my ($program) = @_;
     return 1 if $program =~ m{/};
@@ -450,9 +456,17 @@ sub git_slurp_config_src ($) {
     return $r;
 }
 
-sub workarea_setup ($) {
-    # for use in the workarea
+# ========== playground handling ==========
+
+#   $local_git_cfg    hash of arrays of values: git config from $maindir
+
+our $local_git_cfg;
+
+# ----- playtrees -----
+
+sub playtree_setup (;$) {
     my ($t_local_git_cfg) = @_;
+    $t_local_git_cfg //= $local_git_cfg;
     # should be run in a directory .git/FOO/BAR of a working tree
     runcmd qw(git init -q);
     runcmd qw(git config gc.auto 0);
@@ -472,31 +486,4 @@ sub workarea_setup ($) {
     close GA or die $!;
 }
 
-our $wa;
-our $local_git_cfg;
-
-sub in_workarea ($;$) {
-    my $sub = pop @_; # in_workarea [$twa, sub { ... };]
-    # default $twa is global $wa (which caller must, in that case, set)
-    # $twa should be relative paths of the form .git/FOO/BAR
-    my ($twa) = @_;
-    $twa //= $wa;
-    chdir $twa or die "$twa $!";
-    my $r = eval { $sub->($twa); };
-    chdir '../../..' or die "$@; $!";
-    die $@ if length $@;
-    return $r;
-}
-
-sub fresh_workarea (;$) {
-    my ($twa) = @_;
-    $twa //= $wa;
-    $local_git_cfg //= git_slurp_config_src 'local';
-    my $parent = dirname $twa;
-    mkdir $parent or $!==EEXIST or fail "failed to mkdir $parent: $!";
-    rmtree $twa;
-    mkdir $twa or die "$twa $!";
-    in_workarea sub { workarea_setup $local_git_cfg; };
-}
-
 1;