summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-28 18:27:36 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-08-02 15:56:58 +0100
commit8b30674d5dbdebb3ad48bff887d99f5c4fea7984 (patch)
tree27747f73815b624071570165b8248ab0a8bffa70 /Debian
parent9ecc454c514558e7d49fa47083a69e456cc33239 (diff)
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>
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Dgit.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 1d713b9..524ae18 100644
--- 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;