playground: playtree: rename from workarea

We are going to use "playground" for containing temporary directory,
and playtree for git trees within it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 1d713b920d92aefa195f768df07374b65e64c483..524ae18a2d73b506c25320ea4a6476dd97f15ac0 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -60,8 +60,8 @@ BEGIN {
                       shellquote printcmd messagequote
                       $negate_harmful_gitattrs
                      changedir git_slurp_config_src
-                     workarea_setup
-                     fresh_workarea in_workarea);
+                     playtree_setup
+                     fresh_playtree in_playtree);
     # implicitly uses $main::us
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO NOCOMMITCHECK)] );
     @EXPORT_OK   = ( qw($wa), @{ $EXPORT_TAGS{policyflags} } );
@@ -456,8 +456,8 @@ sub git_slurp_config_src ($) {
     return $r;
 }
 
-sub workarea_setup ($) {
-    # for use in the workarea
+sub playtree_setup ($) {
+    # for use in the playtree
     my ($t_local_git_cfg) = @_;
     # should be run in a directory .git/FOO/BAR of a working tree
     runcmd qw(git init -q);
@@ -481,8 +481,8 @@ sub workarea_setup ($) {
 our $wa;
 our $local_git_cfg;
 
-sub in_workarea ($;$) {
-    my $sub = pop @_; # in_workarea [$twa, sub { ... };]
+sub in_playtree ($;$) {
+    my $sub = pop @_; # in_playtree [$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) = @_;
@@ -494,7 +494,7 @@ sub in_workarea ($;$) {
     return $r;
 }
 
-sub fresh_workarea (;$) {
+sub fresh_playtree (;$) {
     my ($twa) = @_;
     $twa //= $wa;
     $local_git_cfg //= git_slurp_config_src 'local';
@@ -502,7 +502,7 @@ sub fresh_workarea (;$) {
     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; };
+    in_playtree sub { playtree_setup $local_git_cfg; };
 }
 
 1;

diff --git a/dgit b/dgit
index 6780af79dc2a7ae3512671282951ef0d60940081..827dc62d0c866464b32123a44d92f6a9b78bba16 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1679,7 +1679,7 @@ sub prep_ud (;$) {
 }
 
 sub mktree_in_ud_here () {
-    workarea_setup $gitcfgs{local};
+    playtree_setup $gitcfgs{local};
 }
 
 sub git_write_tree () {