Merge pull request #17526 from Homebrew/revert-17373-cp-reflink

Homebrew · Jun 18, 2024 · 8e06b0c · 8e06b0c
2 parents 088afff + c3c1528
commit 8e06b0c
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 296 deletions.
diff --git a/Library/Homebrew/cask/artifact/moved.rb b/Library/Homebrew/cask/artifact/moved.rb
@@ -3,7 +3,6 @@
 
 require "cask/artifact/relocated"
 require "cask/quarantine"
-require "utils/copy"
 
 module Cask
   module Artifact
@@ -109,8 +108,8 @@ def move(adopt: false, force: false, verbose: false, predecessor: nil, reinstall
           if target.writable?
             source.children.each { |child| FileUtils.move(child, target/child.basename) }
           else
-            ::Utils::Copy.recursive_with_attributes(source.children, target,
-                                                    force_command: true, sudo: true, command:)
+            command.run!("/bin/cp", args: ["-pR", *source.children, target],
+                                    sudo: true)
           end
           Quarantine.copy_xattrs(source, target, command:)
           source.rmtree
@@ -119,7 +118,7 @@ def move(adopt: false, force: false, verbose: false, predecessor: nil, reinstall
         else
           # default sudo user isn't necessarily able to write to Homebrew's locations
           # e.g. with runas_default set in the sudoers (5) file.
-          ::Utils::Copy.recursive_with_attributes(source, target, force_command: true, sudo: true, command:)
+          command.run!("/bin/cp", args: ["-pR", source, target], sudo: true)
           source.rmtree
         end
 
@@ -162,9 +161,8 @@ def move_back(skip: false, force: false, adopt: false, command: nil, **options)
         ohai "Backing #{self.class.english_name} '#{target.basename}' up to '#{source}'"
         source.dirname.mkpath
 
-        ::Utils::Copy.recursive_with_attributes(target, source, sudo: !source.parent.writable?, command:,
-                                              # This is required to preserve extended attributes between copies.
-                                              force_command: true)
+        # We need to preserve extended attributes between copies.
+        command.run!("/bin/cp", args: ["-pR", target, source], sudo: !source.parent.writable?)
 
         delete(target, force:, command:, **options)
       end

diff --git a/Library/Homebrew/extend/os/copy.rb b/Library/Homebrew/extend/os/copy.rb
diff --git a/Library/Homebrew/extend/os/mac/utils/copy.rb b/Library/Homebrew/extend/os/mac/utils/copy.rb
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
@@ -6,7 +6,6 @@
 require "metafiles"
 require "extend/file/atomic"
 require "system_command"
-require "utils/copy"
 
 module DiskUsageExtension
   sig { returns(Integer) }
@@ -227,7 +226,7 @@ def cp_path_sub(pattern, replacement)
     else
       dst.dirname.mkpath
       dst = yield(self, dst) if block_given?
-      Utils::Copy.with_attributes(self, dst)
+      FileUtils.cp(self, dst)
     end
   end
 

diff --git a/Library/Homebrew/sorbet/rbi/upstream.rbi b/Library/Homebrew/sorbet/rbi/upstream.rbi
@@ -2,23 +2,3 @@
 
 # This file contains temporary definitions for fixes that have
 # been submitted upstream to https://github.com/sorbet/sorbet.
-
-# https://github.com/sorbet/sorbet/pull/7959
-module FileUtils
-  sig {
-    params(
-      src:                T.any(File, String, Pathname, T::Array[T.any(File, String, Pathname)]),
-      dest:               T.any(String, Pathname),
-      preserve:           T.nilable(T::Boolean),
-      noop:               T.nilable(T::Boolean),
-      verbose:            T.nilable(T::Boolean),
-      dereference_root:   T::Boolean,
-      remove_destination: T.nilable(T::Boolean),
-    ).returns(T.nilable(T::Array[String]))
-  }
-  def self.cp_r(src, dest, preserve: nil, noop: nil, verbose: nil, dereference_root: true, remove_destination: nil)
-    # XXX: This comment is a placeholder to suppress `Style/EmptyMethod` lint.
-    # Simply compacting the method definition in a single line would in turn trigger
-    # `Layout/LineLength`, driving `brew style --fix` to an infinite loop.
-  end
-end
diff --git a/Library/Homebrew/test/cask/artifact/app_spec.rb b/Library/Homebrew/test/cask/artifact/app_spec.rb
@@ -350,9 +350,8 @@
         allow(command).to receive(:run!).with(any_args).and_call_original
 
         expect(command).to receive(:run!)
-          .with(a_string_ending_with("cp"),
-                hash_including(args: include(source_contents_path, target_path),
-                               sudo: true))
+          .with("/bin/cp", args: ["-pR", source_contents_path, target_path],
+                           sudo: true)
           .and_call_original
         expect(FileUtils).not_to receive(:move).with(source_contents_path, an_instance_of(Pathname))
 

diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
@@ -310,7 +310,6 @@
 
 RSpec::Matchers.define_negated_matcher :not_to_output, :output
 RSpec::Matchers.alias_matcher :have_failed, :be_failed
-RSpec::Matchers.define_negated_matcher :exclude, :include
 
 # Match consecutive elements in an array.
 RSpec::Matchers.define :array_including_cons do |*cons|

diff --git a/Library/Homebrew/test/utils/copy_spec.rb b/Library/Homebrew/test/utils/copy_spec.rb
diff --git a/Library/Homebrew/unpack_strategy/bzip2.rb b/Library/Homebrew/unpack_strategy/bzip2.rb
@@ -1,8 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "utils/copy"
-
 module UnpackStrategy
   # Strategy for unpacking bzip2 archives.
   class Bzip2
@@ -21,7 +19,7 @@ def self.can_extract?(path)
 
     sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
     def extract_to_dir(unpack_dir, basename:, verbose:)
-      Utils::Copy.with_attributes path, unpack_dir/basename
+      FileUtils.cp path, unpack_dir/basename, preserve: true
       quiet_flags = verbose ? [] : ["-q"]
       system_command! "bunzip2",
                       args:    [*quiet_flags, unpack_dir/basename],

diff --git a/Library/Homebrew/unpack_strategy/directory.rb b/Library/Homebrew/unpack_strategy/directory.rb
@@ -1,8 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "utils/copy"
-
 module UnpackStrategy
   # Strategy for unpacking directories.
   class Directory
@@ -22,10 +20,10 @@ def self.can_extract?(path)
     sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
     def extract_to_dir(unpack_dir, basename:, verbose:)
       path.children.each do |child|
-        Utils::Copy.recursive_with_attributes (child.directory? && !child.symlink?) ? "#{child}/." : child,
-                                              unpack_dir/child.basename,
-                                              force_command: true,
-                                              verbose:
+        system_command! "cp",
+                        args:    ["-pR", (child.directory? && !child.symlink?) ? "#{child}/." : child,
+                                  unpack_dir/child.basename],
+                        verbose:
       end
     end
   end

diff --git a/Library/Homebrew/unpack_strategy/gzip.rb b/Library/Homebrew/unpack_strategy/gzip.rb
@@ -1,8 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "utils/copy"
-
 module UnpackStrategy
   # Strategy for unpacking gzip archives.
   class Gzip
@@ -21,7 +19,7 @@ def self.can_extract?(path)
 
     sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
     def extract_to_dir(unpack_dir, basename:, verbose:)
-      Utils::Copy.with_attributes path, unpack_dir/basename
+      FileUtils.cp path, unpack_dir/basename, preserve: true
       quiet_flags = verbose ? [] : ["-q"]
       system_command! "gunzip",
                       args:    [*quiet_flags, "-N", "--", unpack_dir/basename],

diff --git a/Library/Homebrew/unpack_strategy/lzip.rb b/Library/Homebrew/unpack_strategy/lzip.rb
@@ -1,8 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "utils/copy"
-
 module UnpackStrategy
   # Strategy for unpacking lzip archives.
   class Lzip
@@ -25,7 +23,7 @@ def dependencies
 
     sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
     def extract_to_dir(unpack_dir, basename:, verbose:)
-      Utils::Copy.with_attributes path, unpack_dir/basename
+      FileUtils.cp path, unpack_dir/basename, preserve: true
       quiet_flags = verbose ? [] : ["-q"]
       system_command! "lzip",
                       args:    ["-d", *quiet_flags, unpack_dir/basename],

diff --git a/Library/Homebrew/unpack_strategy/lzma.rb b/Library/Homebrew/unpack_strategy/lzma.rb
@@ -1,8 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "utils/copy"
-
 module UnpackStrategy
   # Strategy for unpacking LZMA archives.
   class Lzma
@@ -25,7 +23,7 @@ def dependencies
 
     sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
     def extract_to_dir(unpack_dir, basename:, verbose:)
-      Utils::Copy.with_attributes path, unpack_dir/basename
+      FileUtils.cp path, unpack_dir/basename, preserve: true
       quiet_flags = verbose ? [] : ["-q"]
       system_command! "unlzma",
                       args:    [*quiet_flags, "--", unpack_dir/basename],

diff --git a/Library/Homebrew/unpack_strategy/uncompressed.rb b/Library/Homebrew/unpack_strategy/uncompressed.rb
@@ -1,8 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "utils/copy"
-
 module UnpackStrategy
   # Strategy for unpacking uncompressed files.
   class Uncompressed
@@ -24,7 +22,7 @@ def extract_nestedly(to: nil, basename: nil, verbose: false, prioritize_extensio
 
     sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
     def extract_to_dir(unpack_dir, basename:, verbose: false)
-      Utils::Copy.with_attributes path, unpack_dir/basename.sub(/^[\da-f]{64}--/, ""), verbose:
+      FileUtils.cp path, unpack_dir/basename.sub(/^[\da-f]{64}--/, ""), preserve: true, verbose:
     end
   end
 end