Dgit: break must_getcwd out into Dgit.pm

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 1f9c8276257b8999e8a28075511fca6fea89a544..1d713b920d92aefa195f768df07374b65e64c483 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -44,7 +44,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
@@ -59,7 +59,7 @@ BEGIN {
                       $debugprefix *debuglevel *DEBUG
                       shellquote printcmd messagequote
                       $negate_harmful_gitattrs
-                     git_slurp_config_src
+                     changedir git_slurp_config_src
                      workarea_setup
                      fresh_workarea in_workarea);
     # implicitly uses $main::us
@@ -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{/};
@@ -420,6 +426,12 @@ sub is_fast_fwd ($$) {
     }
 }
 
+sub changedir ($) {
+    my ($newdir) = @_;
+    printdebug "CD $newdir\n";
+    chdir $newdir or confess "chdir: $newdir: $!";
+}
+
 sub git_slurp_config_src ($) {
     my ($src) = @_;
     # returns $r such that $r->{KEY}[] = VALUE
@@ -475,9 +487,9 @@ sub in_workarea ($;$) {
     # $twa should be relative paths of the form .git/FOO/BAR
     my ($twa) = @_;
     $twa //= $wa;
-    chdir $twa or die "$twa $!";
+    changedir $twa or die "$twa $!";
     my $r = eval { $sub->($twa); };
-    chdir '../../..' or die "$@; $!";
+    changedir '../../..' or die "$@; $!";
     die $@ if length $@;
     return $r;
 }