The "git annex content" command is renamed to "git annex wanted".
This commit is contained in:
parent
049e80e865
commit
afddbfd7e9
9 changed files with 15 additions and 14 deletions
|
@ -5,7 +5,7 @@
|
||||||
- Licensed under the GNU GPL version 3 or higher.
|
- Licensed under the GNU GPL version 3 or higher.
|
||||||
-}
|
-}
|
||||||
|
|
||||||
module Command.Content where
|
module Command.Wanted where
|
||||||
|
|
||||||
import Common.Annex
|
import Common.Annex
|
||||||
import Command
|
import Command
|
||||||
|
@ -15,7 +15,7 @@ import Logs.PreferredContent
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
|
|
||||||
def :: [Command]
|
def :: [Command]
|
||||||
def = [command "content" (paramPair paramRemote (paramOptional paramExpression)) seek
|
def = [command "wanted" (paramPair paramRemote (paramOptional paramExpression)) seek
|
||||||
SectionSetup "get or set preferred content expression"]
|
SectionSetup "get or set preferred content expression"]
|
||||||
|
|
||||||
seek :: [CommandSeek]
|
seek :: [CommandSeek]
|
||||||
|
@ -26,7 +26,7 @@ start = parse
|
||||||
where
|
where
|
||||||
parse (name:[]) = go name performGet
|
parse (name:[]) = go name performGet
|
||||||
parse (name:expr:[]) = go name $ \uuid -> do
|
parse (name:expr:[]) = go name $ \uuid -> do
|
||||||
showStart "content" name
|
showStart "wanted" name
|
||||||
performSet expr uuid
|
performSet expr uuid
|
||||||
parse _ = error "Specify a repository."
|
parse _ = error "Specify a repository."
|
||||||
|
|
|
@ -54,7 +54,7 @@ import qualified Command.Untrust
|
||||||
import qualified Command.Semitrust
|
import qualified Command.Semitrust
|
||||||
import qualified Command.Dead
|
import qualified Command.Dead
|
||||||
import qualified Command.Group
|
import qualified Command.Group
|
||||||
import qualified Command.Content
|
import qualified Command.Wanted
|
||||||
import qualified Command.Schedule
|
import qualified Command.Schedule
|
||||||
import qualified Command.Ungroup
|
import qualified Command.Ungroup
|
||||||
import qualified Command.Vicfg
|
import qualified Command.Vicfg
|
||||||
|
@ -118,7 +118,7 @@ cmds = concat
|
||||||
, Command.Semitrust.def
|
, Command.Semitrust.def
|
||||||
, Command.Dead.def
|
, Command.Dead.def
|
||||||
, Command.Group.def
|
, Command.Group.def
|
||||||
, Command.Content.def
|
, Command.Wanted.def
|
||||||
, Command.Schedule.def
|
, Command.Schedule.def
|
||||||
, Command.Ungroup.def
|
, Command.Ungroup.def
|
||||||
, Command.Vicfg.def
|
, Command.Vicfg.def
|
||||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -1,5 +1,6 @@
|
||||||
git-annex (4.20131025) UNRELEASED; urgency=low
|
git-annex (4.20131025) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
* The "git annex content" command is renamed to "git annex wanted".
|
||||||
* assistant: When autostarted, wait 5 seconds before running the startup
|
* assistant: When autostarted, wait 5 seconds before running the startup
|
||||||
scan, to avoid contending with the user's desktop login process.
|
scan, to avoid contending with the user's desktop login process.
|
||||||
* webapp: When setting up a bare shared repository, enable non-fast-forward
|
* webapp: When setting up a bare shared repository, enable non-fast-forward
|
||||||
|
|
|
@ -398,14 +398,14 @@ subdirectories).
|
||||||
|
|
||||||
Removes a repository from a group.
|
Removes a repository from a group.
|
||||||
|
|
||||||
* `content repository [expression]`
|
* `wanted repository [expression]`
|
||||||
|
|
||||||
When run with an expression, configures the content that is preferred
|
When run with an expression, configures the content that is preferred
|
||||||
to be held in the archive. See PREFERRED CONTENT below.
|
to be held in the archive. See PREFERRED CONTENT below.
|
||||||
|
|
||||||
For example:
|
For example:
|
||||||
|
|
||||||
git annex content . "include=*.mp3 or include=*.ogg"
|
git annex wanted . "include=*.mp3 or include=*.ogg"
|
||||||
|
|
||||||
Without an expression, displays the current preferred content setting
|
Without an expression, displays the current preferred content setting
|
||||||
of the repository.
|
of the repository.
|
||||||
|
@ -973,7 +973,7 @@ file contents are present at either of two repositories.
|
||||||
|
|
||||||
Each repository has a preferred content setting, which specifies content
|
Each repository has a preferred content setting, which specifies content
|
||||||
that the repository wants to have present. These settings can be configured
|
that the repository wants to have present. These settings can be configured
|
||||||
using `git annex vicfg` or `git annex content`.
|
using `git annex vicfg` or `git annex wanted`.
|
||||||
They are used by the `--auto` option, and by the git-annex assistant.
|
They are used by the `--auto` option, and by the git-annex assistant.
|
||||||
|
|
||||||
The preferred content settings are similar, but not identical to
|
The preferred content settings are similar, but not identical to
|
||||||
|
|
|
@ -7,7 +7,7 @@ this allows `git annex get --auto`, `git annex drop --auto`, etc to do
|
||||||
smarter things.
|
smarter things.
|
||||||
|
|
||||||
Preferred content settings can be edited using `git
|
Preferred content settings can be edited using `git
|
||||||
annex vicfg`, or viewed and set at the command line with `git annex content`.
|
annex vicfg`, or viewed and set at the command line with `git annex wanted`.
|
||||||
Each repository can have its own settings, and other repositories may also
|
Each repository can have its own settings, and other repositories may also
|
||||||
try to honor those settings. So there's no local `.git/config` setting it.
|
try to honor those settings. So there's no local `.git/config` setting it.
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ After the setup has finished, it will print the git-annex configure lines.
|
||||||
The photo name on flickr is currently the GPGHMACSHA1 version.
|
The photo name on flickr is currently the GPGHMACSHA1 version.
|
||||||
|
|
||||||
Run the following command in your annex directory
|
Run the following command in your annex directory
|
||||||
git annex content flickr uuid include=*.jpg or include=*.jpeg or include=*.gif or include=*.png
|
git annex wanted flickr uuid include=*.jpg or include=*.jpeg or include=*.gif or include=*.png
|
||||||
|
|
||||||
## Encrypted mode
|
## Encrypted mode
|
||||||
The current version base64 encodes all the data, which results in ~35% larger filesize.
|
The current version base64 encodes all the data, which results in ~35% larger filesize.
|
||||||
|
@ -47,7 +47,7 @@ The current version base64 encodes all the data, which results in ~35% larger fi
|
||||||
I might look into yyenc instead. I'm not sure if it will work in the tEXt field.
|
I might look into yyenc instead. I'm not sure if it will work in the tEXt field.
|
||||||
|
|
||||||
Run the following command in your annex directory
|
Run the following command in your annex directory
|
||||||
git annex content flickr exclude=largerthan=30mb
|
git annex wanted flickr exclude=largerthan=30mb
|
||||||
|
|
||||||
## Including directories as tags
|
## Including directories as tags
|
||||||
Get get each of the directories below the top level git directory added as tags to uploads:
|
Get get each of the directories below the top level git directory added as tags to uploads:
|
||||||
|
|
|
@ -24,4 +24,4 @@ Run the program once to set it up.
|
||||||
git config annex.imap-hook '/usr/bin/python2 ~/imapannex/imapannex.py'
|
git config annex.imap-hook '/usr/bin/python2 ~/imapannex/imapannex.py'
|
||||||
git annex initremote imap type=hook hooktype=imap encryption=shared
|
git annex initremote imap type=hook hooktype=imap encryption=shared
|
||||||
git annex describe imap "the imap library"
|
git annex describe imap "the imap library"
|
||||||
git annex content imap exclude=largerthan=30mb
|
git annex wanted imap exclude=largerthan=30mb
|
||||||
|
|
|
@ -24,7 +24,7 @@ drive). Also, give the drive a description that matches something you write on
|
||||||
its label, so you can find it later:
|
its label, so you can find it later:
|
||||||
|
|
||||||
git annex group archivedrive archive
|
git annex group archivedrive archive
|
||||||
git annex content archivedrive standard
|
git annex wanted archivedrive standard
|
||||||
git annex describe archivedrive "my first archive drive (SATA)"
|
git annex describe archivedrive "my first archive drive (SATA)"
|
||||||
|
|
||||||
Or you can use the assistant to set up the drive for you.
|
Or you can use the assistant to set up the drive for you.
|
||||||
|
|
|
@ -6,5 +6,5 @@
|
||||||
content="""
|
content="""
|
||||||
The example was missing a preferred content setting, without which --auto doesn't copy anything unless needed to satisfy numcopies:
|
The example was missing a preferred content setting, without which --auto doesn't copy anything unless needed to satisfy numcopies:
|
||||||
|
|
||||||
git annex content archivedrive standard
|
git annex wanted archivedrive standard
|
||||||
"""]]
|
"""]]
|
||||||
|
|
Loading…
Reference in a new issue