io.files.info: fix circularity

Remove the undocumented and redundant "copy-file-and-info" word, since "copy-file" does the same thing, and the circular dependency on "io.directories" was causing some deploys to fail

diff --git a/basis/io/directories/hierarchy/hierarchy.factor b/basis/io/directories/hierarchy/hierarchy.factor
index d39fbc39a27187d0b7bf81924bbcfd6066e387c1..52e2dd4cc6f88a31a1151245b7b0a85a0c873922 100644 (file)
--- a/basis/io/directories/hierarchy/hierarchy.factor
+++ b/basis/io/directories/hierarchy/hierarchy.factor
@@ -34,7 +34,7 @@ DEFER: copy-tree-into
     {
         { +symbolic-link+ [ copy-link ] }
         { +directory+ [ '[ [ _ copy-tree-into ] each ] with-directory-files ] }
-        [ drop copy-file-and-info ]
+        [ drop copy-file ]
     } case ;
 
 : copy-tree-into ( from to -- )

diff --git a/basis/io/directories/unix/unix.factor b/basis/io/directories/unix/unix.factor
index cbfd344e7b6e622b750034d089795664d9ffb0c7..b4ebc3bc7e55cb08f64c8c09edcd4442b389011a 100644 (file)
--- a/basis/io/directories/unix/unix.factor
+++ b/basis/io/directories/unix/unix.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.data alien.strings
 combinators continuations destructors fry io io.backend
-io.directories io.encodings.binary
+io.directories io.encodings.binary io.files.info.unix
 io.encodings.utf8 io.files io.pathnames io.files.types kernel
 math.bitwise sequences system unix unix.stat vocabs.loader
 classes.struct unix.ffi literals libc vocabs

diff --git a/basis/io/files/info/info.factor b/basis/io/files/info/info.factor
index 3e832e6d0b549d37f06974a16a6e11fc11058d48..99d004638671b6473bd7c232816889946192a5b6 100644 (file)
--- a/basis/io/files/info/info.factor
+++ b/basis/io/files/info/info.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman, Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel system sequences combinators
-vocabs vocabs.loader io.files.types io.directories math ;
+vocabs vocabs.loader io.files.types math ;
 IN: io.files.info
 
 ! File info
@@ -29,7 +29,3 @@ HOOK: file-system-info os ( path -- file-system-info )
     { [ os unix? ] [ "io.files.info.unix" ] }
     { [ os windows? ] [ "io.files.info.windows" ] }
 } cond require
-
-HOOK: copy-file-and-info os ( from to -- )
-
-M: object copy-file-and-info copy-file ;

diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor
index 8b1701cfeae1ea5e42c89e1db0c695d7d663ebb1..6287ee9d4358e3aa7d43caefebf31fd7c70288f7 100644 (file)
--- a/basis/io/files/info/unix/unix.factor
+++ b/basis/io/files/info/unix/unix.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.data arrays calendar
 calendar.unix classes.struct combinators
-combinators.short-circuit io.backend io.directories
+combinators.short-circuit io.backend
 io.files.info io.files.types kernel literals math math.bitwise
 sequences specialized-arrays strings system unix unix.ffi
 unix.groups unix.stat unix.time unix.users vocabs ;
@@ -185,9 +185,6 @@ CONSTANT: ALL-EXECUTE   0o0000111
 : remove-file-permissions ( path n -- )
     over file-permissions [ bitnot ] dip bitand set-file-permissions ;
 
-M: unix copy-file-and-info ( from to -- )
-    [ copy-file ] [ swap file-permissions set-file-permissions ] 2bi ;
-
 <PRIVATE
 
 : timestamp>timeval ( timestamp -- timeval )