diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-18 17:38:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-18 18:22:20 -0400 |
| commit | 2fb1cfc4ae0cfb3f012e074f2f855c592f866b05 (patch) | |
| tree | 7416b03c25e431898042fef6ad2e5ab27e6882d0 /Git/HashObject.hs | |
| parent | 6f7ff00cb67546008918ed735f8be66b65cf9ce8 (diff) | |
add git annex view command
(And a vpop command, which is still a bit buggy.)
Still need to do vadd and vrm, though this also adds their documentation.
Currently not very happy with the view log data serialization. I had to
lose the TDFA regexps temporarily, so I can have Read/Show instances of
View. I expect the view log format will change in some incompatable way
later, probably adding last known refs for the parent branch to View
or something like that.
Anyway, it basically works, although it's a bit slow looking up the
metadata. The actual git branch construction is about as fast as it can be
using the current git plumbing.
This commit was sponsored by Peter Hogg.
Diffstat (limited to 'Git/HashObject.hs')
| -rw-r--r-- | Git/HashObject.hs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Git/HashObject.hs b/Git/HashObject.hs index bb9b20d96..97e1befe6 100644 --- a/Git/HashObject.hs +++ b/Git/HashObject.hs @@ -1,6 +1,6 @@ {- git hash-object interface - - - Copyright 2011-2012 Joey Hess <joey@kitenet.net> + - Copyright 2011-2014 Joey Hess <joey@kitenet.net> - - Licensed under the GNU GPL version 3 or higher. -} @@ -13,6 +13,7 @@ import Git.Sha import Git.Command import Git.Types import qualified Utility.CoProcess as CoProcess +import Utility.Tmp type HashObjectHandle = CoProcess.CoProcessHandle @@ -34,7 +35,18 @@ hashFile h file = CoProcess.query h send receive send to = hPutStrLn to file receive from = getSha "hash-object" $ hGetLine from -{- Injects some content into git, returning its Sha. -} +{- Injects a blob into git. Unfortunately, the current git-hash-object + - interface does not allow batch hashing without using temp files. -} +hashBlob :: HashObjectHandle -> String -> IO Sha +hashBlob h s = withTmpFile "hash" $ \tmp tmph -> do + hPutStr tmph s + hClose tmph + hashFile h tmp + +{- Injects some content into git, returning its Sha. + - + - Avoids using a tmp file, but runs a new hash-object command each + - time called. -} hashObject :: ObjectType -> String -> Repo -> IO Sha hashObject objtype content = hashObject' objtype (flip hPutStr content) |