From 1ebe15e07563f26fedb00e2defff6628032ec717 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 17:17:31 +0100
Subject: dgit: Break out import_tarball_tartrees

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 125 ++++++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 67 insertions(+), 58 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 437e18b..cfd4f7c 100755
--- a/dgit
+++ b/dgit
@@ -2271,62 +2271,9 @@ sub dotdot_bpd_transfer_origs ($$$) {
     closedir DD;
 }
 
-sub generate_commits_from_dsc () {
-    # See big comment in fetch_from_archive, below.
-    # See also README.dsc-import.
-    prep_ud();
-    changedir $playground;
-
-    my $bpd_abs = bpd_abs();
-    my $upstreamv = upstreamversion $dsc->{version};
-    my @dfi = dsc_files_info();
-
-    dotdot_bpd_transfer_origs $bpd_abs, $upstreamv,
-	sub { grep { $_->{Filename} eq $_[0] } @dfi };
-
-    foreach my $fi (@dfi) {
-	my $f = $fi->{Filename};
-	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
-	my $upper_f = "$bpd_abs/$f";
-
-	printdebug "considering reusing $f: ";
-
-	if (link_ltarget "$upper_f,fetch", $f) {
-	    printdebug "linked (using ...,fetch).\n";
-	} elsif ((printdebug "($!) "),
-		 $! != ENOENT) {
-	    fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
-	} elsif (link_ltarget $upper_f, $f) {
-	    printdebug "linked.\n";
-	} elsif ((printdebug "($!) "),
-		 $! != ENOENT) {
-	    fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
-	} else {
-	    printdebug "absent.\n";
-	}
-
-	my $refetched;
-	complete_file_from_dsc('.', $fi, \$refetched)
-	    or next;
-
-	printdebug "considering saving $f: ";
-
-	if (rename_link_xf 1, $f, $upper_f) {
-	    printdebug "linked.\n";
-	} elsif ((printdebug "($@) "),
-		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
-	} elsif (!$refetched) {
-	    printdebug "no need.\n";
-	} elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
-	    printdebug "linked (using ...,fetch).\n";
-	} elsif ((printdebug "($@) "),
-		 $! != EEXIST) {
-	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
-	} else {
-	    printdebug "cannot.\n";
-	}
-    }
+sub import_tarball_tartrees ($$) {
+    my ($upstreamv, $dfi) = @_;
+    # cwd should be the playground
 
     # We unpack and record the orig tarballs first, so that we only
     # need disk space for one private copy of the unpacked source.
@@ -2336,14 +2283,14 @@ sub generate_commits_from_dsc () {
     my @tartrees;
     my $orig_f_base = srcfn $upstreamv, '';
 
-    foreach my $fi (@dfi) {
+    foreach my $fi (@$dfi) {
 	# We actually import, and record as a commit, every tarball
 	# (unless there is only one file, in which case there seems
 	# little point.
 
 	my $f = $fi->{Filename};
 	printdebug "import considering $f ";
-	(printdebug "only one dfi\n"), next if @dfi == 1;
+	(printdebug "only one dfi\n"), next if @$dfi == 1;
 	(printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
 	(printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
 	my $compr_ext = $1;
@@ -2433,6 +2380,68 @@ sub generate_commits_from_dsc () {
 	$a->{F}    cmp $b->{F}
     } @tartrees;
 
+    @tartrees;
+}
+
+sub generate_commits_from_dsc () {
+    # See big comment in fetch_from_archive, below.
+    # See also README.dsc-import.
+    prep_ud();
+    changedir $playground;
+
+    my $bpd_abs = bpd_abs();
+    my $upstreamv = upstreamversion $dsc->{version};
+    my @dfi = dsc_files_info();
+
+    dotdot_bpd_transfer_origs $bpd_abs, $upstreamv,
+	sub { grep { $_->{Filename} eq $_[0] } @dfi };
+
+    foreach my $fi (@dfi) {
+	my $f = $fi->{Filename};
+	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
+	my $upper_f = "$bpd_abs/$f";
+
+	printdebug "considering reusing $f: ";
+
+	if (link_ltarget "$upper_f,fetch", $f) {
+	    printdebug "linked (using ...,fetch).\n";
+	} elsif ((printdebug "($!) "),
+		 $! != ENOENT) {
+	    fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
+	} elsif (link_ltarget $upper_f, $f) {
+	    printdebug "linked.\n";
+	} elsif ((printdebug "($!) "),
+		 $! != ENOENT) {
+	    fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
+	} else {
+	    printdebug "absent.\n";
+	}
+
+	my $refetched;
+	complete_file_from_dsc('.', $fi, \$refetched)
+	    or next;
+
+	printdebug "considering saving $f: ";
+
+	if (rename_link_xf 1, $f, $upper_f) {
+	    printdebug "linked.\n";
+	} elsif ((printdebug "($@) "),
+		 $! != EEXIST) {
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
+	} elsif (!$refetched) {
+	    printdebug "no need.\n";
+	} elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
+	    printdebug "linked (using ...,fetch).\n";
+	} elsif ((printdebug "($@) "),
+		 $! != EEXIST) {
+	    fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
+	} else {
+	    printdebug "cannot.\n";
+	}
+    }
+
+    my @tartrees = import_tarball_tartrees($upstreamv, \@dfi);
+
     my $any_orig = grep { $_->{Orig} } @tartrees;
 
     my $dscfn = "$package.dsc";
-- 
cgit v1.2.3