mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'anarcat/master'

Browse source
This commit is contained in:
Joey Hess 2013-09-19 14:23:19 -04:00
commit 3f8151d469
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/Remotes.hs → Command/List.hs
View file

@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher. - Licensed under the GNU GPL version 3 or higher.
-} -}
module Command.Remotes where module Command.List where
import qualified Data.Set as S import qualified Data.Set as S
@ -16,7 +16,7 @@ import Logs.Trust
import Annex.UUID import Annex.UUID
def :: [Command] def :: [Command]
def = [noCommit $ command "remotes" paramPaths seek def = [noCommit $ command "list" paramPaths seek
SectionQuery "show which remotes contain files"] SectionQuery "show which remotes contain files"]
seek :: [CommandSeek] seek :: [CommandSeek]

4
GitAnnex.hs
View file

@ -42,7 +42,7 @@ import qualified Command.Lock
import qualified Command.PreCommit import qualified Command.PreCommit
import qualified Command.Find import qualified Command.Find
import qualified Command.Whereis import qualified Command.Whereis
import qualified Command.Remotes import qualified Command.List
import qualified Command.Log import qualified Command.Log
import qualified Command.Merge import qualified Command.Merge
import qualified Command.Status import qualified Command.Status
@ -133,7 +133,7 @@ cmds = concat
, Command.AddUnused.def , Command.AddUnused.def
, Command.Find.def , Command.Find.def
, Command.Whereis.def , Command.Whereis.def
, Command.Remotes.def , Command.List.def
, Command.Log.def , Command.Log.def
, Command.Merge.def , Command.Merge.def
, Command.Status.def , Command.Status.def

2
debian/changelog vendored
View file

@ -4,7 +4,7 @@ git-annex (4.20130912) UNRELEASED; urgency=low
* Recommend using my patched gcrypt, which fixes some bugs: * Recommend using my patched gcrypt, which fixes some bugs:
https://github.com/joeyh/git-remote-gcrypt https://github.com/joeyh/git-remote-gcrypt
* Support hot-swapping of removable drives containing gcrypt repositories. * Support hot-swapping of removable drives containing gcrypt repositories.
* remotes: New command, displays a compact table of remotes that * list: New command, displays a compact table of remotes that
contain files. contain files.
(Thanks, anarcat for display code and mastensg for inspiration.) (Thanks, anarcat for display code and mastensg for inspiration.)
* fsck: Fix detection and fixing of present direct mode files that are * fsck: Fix detection and fixing of present direct mode files that are

2
doc/git-annex.mdwn
View file

@ -552,7 +552,7 @@ subdirectories).
Displays a list of repositories known to contain the contents of the Displays a list of repositories known to contain the contents of the
specified file or files. specified file or files.
* `remotes [path ...]` * `list [path ...]`
Displays a table of remotes that contain the contents of the specified Displays a table of remotes that contain the contents of the specified
files. Unlike whereis, this only shows configured remotes, not other files. Unlike whereis, this only shows configured remotes, not other