diff options
author | Joey Hess <joey@kitenet.net> | 2013-01-05 17:16:58 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-01-05 17:17:04 -0400 |
commit | ed66c698e62ac72a4db60a60365e52a18c3caae3 (patch) | |
tree | 1e7b05ae8ef8be8e1b42d475662e8ab35bd00e87 | |
parent | a5031031f0d596b2381a785925beb574d90a862e (diff) |
More commands work in direct mode repositories: find, whereis, move, copy, drop, log.
These started working, for free, once lookupFile supported direct mode.
yay!!
-rw-r--r-- | Command/Copy.hs | 5 | ||||
-rw-r--r-- | Command/Drop.hs | 2 | ||||
-rw-r--r-- | Command/Find.hs | 2 | ||||
-rw-r--r-- | Command/Log.hs | 2 | ||||
-rw-r--r-- | Command/Move.hs | 2 | ||||
-rw-r--r-- | Command/Whereis.hs | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | doc/direct_mode.mdwn | 8 | ||||
-rw-r--r-- | doc/git-annex.mdwn | 6 |
9 files changed, 15 insertions, 16 deletions
diff --git a/Command/Copy.hs b/Command/Copy.hs index 08c95369b..6967c2f93 100644 --- a/Command/Copy.hs +++ b/Command/Copy.hs @@ -14,9 +14,8 @@ import qualified Remote import Annex.Wanted def :: [Command] -def = [notDirect $ - withOptions Command.Move.options $ command "copy" paramPaths seek - "copy content of files to/from another repository"] +def = [withOptions Command.Move.options $ command "copy" paramPaths seek + "copy content of files to/from another repository"] seek :: [CommandSeek] seek = [withField Command.Move.toOption Remote.byName $ \to -> diff --git a/Command/Drop.hs b/Command/Drop.hs index cb38275bf..3a30703d5 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -20,7 +20,7 @@ import qualified Option import Annex.Wanted def :: [Command] -def = [notDirect $ withOptions [fromOption] $ command "drop" paramPaths seek +def = [withOptions [fromOption] $ command "drop" paramPaths seek "indicate content of files not currently wanted"] fromOption :: Option diff --git a/Command/Find.hs b/Command/Find.hs index 8090f11c6..96f47ec87 100644 --- a/Command/Find.hs +++ b/Command/Find.hs @@ -20,7 +20,7 @@ import Types.Key import qualified Option def :: [Command] -def = [notDirect $ noCommit $ withOptions [formatOption, print0Option] $ +def = [noCommit $ withOptions [formatOption, print0Option] $ command "find" paramPaths seek "lists available files"] formatOption :: Option diff --git a/Command/Log.hs b/Command/Log.hs index b20d17674..6608a9906 100644 --- a/Command/Log.hs +++ b/Command/Log.hs @@ -36,7 +36,7 @@ data RefChange = RefChange type Outputter = Bool -> POSIXTime -> [UUID] -> Annex () def :: [Command] -def = [notDirect $ withOptions options $ +def = [withOptions options $ command "log" paramPaths seek "shows location log"] options :: [Option] diff --git a/Command/Move.hs b/Command/Move.hs index 80b362c8a..316e4192e 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -19,7 +19,7 @@ import Logs.Presence import Logs.Transfer def :: [Command] -def = [notDirect $ withOptions options $ command "move" paramPaths seek +def = [withOptions options $ command "move" paramPaths seek "move content of files to/from another repository"] fromOption :: Option diff --git a/Command/Whereis.hs b/Command/Whereis.hs index 6c60ab19d..251c4ec7a 100644 --- a/Command/Whereis.hs +++ b/Command/Whereis.hs @@ -15,7 +15,7 @@ import Remote import Logs.Trust def :: [Command] -def = [notDirect $ noCommit $ command "whereis" paramPaths seek +def = [noCommit $ command "whereis" paramPaths seek "lists repositories that have file content"] seek :: [CommandSeek] diff --git a/debian/changelog b/debian/changelog index 7a14f4493..abc06ce47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ git-annex (3.20130105) UNRELEASED; urgency=low * webapp: Add UI to stop and restart assistant. * committer: Fix a file handle leak. * assistant: Make expensive transfer scan work fully in direct mode. + * More commands work in direct mode repositories: find, whereis, move, copy, + drop, log. -- Joey Hess <joeyh@debian.org> Thu, 03 Jan 2013 14:58:45 -0400 diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn index 997b547e4..d1f9ae73e 100644 --- a/doc/direct_mode.mdwn +++ b/doc/direct_mode.mdwn @@ -41,11 +41,9 @@ Otherwise, the main command that's used in direct mode repositories is `git annex sync`. This automatically adds new files, commits all changed files to git, pushes them out, pulls down any changes, etc. -You can also run `git annex get` to transfer the content of files into your -direct mode repository. Or if the direct mode repository is a remote of -some other, regular git-annex repository, you can use commands in the other -repository like `git annex copy` and `git annex move` to transfer the -contents of files to the direct mode repository. +`git annex add` and some other commands are not yet supported in direct +mode repositories. Feel free to try any git annex command though; ones that +don't support direct mode will refuse to do anything. You can use `git commit --staged`. (But not `git commit -a` .. It'll commit whole large files into git!) diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index b36577d99..7cd3c422c 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -269,9 +269,9 @@ subdirectories). * direct Switches a repository to use direct mode, where rather than symlinks to - files, the files are directly present in the repository. Note that many git - and git-annex commands will not work in direct mode; you're mostly - limited to using "git annex sync" and "git annex get". + files, the files are directly present in the repository. Note that most git + commands and some git-annex commands will not work in direct mode; you're + mostly limited to using "git annex sync" and "git annex get". As part of the switch to direct mode, any changed files will be committed. |