From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 21 Jun 2021 11:44:50 +0000 (+0100)
Subject: Break out $edits_sources in command line parser
X-Git-Tag: nailing-cargo/1.0.0~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4605e745b6917d32aa6a83f512e23415b8881f20;p=nailing-cargo.git

Break out $edits_sources in command line parser

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

diff --git a/nailing-cargo b/nailing-cargo
index 3eb4ee4..cc1d9e1 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -983,6 +983,10 @@ sub parse_args () {
     $not_a_nailing_opt->() unless m{^-};
     $not_a_nailing_opt->() if $_ eq '--';
 
+    my $edits_sources = sub {
+      $linkfarm_depth = 'copy-edit';
+    };
+
     if ($_ eq '---') { # usage 2 or 3
       if (!@ARGV) {
 	die "$self: --- must be followed by build command\n" unless $noact;
@@ -1019,7 +1023,7 @@ sub parse_args () {
 	} elsif (s{^-D}{-}) {
 	  $dump++;
 	} elsif (s{^-E}{-}) {
-	  $linkfarm_depth = 'copy-edit';
+	  $edits_sources->();
 	} elsif (s{^-T(.+)}{-}s) {
 	  $target = $1;
 	} elsif (s{^-([oO])}{-}) {
@@ -1044,7 +1048,7 @@ sub parse_args () {
     } elsif (m{^--linkfarm(?:=(no|shallow|git|full))?$}) {
       $linkfarm_depth = $1 || 'git';
     } elsif (m{^--edits?-sources?$}) {
-      $linkfarm_depth = 'copy-edit';
+      $edits_sources->();
     } elsif (m{^--just-run$}) {
       $do_nail = $do_cargo_lock = $do_lock = 0;
     } elsif (m{^--(clean|keep)-linkfarm$}) {