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

Merge branch 'master' into adjustedbranch

Browse source
This commit is contained in:
Joey Hess 2016-03-11 12:21:26 -04:00
commit 97e97dccda
Failed to extract signature
69 changed files with 901 additions and 1080 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Annex/Content.hs
View file

@ -41,8 +41,6 @@ module Annex.Content (
saveState,
downloadUrl,
preseedTmp,
freezeContent,
thawContent,
dirKeys,
withObjectLoc,
staleKeysPrune,
@ -67,7 +65,6 @@ import Utility.CopyFile
import Utility.Metered
import Config
import Git.FilePath
import Git.SharedRepository
import Annex.Perms
import Annex.Link
import qualified Annex.Content.Direct as Direct
@ -917,47 +914,6 @@ preseedTmp key file = go =<< inAnnex key
)
)
{- Normally, blocks writing to an annexed file, and modifies file
- permissions to allow reading it.
-
- When core.sharedRepository is set, the write bits are not removed from
- the file, but instead the appropriate group write bits are set. This is
- necessary to let other users in the group lock the file.
-}
freezeContent :: FilePath -> Annex ()
freezeContent file = unlessM crippledFileSystem $
withShared go
where
go GroupShared = liftIO $ modifyFileMode file $
addModes [ownerReadMode, groupReadMode, ownerWriteMode, groupWriteMode]
go AllShared = liftIO $ modifyFileMode file $
addModes (readModes ++ writeModes)
go _ = liftIO $ modifyFileMode file $
removeModes writeModes .
addModes [ownerReadMode]
{- Adjusts read mode of annexed file per core.sharedRepository setting. -}
chmodContent :: FilePath -> Annex ()
chmodContent file = unlessM crippledFileSystem $
withShared go
where
go GroupShared = liftIO $ modifyFileMode file $
addModes [ownerReadMode, groupReadMode]
go AllShared = liftIO $ modifyFileMode file $
addModes readModes
go _ = liftIO $ modifyFileMode file $
addModes [ownerReadMode]
{- Allows writing to an annexed file that freezeContent was called on
- before. -}
thawContent :: FilePath -> Annex ()
thawContent file = unlessM crippledFileSystem $
withShared go
where
go GroupShared = liftIO $ groupWriteRead file
go AllShared = liftIO $ groupWriteRead file
go _ = liftIO $ allowWrite file
{- Finds files directly inside a directory like gitAnnexBadDir
- (not in subdirectories) and returns the corresponding keys. -}
dirKeys :: (Git.Repo -> FilePath) -> Annex [Key]

12
Annex/Ingest.hs
View file

@ -5,8 +5,6 @@
- Licensed under the GNU GPL version 3 or higher.
-}
{-# LANGUAGE CPP #-}
module Annex.Ingest (
LockedDown(..),
LockDownConfig(..),
@ -42,13 +40,9 @@ import Utility.InodeCache
import Annex.ReplaceFile
import Utility.Tmp
import Utility.CopyFile
import Utility.Touch
import Git.FilePath
import Annex.InodeSentinal
#ifdef WITH_CLIBS
#ifndef __ANDROID__
import Utility.Touch
#endif
#endif
import Control.Exception (IOException)
@ -282,11 +276,7 @@ makeLink file key mcache = flip catchNonAsync (restoreFile file key) $ do
-- touch symlink to have same time as the original file,
-- as provided in the InodeCache
case mcache of
#if defined(WITH_CLIBS) && ! defined(__ANDROID__)
Just c -> liftIO $ touch file (TimeSpec $ inodeCacheToMtime c) False
#else
Just _ -> noop
#endif
Nothing -> noop
return l

55
Annex/Perms.hs
View file

@ -11,6 +11,9 @@ module Annex.Perms (
annexFileMode,
createAnnexDirectory,
noUmask,
freezeContent,
thawContent,
chmodContent,
createContentDir,
freezeContentDir,
thawContentDir,
@ -77,6 +80,55 @@ createAnnexDirectory dir = walk dir [] =<< top
liftIO $ createDirectoryIfMissing True p
setAnnexDirPerm p
{- Normally, blocks writing to an annexed file, and modifies file
- permissions to allow reading it.
-
- When core.sharedRepository is set, the write bits are not removed from
- the file, but instead the appropriate group write bits are set. This is
- necessary to let other users in the group lock the file.
-}
freezeContent :: FilePath -> Annex ()
freezeContent file = unlessM crippledFileSystem $
withShared go
where
go GroupShared = liftIO $ modifyFileMode file $
addModes [ownerReadMode, groupReadMode, ownerWriteMode, groupWriteMode]
go AllShared = liftIO $ modifyFileMode file $
addModes (readModes ++ writeModes)
go _ = liftIO $ modifyFileMode file $
removeModes writeModes .
addModes [ownerReadMode]
{- Adjusts read mode of annexed file per core.sharedRepository setting. -}
chmodContent :: FilePath -> Annex ()
chmodContent file = unlessM crippledFileSystem $
withShared go
where
go GroupShared = liftIO $ modifyFileMode file $
addModes [ownerReadMode, groupReadMode]
go AllShared = liftIO $ modifyFileMode file $
addModes readModes
go _ = liftIO $ modifyFileMode file $
addModes [ownerReadMode]
{- Allows writing to an annexed file that freezeContent was called on
- before. -}
thawContent :: FilePath -> Annex ()
thawContent file = thawPerms $ withShared go
where
go GroupShared = liftIO $ groupWriteRead file
go AllShared = liftIO $ groupWriteRead file
go _ = liftIO $ allowWrite file
{- Runs an action that thaws a file's permissions. This will probably
- fail on a crippled filesystem. But, if file modes are supported on a
- crippled filesystem, the file may be frozen, so try to thaw it. -}
thawPerms :: Annex () -> Annex ()
thawPerms a = ifM crippledFileSystem
( void $ tryNonAsync a
, a
)
{- Blocks writing to the directory an annexed file is in, to prevent the
- file accidentially being deleted. However, if core.sharedRepository
- is set, this is not done, since the group must be allowed to delete the
@ -92,8 +144,7 @@ freezeContentDir file = unlessM crippledFileSystem $
go _ = liftIO $ preventWrite dir
thawContentDir :: FilePath -> Annex ()
thawContentDir file = unlessM crippledFileSystem $
liftIO $ allowWrite $ parentDir file
thawContentDir file = thawPerms $ liftIO $ allowWrite $ parentDir file
{- Makes the directory tree to store an annexed file's content,
- with appropriate permissions on each level. -}

4
Assistant.hs
View file

@ -25,7 +25,7 @@ import Assistant.Threads.RemoteControl
import Assistant.Threads.SanityChecker
import Assistant.Threads.Cronner
import Assistant.Threads.ProblemFixer
#ifdef WITH_CLIBS
#ifndef mingw32_HOST_OS
import Assistant.Threads.MountWatcher
#endif
import Assistant.Threads.NetWatcher
@ -170,7 +170,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser =
, assist $ sanityCheckerDailyThread urlrenderer
, assist sanityCheckerHourlyThread
, assist $ problemFixerThread urlrenderer
#ifdef WITH_CLIBS
#ifndef mingw32_HOST_OS
, assist $ mountWatcherThread urlrenderer
#endif
, assist netWatcherThread

6
Assistant/WebApp/Configurators/Local.hs
View file

@ -24,9 +24,7 @@ import qualified Command.Sync
import Config.Files
import Utility.FreeDesktop
import Utility.DiskFree
#ifdef WITH_CLIBS
import Utility.Mounts
#endif
import Utility.DataUnits
import Remote (prettyUUID)
import Annex.UUID
@ -359,7 +357,6 @@ driveList :: IO [RemovableDrive]
-- Could use wmic, but it only works for administrators.
driveList = mapM (\d -> genRemovableDrive $ d:":\\") ['A'..'Z']
#else
#ifdef WITH_CLIBS
driveList = mapM (genRemovableDrive . mnt_dir) =<< filter sane <$> getMounts
where
-- filter out some things that are surely not removable drives
@ -379,9 +376,6 @@ driveList = mapM (genRemovableDrive . mnt_dir) =<< filter sane <$> getMounts
| dir == "/sdcard" = False
#endif
| otherwise = True
#else
driveList = return []
#endif
#endif
genRemovableDrive :: FilePath -> IO RemovableDrive

58
Build/DistributionUpdate.hs
View file

@ -13,6 +13,7 @@ import Types.Distribution
import Build.Version (getChangelogVersion, Version)
import Utility.UserInfo
import Utility.Url
import Utility.Tmp
import qualified Git.Construct
import qualified Annex
import Annex.Content
@ -56,7 +57,8 @@ main = do
state <- Annex.new =<< Git.Construct.fromPath "."
Annex.eval state (makeinfos updated version)
-- Download a build from the autobuilder, and return its version.
-- Download a build from the autobuilder, virus check it, and return its
-- version.
-- It's very important that the version matches the build, otherwise
-- auto-upgrades can loop reatedly. So, check build-version before
-- and after downloading the file.
@ -72,18 +74,21 @@ getbuild repodir (url, f) = do
putStrLn $ "*** " ++ s
return Nothing
ifM (download url tmp def)
( do
bv2 <- getbv
case bv2 of
Nothing -> oops $ "no build-version file for " ++ url
(Just v)
| bv2 == bv1 -> do
nukeFile dest
renameFile tmp dest
-- remove git rev part of version
let v' = takeWhile (/= '-') v
return $ Just (f, v')
| otherwise -> oops $ "build version changed while downloading " ++ url ++ " " ++ show (bv1, bv2)
( ifM (liftIO $ virusFree tmp)
( do
bv2 <- getbv
case bv2 of
Nothing -> oops $ "no build-version file for " ++ url
(Just v)
| bv2 == bv1 -> do
nukeFile dest
renameFile tmp dest
-- remove git rev part of version
let v' = takeWhile (/= '-') v
return $ Just (f, v')
| otherwise -> oops $ "build version changed while downloading " ++ url ++ " " ++ show (bv1, bv2)
, oops $ "VIRUS detected in " ++ url
)
, oops $ "failed to download " ++ url
)
where
@ -170,3 +175,30 @@ signFile f = do
]
liftIO $ rename (f ++ ".asc") (f ++ ".sig")
void $ inRepo $ runBool [Param "add", File (f ++ ".sig")]
-- clamscan should handle unpacking archives, but did not in my
-- testing, so do it manually.
virusFree :: FilePath -> IO Bool
virusFree f
| ".tar.gz" `isSuffixOf` f = unpack $ \tmpdir ->
boolSystem "tar" [ Param "xf", File f, Param "-C", File tmpdir ]
| ".dmg" `isSuffixOf` f = unpack $ \tmpdir -> do
-- 7z can extract partitions from a dmg, and then
-- run on partitions can extract their files
unhfs tmpdir f
parts <- filter (".hfs" `isSuffixOf`) <$> getDirectoryContents tmpdir
forM_ parts $ unhfs tmpdir
return True
| otherwise = clamscan f
where
clamscan f' = boolSystem "clamscan"
[ Param "--no-summary"
, Param "-r"
, Param f'
]
unpack unpacker = withTmpDir "clamscan" $ \tmpdir -> do
unlessM (unpacker tmpdir) $
error $ "Failed to unpack " ++ f ++ " for virus scan"
clamscan tmpdir
unhfs dest f' = unlessM (boolSystem "7z" [ Param "x", Param ("-o" ++ dest), File f' ]) $
error $ "Failed extracting hfs " ++ f'

7
Build/OSXMkLibs.hs
View file

@ -49,6 +49,10 @@ installLibs appbase replacement_libs libmap = do
let fulllib = dropWhile (== '/') lib
let dest = appbase </> fulllib
let symdest = appbase </> shortlib
-- This is a hack; libraries need to be in the same
-- directory as the program, so also link them into the
-- extra directory.
let symdestextra = appbase </> "extra" </> shortlib
ifM (doesFileExist dest)
( return Nothing
, do
@ -56,7 +60,8 @@ installLibs appbase replacement_libs libmap = do
putStrLn $ "installing " ++ pathlib ++ " as " ++ shortlib
unlessM (boolSystem "cp" [File pathlib, File dest]
<&&> boolSystem "chmod" [Param "644", File dest]
<&&> boolSystem "ln" [Param "-s", File fulllib, File symdest]) $
<&&> boolSystem "ln" [Param "-s", File fulllib, File symdest]
<&&> boolSystem "ln" [Param "-s", File (".." </> fulllib), File symdestextra]) $
error "library install failed"
return $ Just appbase
)

39
Command/DropKey.hs
View file

@ -1,6 +1,6 @@
{- git-annex command
-
- Copyright 2010 Joey Hess <id@joeyh.name>
- Copyright 2010,2016 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
@ -13,26 +13,45 @@ import Logs.Location
import Annex.Content
cmd :: Command
cmd = noCommit $
cmd = noCommit $ withGlobalOptions [jsonOption] $
command "dropkey" SectionPlumbing
"drops annexed content for specified keys"
(paramRepeating paramKey)
(withParams seek)
(seek <$$> optParser)
seek :: CmdParams -> CommandSeek
seek = withKeys start
data DropKeyOptions = DropKeyOptions
{ toDrop :: [String]
, batchOption :: BatchMode
}
start :: Key -> CommandStart
start key = stopUnless (inAnnex key) $ do
optParser :: CmdParamsDesc -> Parser DropKeyOptions
optParser desc = DropKeyOptions
<$> cmdParams desc
<*> parseBatchOption
seek :: DropKeyOptions -> CommandSeek
seek o = do
unlessM (Annex.getState Annex.force) $
error "dropkey can cause data loss; use --force if you're sure you want to do this"
withKeys start (toDrop o)
case batchOption o of
Batch -> batchInput parsekey $ batchCommandAction . start
NoBatch -> noop
where
parsekey = maybe (Left "bad key") Right . file2key
start :: Key -> CommandStart
start key = do
showStart' "dropkey" key Nothing
next $ perform key
perform :: Key -> CommandPerform
perform key = lockContentForRemoval key $ \contentlock -> do
removeAnnex contentlock
next $ cleanup key
perform key = ifM (inAnnex key)
( lockContentForRemoval key $ \contentlock -> do
removeAnnex contentlock
next $ cleanup key
, next $ return True
)
cleanup :: Key -> CommandCleanup
cleanup key = do

12
Command/Fix.hs
View file

@ -18,11 +18,7 @@ import Annex.Content
import Annex.Perms
import qualified Annex.Queue
import qualified Database.Keys
#ifdef WITH_CLIBS
#ifndef __ANDROID__
import Utility.Touch
#endif
#endif
cmd :: Command
cmd = notDirect $ noCommit $ withGlobalOptions annexedMatchingOptions $
@ -90,20 +86,16 @@ makeHardLink file key = do
fixSymlink :: FilePath -> FilePath -> CommandPerform
fixSymlink file link = do
liftIO $ do
#ifdef WITH_CLIBS
#ifndef __ANDROID__
#if ! defined(mingw32_HOST_OS) && ! defined(__ANDROID__)
-- preserve mtime of symlink
mtime <- catchMaybeIO $ TimeSpec . modificationTime
<$> getSymbolicLinkStatus file
#endif
#endif
createDirectoryIfMissing True (parentDir file)
removeFile file
createSymbolicLink link file
#ifdef WITH_CLIBS
#ifndef __ANDROID__
#if ! defined(mingw32_HOST_OS) && ! defined(__ANDROID__)
maybe noop (\t -> touch file t False) mtime
#endif
#endif
next $ cleanupSymlink file

3
Command/Sync.hs
View file

@ -522,6 +522,5 @@ syncFile ebloom rs af k = do
)
, return []
)
put dest = includeCommandAction $ do
showStart' "copy" k af
put dest = includeCommandAction $
Command.Move.toStart' dest False af k

1
Command/Unannex.hs
View file

@ -13,6 +13,7 @@ import Command
import Config
import qualified Annex
import Annex.Content
import Annex.Perms
import Annex.Content.Direct
import Annex.Version
import qualified Git.Command

1
Command/Unlock.hs
View file

@ -9,6 +9,7 @@ module Command.Unlock where
import Command
import Annex.Content
import Annex.Perms
import Annex.CatFile
import Annex.Version
import Annex.Link

2
Makefile
View file

@ -135,7 +135,7 @@ linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs
sed -i -e 's/^GIT_ANNEX_PACKAGE_INSTALL=/GIT_ANNEX_PACKAGE_INSTALL=$(GIT_ANNEX_PACKAGE_INSTALL)/' "$(LINUXSTANDALONE_DEST)/runshell"
install -d "$(LINUXSTANDALONE_DEST)/bin"
cp dist/build/git-annex/git-annex "$(LINUXSTANDALONE_DEST)/bin/"
cp git-annex "$(LINUXSTANDALONE_DEST)/bin/"
strip "$(LINUXSTANDALONE_DEST)/bin/git-annex"
ln -sf git-annex "$(LINUXSTANDALONE_DEST)/bin/git-annex-shell"
zcat standalone/licences.gz > $(LINUXSTANDALONE_DEST)/LICENSE

8
Messages.hs
View file

@ -54,12 +54,12 @@ import Types.Key
import qualified Annex
showStart :: String -> FilePath -> Annex ()
showStart command file = outputMessage (JSON.start command $ Just file) $
showStart command file = outputMessage (JSON.start command (Just file) Nothing) $
command ++ " " ++ file ++ " "
showStart' :: String -> Key -> Maybe FilePath -> Annex ()
showStart' command key afile = showStart command $
fromMaybe (key2file key) afile
showStart' command key afile = outputMessage (JSON.start command afile (Just key)) $
command ++ " " ++ fromMaybe (key2file key) afile ++ " "
showNote :: String -> Annex ()
showNote s = outputMessage (JSON.note s) $ "(" ++ s ++ ") "
@ -166,7 +166,7 @@ showFullJSON v = withOutputType $ liftIO . go
-}
showCustom :: String -> Annex Bool -> Annex ()
showCustom command a = do
outputMessage (JSON.start command Nothing) ""
outputMessage (JSON.start command Nothing Nothing) ""
r <- a
outputMessage (JSON.end r) ""

15
Messages/JSON.hs
View file

@ -17,13 +17,18 @@ module Messages.JSON (
import Text.JSON
import qualified Utility.JSONStream as Stream
import Types.Key
import Data.Maybe
start :: String -> Maybe String -> IO ()
start command file =
putStr $ Stream.start $ ("command", command) : filepart file
start :: String -> Maybe FilePath -> Maybe Key -> IO ()
start command file key = putStr $ Stream.start $ catMaybes
[ part "command" (Just command)
, part "file" file
, part "key" (fmap key2file key)
]
where
filepart Nothing = []
filepart (Just f) = [("file", f)]
part _ Nothing = Nothing
part l (Just v) = Just (l, v)
end :: Bool -> IO ()
end b = putStr $ Stream.add [("success", b)] ++ Stream.end

52
Utility/DiskFree.hs
View file

@ -1,61 +1,30 @@
{- disk free space checking
{- disk free space checking shim
-
- Copyright 2012, 2014 Joey Hess <id@joeyh.name>
- Copyright 2016 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
{-# LANGUAGE ForeignFunctionInterface, CPP #-}
{-# OPTIONS_GHC -fno-warn-tabs #-}
{-# LANGUAGE CPP #-}
module Utility.DiskFree (
getDiskFree,
getDiskSize
) where
#ifdef WITH_CLIBS
#ifndef __ANDROID__
import Common
import Foreign.C.Types
import Foreign.C.String
import Foreign.C.Error
foreign import ccall safe "libdiskfree.h diskfree" c_diskfree
:: CString -> IO CULLong
foreign import ccall safe "libdiskfree.h disksize" c_disksize
:: CString -> IO CULLong
getVal :: (CString -> IO CULLong) -> FilePath -> IO (Maybe Integer)
getVal getter path = withFilePath path $ \c_path -> do
free <- getter c_path
ifM (safeErrno <$> getErrno)
( return $ Just $ toInteger free
, return Nothing
)
where
safeErrno (Errno v) = v == 0
import System.DiskSpace
import Utility.Applicative
import Utility.Exception
getDiskFree :: FilePath -> IO (Maybe Integer)
getDiskFree = getVal c_diskfree
getDiskFree = catchMaybeIO . getAvailSpace
getDiskSize :: FilePath -> IO (Maybe Integer)
getDiskSize = getVal c_disksize
getDiskSize = fmap diskTotal <$$> catchMaybeIO . getDiskUsage
#else
#ifdef mingw32_HOST_OS
import Common
import System.Win32.File
getDiskFree :: FilePath -> IO (Maybe Integer)
getDiskFree path = catchMaybeIO $ do
(sectors, bytes, nfree, _ntotal) <- getDiskFreeSpace (Just path)
return $ toInteger sectors * toInteger bytes * toInteger nfree
getDiskSize :: FilePath -> IO (Maybe Integer)
getDiskSize _ = return Nothing
#else
#warning Building without disk free space checking support
@ -67,4 +36,3 @@ getDiskSize :: FilePath -> IO (Maybe Integer)
getDiskSize _ = return Nothing
#endif
#endif

2
Utility/LockPool/LockHandle.hs
View file

@ -23,6 +23,8 @@ import Utility.LockPool.STM (LockFile)
import Control.Concurrent.STM
import Control.Exception
import Control.Applicative
import Prelude
data LockHandle = LockHandle P.LockHandle FileLockOps

2
Utility/LockPool/Windows.hs
View file

@ -34,7 +34,7 @@ lockShared file = tryMakeLockHandle P.lockPool file
- content, a separate LockFile should be used. -}
lockExclusive :: LockFile -> IO (Maybe LockHandle)
lockExclusive file = tryMakeLockHandle P.lockPool file
(\p f -> P.tryTakeLock f LockExclusive)
(\p f -> P.tryTakeLock p f LockExclusive)
(\f -> fmap mk <$> F.lockExclusive f)
{- If the initial lock fails, this is a BUSY wait, and does not

21
Utility/Mounts.hs Normal file
View file

@ -0,0 +1,21 @@
{- portability shim for System.MountPoints
-
- Copyright 2016 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-tabs #-}
module Utility.Mounts (getMounts, Mntent(..)) where
import qualified System.MountPoints
import System.MountPoints (Mntent(..))
getMounts :: IO [Mntent]
#ifndef __ANDROID__
getMounts = System.MountPoints.getMounts
#else
getMounts = System.MountPoints.getProcMounts
#endif

97
Utility/Mounts.hsc
View file

@ -1,97 +0,0 @@
{- Interface to mtab (and fstab)
-
- Deprecated; moving to mountpoints library on hackage.
-
- Derived from hsshellscript, originally written by
- Volker Wysk <hsss@volker-wysk.de>
-
- Modified to support BSD, Mac OS X, and Android by
- Joey Hess <id@joeyh.name>
-
- Licensed under the GNU LGPL version 2.1 or higher.
-
-}
{-# LANGUAGE ForeignFunctionInterface #-}
module Utility.Mounts (
Mntent(..),
getMounts
) where
#ifndef __ANDROID__
import Control.Monad
import Foreign
import Foreign.C
#include "libmounts.h"
#else
import Utility.Exception
import Data.Maybe
import Control.Applicative
#endif
import Prelude
{- This is a stripped down mntent, containing only
- fields available everywhere. -}
data Mntent = Mntent
{ mnt_fsname :: String
, mnt_dir :: FilePath
, mnt_type :: String
} deriving (Show, Eq, Ord)
#ifndef __ANDROID__
getMounts :: IO [Mntent]
getMounts = do
h <- c_mounts_start
when (h == nullPtr) $
throwErrno "getMounts"
mntent <- getmntent h []
_ <- c_mounts_end h
return mntent
where
getmntent h c = do
ptr <- c_mounts_next h
if (ptr == nullPtr)
then return $ reverse c
else do
mnt_fsname_str <- #{peek struct mntent, mnt_fsname} ptr >>= peekCString
mnt_dir_str <- #{peek struct mntent, mnt_dir} ptr >>= peekCString
mnt_type_str <- #{peek struct mntent, mnt_type} ptr >>= peekCString
let ent = Mntent
{ mnt_fsname = mnt_fsname_str
, mnt_dir = mnt_dir_str
, mnt_type = mnt_type_str
}
getmntent h (ent:c)
{- Using unsafe imports because the C functions are belived to never block.
- Note that getmntinfo is called with MNT_NOWAIT to avoid possibly blocking;
- while getmntent only accesses a file in /etc (or /proc) that should not
- block. -}
foreign import ccall unsafe "libmounts.h mounts_start" c_mounts_start
:: IO (Ptr ())
foreign import ccall unsafe "libmounts.h mounts_next" c_mounts_next
:: Ptr () -> IO (Ptr ())
foreign import ccall unsafe "libmounts.h mounts_end" c_mounts_end
:: Ptr () -> IO CInt
#else
{- Android does not support getmntent (well, it's a no-op stub in Bionic).
-
- But, the linux kernel's /proc/mounts is available to be parsed.
-}
getMounts :: IO [Mntent]
getMounts = catchDefaultIO [] $
mapMaybe (parse . words) . lines <$> readFile "/proc/mounts"
where
parse (device:mountpoint:fstype:_rest) = Just $ Mntent
{ mnt_fsname = device
, mnt_dir = mountpoint
, mnt_type = fstype
}
parse _ = Nothing
#endif

13
Utility/Process.hs
View file

@ -18,6 +18,7 @@ module Utility.Process (
readProcessEnv,
writeReadProcessEnv,
forceSuccessProcess,
forceSuccessProcess',
checkSuccessProcess,
ignoreFailureProcess,
createProcessSuccess,
@ -129,12 +130,12 @@ writeReadProcessEnv cmd args environ writestdin adjusthandle = do
-- | Waits for a ProcessHandle, and throws an IOError if the process
-- did not exit successfully.
forceSuccessProcess :: CreateProcess -> ProcessHandle -> IO ()
forceSuccessProcess p pid = do
code <- waitForProcess pid
case code of
ExitSuccess -> return ()
ExitFailure n -> ioError $ userError $
showCmd p ++ " exited " ++ show n
forceSuccessProcess p pid = waitForProcess pid >>= forceSuccessProcess' p
forceSuccessProcess' :: CreateProcess -> ExitCode -> IO ()
forceSuccessProcess' _ ExitSuccess = return ()
forceSuccessProcess' p (ExitFailure n) = fail $
showCmd p ++ " exited " ++ show n
-- | Waits for a ProcessHandle and returns True if it exited successfully.
-- Note that using this with createProcessChecked will throw away

52
Utility/Touch.hs Normal file
View file

@ -0,0 +1,52 @@
{- More control over touching a file.
-
- Copyright 2011 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
{-# LANGUAGE CPP #-}
module Utility.Touch (
TimeSpec(..),
touchBoth,
touch
) where
#if ! defined(mingw32_HOST_OS) && ! defined(__ANDROID__)
#if MIN_VERSION_unix(2,7,0)
import System.Posix.Files
import System.Posix.Types
newtype TimeSpec = TimeSpec EpochTime
{- Changes the access and modification times of an existing file.
Can follow symlinks, or not. Throws IO error on failure. -}
touchBoth :: FilePath -> TimeSpec -> TimeSpec -> Bool -> IO ()
touchBoth file (TimeSpec atime) (TimeSpec mtime) follow
| follow = setFileTimes file atime mtime
| otherwise = setSymbolicLinkTimesHiRes file (realToFrac atime) (realToFrac mtime)
touch :: FilePath -> TimeSpec -> Bool -> IO ()
touch file mtime = touchBoth file mtime mtime
#else
import Utility.Touch.Old
#endif
#else
import System.PosixCompat
newtype TimeSpec = TimeSpec EpochTime
{- Noop for Windows -}
touchBoth :: FilePath -> TimeSpec -> TimeSpec -> Bool -> IO ()
touchBoth _ _ _ _ = return ()
touch :: FilePath -> TimeSpec -> Bool -> IO ()
touch _ _ _ = return ()
#endif

26
Utility/Touch.hsc → Utility/Touch/Old.hsc
View file

@ -1,4 +1,4 @@
{- More control over touching a file.
{- Compatability interface for old version of unix, to be removed eventally.
-
- Copyright 2011 Joey Hess <id@joeyh.name>
-
@ -7,32 +7,12 @@
{-# LANGUAGE ForeignFunctionInterface, CPP #-}
module Utility.Touch (
module Utility.Touch.Old (
TimeSpec(..),
touchBoth,
touch
) where
#if MIN_VERSION_unix(2,7,0)
import System.Posix.Files
import System.Posix.Types
newtype TimeSpec = TimeSpec EpochTime
{- Changes the access and modification times of an existing file.
Can follow symlinks, or not. Throws IO error on failure. -}
touchBoth :: FilePath -> TimeSpec -> TimeSpec -> Bool -> IO ()
touchBoth file (TimeSpec atime) (TimeSpec mtime) follow
| follow = setFileTimes file atime mtime
| otherwise = setSymbolicLinkTimesHiRes file (realToFrac atime) (realToFrac mtime)
touch :: FilePath -> TimeSpec -> Bool -> IO ()
touch file mtime = touchBoth file mtime mtime
#else
{- Compatability interface for old version of unix, to be removed eventally. -}
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@ -141,5 +121,3 @@ touchBoth file atime mtime follow =
touchBoth _ _ _ _ = return ()
#endif
#endif
#endif

84
Utility/libdiskfree.c
View file

@ -1,84 +0,0 @@
/* disk free space checking, C mini-library
*
* Copyright 2012, 2014 Joey Hess <id@joeyh.name>
*
* License: BSD-2-clause
*/
/* Include appropriate headers for the OS, and define what will be used to
* check the free space. */
#if defined (__FreeBSD__)
# include <sys/param.h>
# include <sys/mount.h>
# define STATCALL statfs /* statfs64 not yet tested on a real FreeBSD machine */
# define STATSTRUCT statfs
# define BSIZE f_bsize
#else
#if defined __ANDROID__
# warning free space checking code not available for Android
# define UNKNOWN
#else
#if defined (__linux__) || defined (__APPLE__) || defined (__FreeBSD_kernel__) || (defined (__SVR4) && defined (__sun))
/* Linux or OSX or Debian kFreeBSD or Solaris */
/* This is a POSIX standard, so might also work elsewhere too. */
# include <sys/statvfs.h>
# define STATCALL statvfs
# define STATSTRUCT statvfs
# define BSIZE f_frsize
#else
# warning free space checking code not available for this OS
# define UNKNOWN
#endif
#endif
#endif
#include <errno.h>
#include <stdio.h>
unsigned long long int get(const char *path, int req) {
#ifdef UNKNOWN
errno = 1;
return 0;
#else
unsigned long long int v, blocksize;
struct STATSTRUCT buf;
if (STATCALL(path, &buf) != 0)
return 0; /* errno is set */
else
errno = 0;
switch (req) {
case 0:
v = buf.f_blocks;
break;
case 1:
v = buf.f_bavail;
break;
default:
v = 0;
}
blocksize = buf.BSIZE;
return v * blocksize;
#endif
}
/* Checks the amount of disk that is available to regular (non-root) users.
* (If there's an error, or this is not supported,
* returns 0 and sets errno to nonzero.)
*/
unsigned long long int diskfree(const char *path) {
return get(path, 1);
}
/* Gets the total size of the disk. */
unsigned long long int disksize(const char *path) {
return get(path, 0);
}
/*
main () {
printf("%lli\n", diskfree("."));
}
*/

1
Utility/libdiskfree.h
View file

@ -1 +0,0 @@
unsigned long long int diskfree(const char *path);

103
Utility/libmounts.c
View file

@ -1,103 +0,0 @@
/* mounted filesystems, C mini-library
*
* Copyright (c) 1980, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2001
* David Rufino <daverufino@btinternet.com>
* Copyright 2012
* Joey Hess <id@joeyh.name>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include "libmounts.h"
#ifdef GETMNTENT
/* direct passthrough the getmntent */
FILE *mounts_start (void) {
return setmntent("/etc/mtab", "r");
}
int mounts_end (FILE *fp) {
return endmntent(fp);
}
struct mntent *mounts_next (FILE *fp) {
return getmntent(fp);
}
#endif
#ifdef GETMNTINFO
/* getmntent emulation using getmntinfo */
FILE *mounts_start (void) {
return ((FILE *)0x1); /* dummy non-NULL FILE pointer, not used */
}
int mounts_end (FILE *fp) {
return 1;
}
static struct mntent _mntent;
static struct mntent *statfs_to_mntent (struct statfs *mntbuf) {
_mntent.mnt_fsname = mntbuf->f_mntfromname;
_mntent.mnt_dir = mntbuf->f_mntonname;
_mntent.mnt_type = mntbuf->f_fstypename;
_mntent.mnt_opts = NULL;
_mntent.mnt_freq = 0;
_mntent.mnt_passno = 0;
return (&_mntent);
}
static int pos = -1;
static int mntsize = -1;
struct statfs *mntbuf = NULL;
struct mntent *mounts_next (FILE *fp) {
if (pos == -1 || mntsize == -1)
mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
++pos;
if (pos == mntsize) {
pos = mntsize = -1;
mntbuf = NULL;
return NULL;
}
return (statfs_to_mntent(&mntbuf[pos]));
}
#endif
#ifdef UNKNOWN
/* dummy, do-nothing version */
FILE *mounts_start (void) {
return ((FILE *)0x1);
}
int mounts_end (FILE *fp) {
return 1;
}
struct mntent *mounts_next (FILE *fp) {
return NULL;
}
#endif

38
Utility/libmounts.h
View file

@ -1,38 +0,0 @@
/* Include appropriate headers for the OS, and define what will be used. */
#if defined (__FreeBSD__) || defined (__APPLE__)
# include <sys/param.h>
# include <sys/ucred.h>
# include <sys/mount.h>
# define GETMNTINFO
#else
#if defined __ANDROID__
/* Android is handled by the Haskell code, not here. */
# define UNKNOWN
#else
#if defined (__linux__) || defined (__FreeBSD_kernel__)
/* Linux or Debian kFreeBSD */
#include <mntent.h>
# define GETMNTENT
#else
# warning mounts listing code not available for this OS
# define UNKNOWN
#endif
#endif
#endif
#include <stdio.h>
#ifndef GETMNTENT
struct mntent {
char *mnt_fsname;
char *mnt_dir;
char *mnt_type;
char *mnt_opts; /* not filled in */
int mnt_freq; /* not filled in */
int mnt_passno; /* not filled in */
};
#endif
FILE *mounts_start (void);
int mounts_end (FILE *fp);
struct mntent *mounts_next (FILE *fp);

6
debian/changelog vendored
View file

@ -6,6 +6,12 @@ git-annex (6.20160230) UNRELEASED; urgency=medium
* Fix shared lock file FD leak.
* Fix metadata hook behavior when multiple files are added at once.
Thanks, Klaus Ethgen.
* Added dependencies on haskell mountpoints and disk-free-space
libraries, removing FFI code from git-annex.
* dropkey: Add --batch and --json.
* Fix OSX dmg to include libraries needed by bundled gpg,
lost in last release.
* Always try to thaw content, even when annex.crippledfilesystem is set.
-- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400

26
debian/control vendored
View file

@ -31,18 +31,18 @@ Build-Depends:
libghc-stm-dev (>= 2.3),
libghc-dbus-dev (>= 0.10.7) [linux-any],
libghc-fdo-notify-dev (>= 0.3) [linux-any],
libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-clientsession-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-warp-dev (>= 3.0.0.5) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-warp-tls-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-wai-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-wai-extra-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64el s390x],
libghc-dav-dev (>= 1.0) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x sparc64 hppa alpha hurd-i386],
libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 arm64 armhf kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390x]
libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-clientsession-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-warp-dev (>= 3.0.0.5) [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-warp-tls-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-wai-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-wai-extra-dev [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
libghc-dav-dev (>= 1.0)
libghc-persistent-dev,
libghc-persistent-template-dev,
libghc-persistent-sqlite-dev,
@ -72,6 +72,8 @@ Build-Depends:
libghc-optparse-applicative-dev (>= 0.11.0),
libghc-torrent-dev,
libghc-concurrent-output-dev,
libghc-disk-free-space-dev,
libghc-mountpoints-dev,
libghc-magic-dev,
lsof [linux-any],
ikiwiki,

45
debian/copyright vendored
View file

@ -35,10 +35,6 @@ Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
License: other
Free to modify and redistribute with due credit, and obviously free to use.
Files: Utility/Mounts.hsc
Copyright: Volker Wysk <hsss@volker-wysk.de>
License: LGPL-2.1+
Files: Annex/DirHashes.hs
Copyright: 2001 Ian Lynagh
2010-2015 Joey Hess <id@joeyh.name>
@ -49,42 +45,6 @@ Copyright: 2014 Joey Hess <id@joeyh.name>
2016 Klaus Ethgen <Klaus@Ethgen.ch>
License: GPL-3+
Files: Utility/libmounts.c
Copyright: 1980, 1989, 1993, 1994 The Regents of the University of California
2001 David Rufino <daverufino@btinternet.com>
2012 Joey Hess <id@joeyh.name>
License: BSD-3-clause
* Copyright (c) 1980, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2001
* David Rufino <daverufino@btinternet.com>
* Copyright 2012
* Joey Hess <id@joeyh.name>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
Files: static/jquery*
Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
© 2011 The Dojo Foundation
@ -140,11 +100,6 @@ License: GPL-3+
this package's source, or in /usr/share/common-licenses/GPL-3 on
Debian systems.
License: LGPL-2.1+
The full text of version 2.1 of the LGPL is distributed as doc/license/LGPL
in this package's source, or in /usr/share/common-licenses/LGPL-2.1
on Debian systems.
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions

4
doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5.mdwn
View file

@ -2,3 +2,7 @@
standalone builds leap forward a bit too fast in terms of their demand on modern kernel. Up until a month ago, standalone build worked at least on CentOS 6.5 with 2.6.32-431.11.2.el6.x86_64 (although [already didn't on ancient but still in use RHEL5 with 2.6.18](https://github.com/datalad/datalad/issues/176#issuecomment-114612365)). Current build from 20150916 doesn't work on CentOS 6.5 any longer. No matter how much I like people to use more recent releases of their distributions, it is infeasible to demand people to do that. It would be great if standalone builds were carried out on some elder kernel/libc environment to make git-annex standalone builds usable there.
> [[done]]; the ancient build provides this. It's now build with stack, so
> it gets most features enabled. (Except xmpp, notably.) This does mean
> it will only get library security fixes once git-annex's stack.yaml
> is updated to require a new version of the affected library. --[[Joey]]

3
doc/bugs/Utility__47__libdiskfree.c_more_BSD_friendly.mdwn
View file

@ -79,3 +79,6 @@ The diff probably needs check, improvement...
Not tested this "feature" yet, I got another issue which blocks me for now.
> Well, this code has been removing from git-annex, and it's now using
> <http://hackage.haskell.org/package/disk-free-space>. I think that
> library is somewhat more portable. [[done]]

107
doc/bugs/git-annex:_failed_to_lock_content.mdwn Normal file
View file

@ -0,0 +1,107 @@
### Please describe the problem.
Cannot drop unused files on a USB drive, failing with the error message "git-annex: failed to lock content".
### What steps will reproduce the problem?
1. Installed stand-alone verison of git-annex on Ubuntu sometime last month
2. Created a repository on my main HD, upgraded to v6
3. Added files to it
4. Created a USB (vfat) repo using the webapp without encryption; stopped the webapp, and ran `git annex get` on the USB repo.
5. Saw that I had added some files to the repo by mistake, and used `git annex unannex $FILES` on the main HD, then `git annex unused`, then `git annex dropunused 1-101`
6. Re-synced both repos
7. In the USB repo, `git annex unused` showed the same list as on the HD.
8. `git annex dropunused 1-101` then fails
9. Installed the latest stand-alone version (6.20160229-gbe4820c)
10. tried dropping again, didn't work; reboot the computer; tried dropping again, didn't work.
11. ran `git annex upgrade` on USB repo, tried dropping agian, no success
### What version of git-annex are you using? On what operating system?
* git annex version 6.20160229-gbe4820c
* Ubuntu 15.10
### Please provide any additional information below.
[[!format sh """
/media/ellis/USB04/repo/taiji-lib
% cat annex/unused
2 SHA256E-s562039928--04903c0b7d4e16062b3dc0bf17a84ce7943545d9437b80947ff98a3d3483e66e.AVI 1457129072.853555s
101 SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav 1457129072.853555s
...
44 SHA256E-s561941624--fdf6f89d9403464d4c494eac67fc1525aa6b9b0adc96be99f7d42e7f5472e44c.avi 1457129072.853555s
/media/ellis/USB04/repo/taiji-lib
% git annex dropunused 101 --debug 13:09:28
[2016-03-05 13:09:28.675403] read: git ["--git-dir=.","--literal-pathspecs","show-ref","git-annex"]
[2016-03-05 13:09:28.677635] process done ExitSuccess
[2016-03-05 13:09:28.67773] read: git ["--git-dir=.","--literal-pathspecs","show-ref","--hash","refs/heads/git-annex"]
[2016-03-05 13:09:28.679775] process done ExitSuccess
[2016-03-05 13:09:28.680234] read: git ["--git-dir=.","--literal-pathspecs","log","refs/heads/git-annex..aee0b39b5232c369721c08eb782a7143ba2f8901","-n1","--pretty=%H"]
[2016-03-05 13:09:28.685879] process done ExitSuccess
[2016-03-05 13:09:28.686006] read: git ["--git-dir=.","--literal-pathspecs","log","refs/heads/git-annex..2b2b2747a6533f115867cc7a70a426764fc90286","-n1","--pretty=%H"]
[2016-03-05 13:09:28.688135] process done ExitSuccess
[2016-03-05 13:09:28.688227] read: git ["--git-dir=.","--literal-pathspecs","log","refs/heads/git-annex..4f4acf1555539a7bcb520e4befbeab803f220f67","-n1","--pretty=%H"]
[2016-03-05 13:09:28.690357] process done ExitSuccess
[2016-03-05 13:09:28.691327] chat: git ["--git-dir=.","--literal-pathspecs","cat-file","--batch"]
dropunused 101 git-annex: failed to lock content: ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav: openFd: permission denied (Permission denied)
/media/ellis/USB04/repo/taiji-lib
% ls -l ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
-r--r--r-- 1 ellis ellis 38464078 Mar 4 18:32 ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
/media/ellis/USB04/repo/taiji-lib
% strace -e file -f git annex dropunused 101 --debug
...
[pid 4646] openat(AT_FDCWD, "./objects/pack", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 3
[pid 4646] access("./objects/pack/pack-80b045ea51312a9d40fdefd0c76ef54d494cd5c1.keep", F_OK) = -1 ENOENT (No such file or directory)
[pid 4646] stat("./objects/pack/pack-80b045ea51312a9d40fdefd0c76ef54d494cd5c1.pack", {st_mode=S_IFREG|0644, st_size=828068, ...}) = 0
[pid 4646] access("./objects/pack/pack-69caefc604cfbcb2f374ab0b4266f444fec4930f.keep", F_OK <unfinished ...>
[pid 4636] --- SIGVTALRM {si_signo=SIGVTALRM, si_code=SI_TIMER, si_pid=0, si_uid=1, si_value=0} ---
[pid 4646] <... access resumed> ) = -1 ENOENT (No such file or directory)
[pid 4646] stat("./objects/pack/pack-69caefc604cfbcb2f374ab0b4266f444fec4930f.pack", {st_mode=S_IFREG|0644, st_size=55237, ...}) = 0
[pid 4646] access("./objects/pack/pack-f6711fe647796d2143d12b6f915686d373f4e69b.keep", F_OK) = -1 ENOENT (No such file or directory)
[pid 4646] stat("./objects/pack/pack-f6711fe647796d2143d12b6f915686d373f4e69b.pack", {st_mode=S_IFREG|0644, st_size=116702, ...}) = 0
[pid 4646] access("./objects/pack/pack-31185be34b1a30abb4b6e427c1ec924cfee300af.keep", F_OK) = -1 ENOENT (No such file or directory)
[pid 4646] stat("./objects/pack/pack-31185be34b1a30abb4b6e427c1ec924cfee300af.pack", {st_mode=S_IFREG|0644, st_size=116197, ...}) = 0
[pid 4646] getcwd("/media/ellis/USB04/repo/taiji-lib", 129) = 34
[pid 4646] open("./objects/info/alternates", O_RDONLY|O_NOATIME) = -1 ENOENT (No such file or directory)
[pid 4646] open("./objects/pack/pack-f6711fe647796d2143d12b6f915686d373f4e69b.idx", O_RDONLY|O_NOATIME) = 3
[pid 4646] open("./objects/pack/pack-31185be34b1a30abb4b6e427c1ec924cfee300af.idx", O_RDONLY|O_NOATIME) = 3
[pid 4646] open("./objects/pack/pack-80b045ea51312a9d40fdefd0c76ef54d494cd5c1.idx", O_RDONLY|O_NOATIME) = 3
[pid 4646] open("./objects/pack/pack-69caefc604cfbcb2f374ab0b4266f444fec4930f.idx", O_RDONLY|O_NOATIME) = 3
[pid 4646] open("./objects/ae/e0b39b5232c369721c08eb782a7143ba2f8901", O_RDONLY|O_NOATIME) = 3
[pid 4646] open("./objects/1d/ca126189c826e37b03897754fab7e8a8687683", O_RDONLY|O_NOATIME) = 3
[pid 4636] stat("./annex/unused", {st_mode=S_IFREG|0644, st_size=11160, ...}) = 0
[pid 4636] open("./annex/unused", O_RDONLY|O_NOCTTY|O_NONBLOCK) = 11
[pid 4636] --- SIGVTALRM {si_signo=SIGVTALRM, si_code=SI_TIMER, si_pid=0, si_uid=0, si_value=0} ---
[pid 4636] stat("./annex/badunused", {st_mode=S_IFREG|0644, st_size=0, ...}) = 0
[pid 4636] open("./annex/badunused", O_RDONLY|O_NOCTTY|O_NONBLOCK) = 11
[pid 4636] stat("./annex/tmpunused", {st_mode=S_IFREG|0644, st_size=0, ...}) = 0
[pid 4636] open("./annex/tmpunused", O_RDONLY|O_NOCTTY|O_NONBLOCK) = 11
dropunused 101 [pid 4636] stat("./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav", {st_mode=S_IFREG|0444, st_size=38464078, ...}) = 0
[pid 4636] stat("./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav", {st_mode=S_IFREG|0444, st_size=38464078, ...}) = 0
[pid 4636] stat("./annex", {st_mode=S_IFDIR|0755, st_size=32768, ...}) = 0
[pid 4636] open("./annex/keys.lck", O_RDWR|O_CREAT, 0666) = 11
[pid 4636] stat("./annex/keys/db", 0x7f2247d0ceb0) = -1 ENOENT (No such file or directory)
[pid 4636] --- SIGVTALRM {si_signo=SIGVTALRM, si_code=SI_TIMER, si_pid=0, si_uid=9, si_value=0} ---
[pid 4636] stat("./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav", {st_mode=S_IFREG|0444, st_size=38464078, ...}) = 0
[pid 4636] open("./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav", O_RDWR) = -1 EACCES (Permission denied)
git-annex: failed to lock content: ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav: openFd: permission denied (Permission denied)
[pid 4638] +++ exited with 0 +++
[pid 4639] +++ exited with 0 +++
[pid 4637] +++ exited with 0 +++
[pid 4636] +++ exited with 1 +++
[pid 4623] --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4636, si_status=1, si_utime=1, si_stime=4} ---
[pid 4623] +++ exited with 1 +++
+++ exited with 0 +++
"""]]
Could the problem have something to do with the file having permission 0444 and trying to opening it O_RDWR?
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Been using it since your kickstarter campaign!
> [[done]] --[[Joey]]

25
doc/bugs/git-annex:_failed_to_lock_content/comment_1_cf9f4221695d620dfa768b0216171690._comment Normal file
View file

@ -0,0 +1,25 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2016-03-07T16:58:35Z"
content="""
I replicated this as best I could, and the dropunused succeeded. But my
strace has an extra chmod:
stat("./annex/objects/02e/a64/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133", {st_mode=S_IFREG|0444, st_size=30, ...}) = 0
stat("./annex/objects/02e/a64/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133", {st_mode=S_IFREG|0444, st_size=30, ...}) = 0
chmod("./annex/objects/02e/a64/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133", 0100644) = 0
open("./annex/objects/02e/a64/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133/SHA256E-s30--b6eac296ebeab4b5593387489571654cd5019d8bb3bc3bc08ac8a41e22bad133", O_RDWR) = 16
So, it kind of looks like it checked the permissions and decided 0444 was good
enough and didn't chmod it to allow write (in order to lock it for removal).
The only way I can see how that could perhaps happen is if git-anenx thinks
it's in a crippled filesystem that doesn't support chmod. But then the file
shouldn't be locked down like that. I was, though, able to reproduce
that behavior after running `git config annex.crippledfilesystem true`
So, I need more information: What filesystem is the USB drive formatted with,
and can you run `git config --list` in the git repository on the drive and
paste the output please.
"""]]

31
doc/bugs/git-annex:_failed_to_lock_content/comment_2_a22011e4b68005c87c4bf9167c22a13f._comment Normal file
View file

@ -0,0 +1,31 @@
[[!comment format=mdwn
username="ellis@9dd4c3615b5ff78a457c5832488610886fd6b255"
nickname="ellis"
subject="comment 2"
date="2016-03-08T19:26:03Z"
content="""
Thanks Joey, here's the output from `git config --list`:
color.diff=auto
color.status=auto
color.branch=auto
push.default=simple
core.precomposeunicode=true
credential.helper=/usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring
core.repositoryformatversion=0
core.filemode=false
core.bare=true
core.symlinks=false
core.ignorecase=true
core.fsyncobjectfiles=true
annex.uuid=a8ed0f4a-47c9-4289-947d-2f4650e9ede6
annex.sshcaching=false
annex.crippledfilesystem=true
annex.version=6
remote.lorax.url=../../../../../mnt/taiji07/taiji-lib
remote.lorax.fetch=+refs/heads/*:refs/remotes/lorax/*
remote.lorax.annex-uuid=9ea9a021-e3c6-4d55-a118-f3f55387ef40
filter.annex.smudge=git-annex smudge %f
filter.annex.clean=git-annex smudge --clean %f
"""]]

9
doc/bugs/git-annex:_failed_to_lock_content/comment_3_4d58bfb2ba40e280cf9bcb8a054757f6._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="ellis"
subject="comment 3"
date="2016-03-08T19:52:21Z"
content="""
And the file system is VFAT:
/dev/sde1 on /media/ellis/USB04 type vfat (rw,nosuid,nodev,relatime,uid=1000,gid=1000,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,showexec,utf8,flush,errors=remount-ro,uhelper=udisks2)
"""]]

16
doc/bugs/git-annex:_failed_to_lock_content/comment_4_431885c1487035415acbad59b021a548._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2016-03-08T20:38:25Z"
content="""
Thanks, that's consistent with my analysis.
The only thing I don't understand is how a file on a vfat filesystem can
have mode 444. When I make a vfat filesystem and mount it on linux,
chmod doesn't change the mode of files at all; they're hardcoded at 755.
Is your drive mounted with any interesting mount options? Paste the output
from `mount` for the drive.
Can you chmod the file to have some mode other than 444?
"""]]

28
doc/bugs/git-annex:_failed_to_lock_content/comment_5_d8c8077e4dc1e0660d082482012b6594._comment Normal file
View file

@ -0,0 +1,28 @@
[[!comment format=mdwn
username="ellis"
subject="comment 5"
date="2016-03-09T10:04:14Z"
content="""
1) I'm afraid I don't have any real knowledge of VFAT -- always avoided it, but this is a shared drive, so it seemed best to just leave it with the factory formatting.
2) The output from `mount` is shown at the bottom of comment 3. The drive gets automounted when I plug it in.
3) \"Can you chmod the file to have some mode other than 444?\"
Yes. Here's a console transcript. After running `chmod 644`, git annex was able to drop the file.
% cd /media/ellis/USB04/repo/taiji-lib
% ls -l ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
-r--r--r-- 1 ellis ellis 38464078 Mär 4 18:32 ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
% chmod 644 ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
% ls -l ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
-rw-r--r-- 1 ellis ellis 38464078 Mär 4 18:32 ./annex/objects/97e/78c/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav/SHA256E-s38464078--0db38599ed526d248857015c7b8e1b177af646939f8e0c8004b17a931ce2e101.wav
% git annex dropunused 101 --force
dropunused 101 ok
(recording state in git...)
"""]]

11
doc/bugs/git-annex:_failed_to_lock_content/comment_6_ced3c56607762562c1d21fd821d7c779._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="joey"
subject="""comment 6"""
date="2016-03-09T17:31:18Z"
content="""
Ok, I managed to get a vfat that honors file perms with those mount
options.
I'm going to make git-annex always try to chmod the file, even if it's on a
crippled filesystem. That should solve it.
"""]]

32
doc/bugs/hash_changed.mdwn Normal file
View file

@ -0,0 +1,32 @@
### Please describe the problem.
I ran `git annex fsck` on some files, and the fsck reported that hashes were incorrect and the files were moved.
### What steps will reproduce the problem?
I don't know.
### What version of git-annex are you using? On what operating system?
```
git-annex version: 6.20160229
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
```
on NixOS linux 64 bit - unstable channel
### Please provide any additional information below.
The problem was on several disks, different manufacturer, different disk size, etc. The fsck always transformed hashA -> hashB, so the hashes were equal before and after the fsck run on all disks, though the link to the "old" file was not fixed to point to the "new" file.
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
I use annex for years now, never had a problem with it. It is one of the most awesome pieces of software I've seen in the last 10 years, though I only use a really small part of it. Sometimes it bugs me a little that it consumes quite a lot of memory on large repositories, though most of the time this is not an issue for me.
> I think this was not a bug in hashing, just a corrupted file that
> spread to several repositories. More recent git-annex versions checksum
> files after transfer so detect the problem.
>
> Since it was resolved to reporter's satisfaction, [[done]] --[[Joey]]

10
doc/bugs/hash_changed/comment_1_7ec190a665b50eefadff59949a576bbb._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="mail@f1d77c48f528d8c7b885900281887e045ad5114e"
nickname="mail"
subject="Solution"
date="2016-03-09T16:03:35Z"
content="""
The solution proposed by \"joeyh\" on irc was to remove the symlink (`git rm` it) and then move the actual file from .git/annex/bad back to the file and `git annex add` it again.
Worked beautifully.
"""]]

54
doc/bugs/some_tests_fail_while_running_under_NFS.mdwn Normal file
View file

@ -0,0 +1,54 @@
### Please describe the problem.
4 out of 269 tests failed (4468.00s)
hard to assess how critical they are...
### What steps will reproduce the problem?
run git annex test
### What version of git-annex are you using? On what operating system?
6.20160307+gitgb095561-1~ndall+1
### Please provide any additional information below.
[Full log](http://www.onerussian.com/tmp/git-annex-tests-6.20160307+gitgb095561-1~ndall+1.log)
[[!format sh """
smaug:/mnt/nfs/scrap/datalad/test_annex
$> grep -B5 FAIL git-annex-tests-6.20160307+gitgb095561-1~ndall+1.log
crypto: OK (50.57s)
preferred content: OK (20.36s)
add subdirs: OK (8.97s)
addurl: .t/tmprepo73/.git/annex/keys: removeDirectoryRecursive: unsatisfied constraints (Directory not empty)
sleeping 10 seconds and will retry directory cleanup
FAIL
--
293ed4c..c16b350 git-annex -> synced/git-annex
dd272eb..ffe1721 master -> synced/master
OK (11.64s)
addurl: .t/tmprepo73/.git/annex/keys/.nfs0000000009a305870000020e: removeDirectoryRecursive: resource busy (Device or resource busy)
sleeping 10 seconds and will retry directory cleanup
FAIL
--
0993b09..c09ddc4 git-annex -> synced/git-annex
a823824..520f58c master -> synced/master
OK (13.67s)
addurl: .t/tmprepo73/.git/annex/keys/.nfs0000000009a305870000020e: removeDirectoryRecursive: resource busy (Device or resource busy)
sleeping 10 seconds and will retry directory cleanup
FAIL
--
OK (14.59s)
addurl: On branch master
nothing to commit, working directory clean
.t/tmprepo73/.git/annex/keys/.nfs0000000009a305870000020e: removeDirectoryRecursive: resource busy (Device or resource busy)
sleeping 10 seconds and will retry directory cleanup
FAIL
# End of transcript or log.
"""]]
[[!meta author=yoh]]

8
doc/bugs/some_tests_fail_while_running_under_NFS/comment_1_8e0f72f633ec79bd373b009046ab66b7._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2016-03-09T17:15:13Z"
content="""
This is all down to those nfs lock files, so finding a way to probe for an
NFS system and auto-enable pidlock is the best way to fix this.
"""]]

6
doc/design/adjusted_branches.mdwn
View file

@ -231,6 +231,12 @@ which to not delete when reversing it?
So, a reverse filter may need some state that was collected when running
the filter forwards, in order to decide what to do.
Alternatively, instead of reverse filtering the whole adjusted tree,
look at just the new commit that's being propigated back from the
adjusted to master branch. Get the diff from it to the previous
commit; the changes that were made. Then de-adjust those changes,
and apply the changes to the master branch.
## push
The new master branch can then be pushed out to remotes. The

72
doc/devblog/day_369-370__paddling_furiously.mdwn Normal file
View file

@ -0,0 +1,72 @@
Tuesday was spent dealing with lock files. Turned out there were some bugs
in the `annex.pidlock` configuration that prevented it from working, and
could even lead to data loss.
And then more lock files today, since I needed to lock git's index file the
same way git does. This involved finding out how to emulate `O_EXCL` under
Windows. Urgh.
Finally got back to working on [[design/adjusted_branches]] today. And, I've just
gotten syncing of commits from adjusted branches back to the orginal branch
working! Time for short demo of what I've been building for the past couple
weeks:
joey@darkstar:~/tmp/demo>ls -l
total 4
lrwxrwxrwx 1 joey joey 190 Mar 3 17:09 bigfile -> .git/annex/objects/zx/X8/SHA256E-s1048576--44ee9fdd91d4bc567355f8b2becd5fe137b9e3aafdfe804341ce2bcc73b8013f/SHA256E-s1048576--44ee9fdd91d4bc567355f8b2becd5fe137b9e3aafdfe804341ce2bcc73b8013f
joey@darkstar:~/tmp/demo>git annex adjust
Switched to branch 'adjusted/master(unlocked)'
ok
joey@darkstar:~/tmp/demo#master(unlocked)>ls -l
total 4
-rw-r--r-- 1 joey joey 1048576 Mar 3 17:09 bigfile
Entering the adjusted branch unlocked all the files.
joey@darkstar:~/tmp/demo#master(unlocked)>git mv bigfile newname
joey@darkstar:~/tmp/demo#master(unlocked)>git commit -m rename
[adjusted/master(unlocked) 29e1bc8] rename
1 file changed, 0 insertions(+), 0 deletions(-)
rename bigfile => newname (100%)
joey@darkstar:~/tmp/demo#master(unlocked)>git log --pretty=oneline
29e1bc835080298bbeeaa4a9faf42858c050cad5 rename
a195537dc5beeee73fc026246bd102bae9770389 git-annex adjusted branch
5dc1d94d40af4bf4a88b52805e2a3ae855122958 add
joey@darkstar:~/tmp/demo#master(unlocked)>git log --pretty=oneline master
5dc1d94d40af4bf4a88b52805e2a3ae855122958 add
The commit was made on top of the commit that generated the adjusted branch.
It's not yet reached the master branch.
joey@darkstar:~/tmp/demo#master(unlocked)>git annex sync
commit ok
joey@darkstar:~/tmp/demo#master(unlocked)>git log --pretty=oneline
b60c5d6dfe55107431b80382596f14f4dcd259c9 git-annex adjusted branch
9c36848f078a2bb7a304010e962a2b7318c0877c rename
5dc1d94d40af4bf4a88b52805e2a3ae855122958 add
joey@darkstar:~/tmp/demo#master(unlocked)>git log --pretty=oneline master
9c36848f078a2bb7a304010e962a2b7318c0877c rename
5dc1d94d40af4bf4a88b52805e2a3ae855122958 add
Now the commit has reached master. Notice how the history of the adjusted
branch was rebased on top of the updated master branch as well.
joey@darkstar:~/tmp/demo#master(unlocked)>ls -l
total 1024
-rw-r--r-- 1 joey joey 1048576 Mar 3 17:09 newname
joey@darkstar:~/tmp/demo#master(unlocked)>git checkout master
Switched to branch 'master'
joey@darkstar:~/tmp/demo>ls -l
total 4
lrwxrwxrwx 1 joey joey 190 Mar 3 17:12 newname -> .git/annex/objects/zx/X8/SHA256E-s1048576--44ee9fdd91d4bc567355f8b2becd5fe137b9e3aafdfe804341ce2bcc73b8013f/SHA256E-s1048576--44ee9fdd91d4bc567355f8b2becd5fe137b9e3aafdfe804341ce2bcc73b8013f
Just as we'd want, the file is locked in master, and unlocked in
the adjusted branch.
(Not shown: git annex sync will also merge in and adjust changes from remotes.)
So, that all looks great! But, it's cheating a bit, because it locks
all files when updating the master branch. I need to make it remember,
somehow, when files were originally unlocked, and keep them unlocked. Also
want to implement other adjustments, like hiding files whose content is not
present.

21
doc/devblog/day_371__catching_up.mdwn Normal file
View file

@ -0,0 +1,21 @@
Over the weekend, I converted the linux "ancient" autobuilder to use stack.
This makes it easier to get all the recent versions of all the haskell
dependencies installed there.
Also, merged my no-ffi branch, removing some library code from git-annex
and adding new dependencies. It's good to remove code.
Today, fixed the OSX dmg file -- its bundled gpg was broken. I pushed out a
new version of the OSX dmg file with the fix.
With the recent incident in mind of malware inserted into the Transmission
dmg, I've added a virus scan step to the release process
for all the git-annex images. This way, we'll notice if an autobuilder
gets a virus.
Also caught up on some backlog, although the remaining backlog is a little
larger than I'd like at 135 messages.
Hope to work some more on adjusted branches this week. A few mornings ago,
I had what may be a key insight about how to reverse adjustments when
propigating changes back from the adjusted branch.

19
doc/forum/How_to_shrink_transfer_repo__63__/comment_1_6b110311f4c147dc315c4f610cf56afa._comment Normal file
View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="Horus"
subject="comment 1"
date="2016-03-03T18:17:35Z"
content="""
Ok, I try to do 2) but it still fails:
```
dropunused 265 (from astarte...) (unsafe)
Could only verify the existence of 0 out of 1 necessary copies
Rather than dropping this file, try using: git annex move
(Use --force to override this check, or adjust numcopies.)
failed
```
all repositories are reachable directly.
"""]]

21
doc/forum/How_to_shrink_transfer_repo__63__/comment_2_8e596cd606935d82bd6604f5c9c500a2._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2016-03-07T17:52:21Z"
content="""
Normally, files should be dropped from the transfer repository once they
have reached all known client repositories. The drop should be done by
the client repositories, so the transfer repo doesn't need access to the
client repos to verify that they have a copy.
But your problem is with *unused* files that are hanging around in
the transfer repo. This can happen if a file reaches the transfer repo and
then gets deleted from a client, and so the other clients never download it.
To clean out those files, run: `git annex dropunused --from astarte --force`
You need to "use the force" because the unused file is only present in the
transfer repo. If you want to get rid of its content for good, that's fine.
A safer option is to move the unused file to the local repo: `git annex
move --unused --from astarte`
"""]]

7
doc/forum/How_to_shrink_transfer_repo__63__/comment_3_c536a946b717e9bdcb883b58cd0336ae._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="Horus"
subject="comment 3"
date="2016-03-07T20:11:03Z"
content="""
Thanks, that worked!
"""]]

8
doc/forum/Undo_git_merge_git-annex/comment_1_0b15f7a8c3bca87dcbf748a229e13a4b._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a"
nickname="frederik"
subject="comment 1"
date="2016-03-04T14:06:17Z"
content="""
git revert -m 1 [sha_of_merge] seems to have done the trick
"""]]

9
doc/forum/Undo_git_merge_git-annex/comment_2_c5a8839c53145a3b0d44950096c5180f._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2016-03-07T17:25:08Z"
content="""
`git reflog` is a handy command to get to know, for getting out of
situations along the lines of "I did $something wrong and want to get back
to a previous version of a branch"
"""]]

12
doc/git-annex-dropkey.mdwn
View file

@ -17,6 +17,18 @@ to have a file in the git repository pointing at them.
Warning: This command does not check that enough other copies of the content
exist; using it can easily result in data loss.
# OPTIONS
* `--batch`
Enables batch mode, in which lines containing keys to drop are read from
stdin.
* `--json`
Enable JSON output. This is intended to be parsed by programs that use
git-annex. Each line of output is a JSON object.
# SEE ALSO
[[git-annex]](1)

3
doc/install/Linux_standalone.mdwn
View file

@ -26,8 +26,7 @@ linux systems.
* [[forum_thread|forum/new_linux_arm_tarball_build]]
The build for ancient kernels is for use with Linux kernel versions
such as 2.6.32. It is missing some features, like SHA3 support and
the webapp. It will work on both 32 and 64 bit systems.
such as 2.6.32. It will work on both 32 and 64 bit systems.
## autobuilds

7
doc/install/Linux_standalone/comment_3_eaa9b0532d4629b61f3a684886b1d4f9._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="nasava"
subject="Ancient variant for Armel"
date="2016-03-08T22:02:29Z"
content="""
I have a NAS running Linux Kernel 2.6.36 unfortunately not possible updating it. The newest standalone build complains about \"kernel too old\". Is there a variant somewhere for ancient armel also like for x86_32? Or how can I build one?
"""]]

7
doc/install/Linux_standalone/comment_4_070689ea45739d06260da07d1369dff9._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2016-03-09T17:16:54Z"
content="""
I've opened a todo, [[todo/add_ancient_armel_build]]
"""]]

7
doc/install/fromsource.mdwn
View file

@ -73,8 +73,8 @@ to be broken from time to time.
Inside the source tree, run:
cabal install -j -f"-assistant -webapp -webdav -pairing -xmpp -dns" --only-dependencies
cabal configure -f"-assistant -webapp -webdav -pairing -xmpp -dns"
cabal install -j -f"-assistant -webapp -webdav -pairing -xmpp -dns -dbus -magicmime" --only-dependencies
cabal configure -f"-assistant -webapp -webdav -pairing -xmpp -dns -dbus -magicmime"
cabal build -j
PATH=$HOME/bin:$PATH
cabal install --bindir=$HOME/bin
@ -98,4 +98,5 @@ Once the C libraries are installed, run inside the source tree:
When building with cabal, you can optionally enable the
[[EKG monitoring interface|ekg]]. This is great for debugging resource
usage problems. Just pass `-f+EKG` to `cabal configure`
usage problems, but not for general-purpose builds.
Just pass `-f+EKG` to `cabal configure`

2
doc/license.mdwn
View file

@ -9,6 +9,6 @@ under the AGPL as a whole. git-annex built without the webapp does
not include this code, so remains GPLed.
git-annex contains a variety of other code, artwork, etc copyright by
others, under a variety of licences, including the [[LGPL]], BSD,
others, under a variety of licences, including the BSD,
MIT, and Apache 2.0 licenses. For details, see
[this file](http://source.git-annex.branchable.com/?p=source.git;a=blob_plain;f=debian/copyright;hb=HEAD).

502
doc/license/LGPL
View file

@ -1,502 +0,0 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!

10
doc/tips/largefiles/comment_1_b84e5cb8316c30fc7b355234384a5899._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="acbg@8d58f794ce92f6be28b5dbd402059bc30262eb92"
nickname="acbg"
subject="Since which version does this apply?"
date="2016-03-03T16:16:28Z"
content="""
I use version 5.20140412, and I've tried the annex.largefiles in .gitattributes, but doesn't work. Every file is added to .git/annex/objects, including the ones that are excluded in .gitattributes.
I've just started using git-annex so maybe I'm doing something wrong...
"""]]

13
doc/tips/largefiles/comment_2_825b72391117f88062a585684cf62eeb._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="workspace"
subject="same problem"
date="2016-03-04T20:44:26Z"
content="""
I have the same problem:
the annex.largefiles is ignored by \"git add\" when set in .gitattributes
allthouch git check-attr does list it.
but it works when set with git config annex.largefiles
git annex version 6.20160126
"""]]

8
doc/tips/largefiles/comment_3_f4df42fe943011cc8feb2921a59616e9._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2016-03-07T17:23:19Z"
content="""
The first version to support largefiles in .gitattributes was 6.20160211,
so both the above commenters just have too old a version.
"""]]

40
doc/tips/messed_up_annex_by_using_git_checkout.mdwn Normal file
View file

@ -0,0 +1,40 @@
Hello. Linux experienced user here, but with no development or git experience ever. This directly leads me to my biggest trouble with git-annex because I constantly suffer from misunderstanding each and everything. That being said, my problem is the following: I had the terrible idea to have my .thunderbird directory synchronized over several machines, leading the thunderbird profile to total corruption because after a few weeks I finally managed to have multiple machines accessing it. As I started trying to recover, things got worse and this is my last seek for help before starting over by creating the repositories from scratch.
What I did:
1. I did some research on how to recover an old state of the repo, which should not have been a problem because there is a "full backup" repo. I came across this [1] page and the pain started with me looking for my wanted commit to roll-back in "git log" and then did some tries in the way something like, "git checkout -b old-state4 012345678".
2. Of course this recovered the whole repo and not only thunderbird, so I used a file synchronizer to put everything else back into place after the action.
3. Unfortunately, the "branches" seem to have been messed up and the repos are no longer in sync.
This is what the machine says that I have used to create the mess:
[2016-03-08 19:15:26.915116] Pusher: Syncing with host123
(recording state in git...)
To ssh://user@10.0.0.1/mnt/foo/bar
d35c699..fed0636 git-annex -> synced/git-annex
a44bfb2..818b7b5 annex/direct/old_state4 -> synced/old_state4
This is what another machine says:
[2016-03-08 21:17:48.649949] Pusher: Syncing with host123
(recording state in git...)
To ssh://user@10.0.0.1/mnt/foo/bar
423f50f..4c8fad8 annex/direct/master -> q/annex/direct/master
2a67458..fed0636 git-annex -> host123/git-annex
6a1076b..4c8fad8 master -> host123/master
7f55414..818b7b5 old_state4 -> host123/old_state4
Long story, short...
I apologize for being a total git noob while at the same time performing git magic leading into a total desaster.
However, I hope someone can give me a hint what to do to have the "old_state4" solved?
Also, I really would like to get used to the git internals but since git is quite powerful, I always get overwhelmed because the tutorials out there are either developer-focused (which I'm not in the correct target group) or they simply cover each and everything (which is of no use because I don't want to administrate a GitHub repo but a private git-annex for my files and documents).
Thank you so much!
[1] http://stackoverflow.com/questions/4114095/revert-git-repo-to-a-previous-commit

10
doc/todo/add_ancient_armel_build.mdwn Normal file
View file

@ -0,0 +1,10 @@
Add an armel build like the i386ancient build.
The current arm autobuilder doesn't have enough free space for the chroot
this would need. I need to upgrade its microsd card first, adding
approximately 5 gb. (A 16 gb card would suffice.)
Now, it would be possible to switch it to only do an ancient build,
instead of the current modern build. The downside of that is the ancient
build environment uses debian stable, so it has old versions of git,
libraries etc, that go into the build. --[[Joey]]

2
doc/todo/add_magicmime_support_to_OSX_dmg.mdwn
View file

@ -1,3 +1,5 @@
The OSX .dmg is built without the MagicMime build flag. Turning it on will
take some work to ship a copy of the magic database inside the dmg.
> [[done]]
--[[Joey]]

3
doc/todo/add_sftp_backend.mdwn Normal file
View file

@ -0,0 +1,3 @@
A sftp backend would be nice because gpg operations could be pipelined to the network transfer, not requiring the creation of a full file to disk with gpg before the network transmission, as it happens with rsync.
There should be some libraries that can handle the sftp connections and transfers. I read that even curl has support for that.

12
git-annex.cabal
View file

@ -143,11 +143,8 @@ Executable git-annex
process (>= 1.3.0.0)
else
Build-Depends: unix
-- Need to list these because they're generated from .hsc files.
Other-Modules: Utility.Touch Utility.Mounts
Include-Dirs: Utility
C-Sources: Utility/libdiskfree.c Utility/libmounts.c
CPP-Options: -DWITH_CLIBS
if impl(ghc <= 7.6.3)
Other-Modules: Utility.Touch.Old
if flag(TestSuite)
Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun,
@ -163,7 +160,7 @@ Executable git-annex
CPP-Options: -DWITH_WEBDAV
if flag(Assistant) && ! os(solaris)
Build-Depends: dns
Build-Depends: dns, mountpoints
CPP-Options: -DWITH_ASSISTANT
if flag(Assistant)
@ -195,6 +192,9 @@ Executable git-annex
if flag(Android)
Build-Depends: data-endian
CPP-Options: -D__ANDROID__ -DANDROID_SPLICES -D__NO_TH__
else
Build-Depends: disk-free-space
if flag(AndroidSplice)
CPP-Options: -DANDROID_SPLICES

5
stack.yaml
View file

@ -19,4 +19,7 @@ flags:
ekg: false
packages:
- '.'
resolver: lts-5.0
resolver: lts-5.5
extra-deps:
- mountpoints-1.0.1
- disk-free-space-0.1.0.1

2
standalone/android/install-haskell-packages
View file

@ -65,7 +65,7 @@ patched () {
installgitannexdeps () {
pushd ../..
ln -sf standalone/android/cabal.config
cabal install --only-dependencies --flags="-magicmime -concurrent-output" "$@" # --force-reinstalls --reinstall
cabal install --only-dependencies --flags="-magicmime -concurrentoutput" "$@" # --force-reinstalls --reinstall
rm -f cabal.config
popd
}

BIN
standalone/licences.gz
View file

Binary file not shown.