dgit: rename two quilt_fixup_ functions

They are useful for doing things other than quilt fixup.

No functional change.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

diff --git a/dgit b/dgit
index 1bde3279b359c333cf7942fdaf15ccc1ef475836..de81cf98134dd6dceaa515f40f5c8f7142fbcaff 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5638,7 +5638,7 @@ END
         @git, qw(pull --ff-only -q), "$playground/work", qw(master);
 }
 
         @git, qw(pull --ff-only -q), "$playground/work", qw(master);
 }
 

-sub quilt_fixup_mkwork ($) {
+sub unpack_playtree_mkwork ($) {

     my ($headref) = @_;
 
     mkdir "work" or die $!;
     my ($headref) = @_;
 
     mkdir "work" or die $!;


@@ -5647,7 +5647,7 @@ sub quilt_fixup_mkwork ($) {
     runcmd @git, qw(reset -q --hard), $headref;
 }
 
     runcmd @git, qw(reset -q --hard), $headref;
 }
 

-sub quilt_fixup_linkorigs ($$) {
+sub unpack_playtree_linkorigs ($$) {

     my ($upstreamversion, $fn) = @_;
     # calls $fn->($leafname);
 
     my ($upstreamversion, $fn) = @_;
     # calls $fn->($leafname);
 


@@ -5686,8 +5686,8 @@ sub quilt_fixup_singlepatch ($$$) {
     # get it to generate debian/patches/debian-changes, it is
     # necessary to build the source package.
 
     # get it to generate debian/patches/debian-changes, it is
     # necessary to build the source package.
 

-    quilt_fixup_linkorigs($upstreamversion, sub { });
-    quilt_fixup_mkwork($headref);
+    unpack_playtree_linkorigs($upstreamversion, sub { });
+    unpack_playtree_mkwork($headref);

 
     rmtree("debian/patches");
 
 
     rmtree("debian/patches");
 


@@ -5727,7 +5727,7 @@ END
        print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
     };
 
        print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
     };
 

-    quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
+    unpack_playtree_linkorigs($upstreamversion, $dscaddfile);

 
     my @files=qw(debian/source/format debian/rules
                  debian/control debian/changelog);
 
     my @files=qw(debian/source/format debian/rules
                  debian/control debian/changelog);


@@ -5795,7 +5795,7 @@ sub quilt_check_splitbrain_cache ($$) {
        next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
            
        my $cachehit = $1;
        next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
            
        my $cachehit = $1;

-       quilt_fixup_mkwork($headref);
+       unpack_playtree_mkwork($headref);

        my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
        if ($cachehit ne $headref) {
            progress "dgit view: found cached ($saved)";
        my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
        if ($cachehit ne $headref) {
            progress "dgit view: found cached ($saved)";


@@ -5932,7 +5932,7 @@ END
 
     changedir '..';
 
 
     changedir '..';
 

-    quilt_fixup_mkwork($headref);
+    unpack_playtree_mkwork($headref);

 
     my $mustdeletepc=0;
     if (stat_exists ".pc") {
 
     my $mustdeletepc=0;
     if (stat_exists ".pc") {