factor: add newlines to .factor files

[factor.git] / extra / cli / git / git.factor

diff --git a/extra/cli/git/git.factor b/extra/cli/git/git.factor
index ce9bbcc7b01b1039c9236f4468b1a5936d30fc4f..39b42f7fd868601598dce63b936e451bdf9d0e53 100644 (file)
--- a/extra/cli/git/git.factor
+++ b/extra/cli/git/git.factor
@@ -1,32 +1,51 @@
 ! Copyright (C) 2017 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays concurrency.combinators concurrency.semaphores fry
-io io.directories io.encodings.utf8 io.files.info io.launcher
-io.pathnames kernel math namespaces sequences splitting
-system-info unicode ;
+USING: accessors arrays concurrency.combinators
+concurrency.semaphores io io.directories io.encodings.utf8
+io.files.info io.launcher io.pathnames kernel math namespaces
+sequences splitting system-info unicode ;
 IN: cli.git
 
 SYMBOL: cli-git-num-parallel
 cli-git-num-parallel [ cpus 2 * ] initialize
 
-: git-clone-as ( ssh-url path -- process )
-    [ { "git" "clone" } ] 2dip 2array append run-process ;
+: git-command>string ( desc -- string )
+    utf8 <process-reader> stream-contents [ blank? ] trim-tail ;
 
-: git-clone ( ssh-url -- process )
-    [ { "git" "clone" } ] dip suffix run-process ;
-
-: git-pull ( path -- process )
-    [ { "git" "pull" } run-process ] with-directory ;
+: git-clone-as ( uri path -- process ) [ { "git" "clone" } ] 2dip 2array append run-process ;
+: git-clone ( uri -- process ) [ { "git" "clone" } ] dip suffix run-process ;
+: git-pull* ( -- process ) { "git" "pull" } run-process ;
+: git-pull ( path -- process ) [ git-pull* ] with-directory ;
+: git-fetch-all* ( -- process ) { "git" "fetch" "--all" } run-process ;
+: git-fetch-all ( path -- process ) [ git-fetch-all* ] with-directory ;
+: git-fetch-tags* ( -- process ) { "git" "fetch" "--tags" } run-process ;
+: git-fetch-tags ( path -- process ) [ git-fetch-tags* ] with-directory ;
+: git-checkout-new-branch* ( branch -- process ) [ { "git" "checkout" "-b" } ] dip suffix run-process ;
+: git-checkout-new-branch ( path branch -- process ) '[ _ git-checkout-new-branch* ] with-directory ;
+: git-checkout-existing* ( branch/checksum -- process ) [ { "git" "checkout" } ] dip suffix run-process ;
+: git-checkout-existing ( path branch/checksum -- process ) '[ _ git-checkout-existing* ] with-directory ;
+: git-change-remote* ( remote uri -- process ) [ { "git" "remote" "set-url" } ] 2dip 2array append run-process ;
+: git-change-remote ( path remote uri -- process ) '[ _ _ git-change-remote* ] with-directory ;
+: git-remote-add* ( remote uri -- process ) [ { "git" "remote" "add" } ] 2dip 2array append run-process ;
+: git-remote-add ( path remote uri -- process ) '[ _ _ git-remote-add* ] with-directory ;
+: git-remote-get-url* ( remote -- process ) [ { "git" "remote" "get-url" } ] dip suffix run-process ;
+: git-remote-get-url ( path remote -- process ) '[ _ git-remote-get-url* ] with-directory ;
+: git-rev-parse* ( branch -- string ) [ { "git" "rev-parse" } ] dip suffix git-command>string ;
+: git-rev-parse ( path branch -- string ) '[ _ git-rev-parse* ] with-directory ;
+: git-diff-name-only* ( from to -- lines )
+    [ { "git" "diff" "--name-only" } ] 2dip 2array append process-lines ;
+: git-diff-name-only ( path from to -- lines )
+    '[ _ _ git-diff-name-only* ] with-directory ;
 
 : git-repository? ( directory -- ? )
     ".git" append-path current-directory get prepend-path
     ?file-info dup [ directory? ] when ;
 
+: git-current-branch* ( -- name )
+     { "git" "rev-parse" "--abbrev-ref" "HEAD" } git-command>string ;
+
 : git-current-branch ( directory -- name )
-    [
-        { "git" "rev-parse" "--abbrev-ref" "HEAD" }
-        utf8 <process-reader> stream-contents
-    ] with-directory [ blank? ] trim-tail ;
+    [ git-current-branch* ] with-directory ;
 
 : repository-url>name ( string -- string' )
     file-name ".git" ?tail drop ;
@@ -41,3 +60,8 @@ cli-git-num-parallel [ cpus 2 * ] initialize
             _ [ update-repository ] with-semaphore
         ] parallel-each
     ] with-ensure-directory ;
+
+: directory-entries-without-git ( directory -- entries )
+    recursive-directory-entries
+    [ name>> "/.git/" subseq-index? ] reject ;
+