2010-10-27 17:12:02 +00:00
|
|
|
{- git repository command queue
|
2010-10-27 20:53:54 +00:00
|
|
|
-
|
2012-06-05 00:41:22 +00:00
|
|
|
- Copyright 2010,2012 Joey Hess <joey@kitenet.net>
|
2010-10-27 20:53:54 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
2010-10-26 19:59:50 +00:00
|
|
|
-}
|
|
|
|
|
2012-02-15 15:13:13 +00:00
|
|
|
{-# LANGUAGE BangPatterns #-}
|
|
|
|
|
2011-06-30 17:25:37 +00:00
|
|
|
module Git.Queue (
|
2010-10-26 19:59:50 +00:00
|
|
|
Queue,
|
2011-12-20 18:37:53 +00:00
|
|
|
new,
|
2012-06-07 19:19:44 +00:00
|
|
|
addCommand,
|
|
|
|
addUpdateIndex,
|
2011-03-16 19:10:15 +00:00
|
|
|
size,
|
2011-04-07 17:59:31 +00:00
|
|
|
full,
|
2012-02-15 15:13:13 +00:00
|
|
|
flush,
|
2010-10-26 19:59:50 +00:00
|
|
|
) where
|
|
|
|
|
|
|
|
import qualified Data.Map as M
|
2010-10-27 17:12:02 +00:00
|
|
|
import System.IO
|
|
|
|
import System.Cmd.Utils
|
|
|
|
import Data.String.Utils
|
2010-10-26 19:59:50 +00:00
|
|
|
|
2012-02-01 20:05:02 +00:00
|
|
|
import Utility.SafeCommand
|
2011-12-20 18:37:53 +00:00
|
|
|
import Common
|
2011-06-30 17:25:37 +00:00
|
|
|
import Git
|
2011-12-14 19:56:11 +00:00
|
|
|
import Git.Command
|
2012-06-07 19:19:44 +00:00
|
|
|
import qualified Git.UpdateIndex
|
|
|
|
|
|
|
|
{- Queable actions that can be performed in a git repository.
|
|
|
|
-}
|
|
|
|
data Action
|
|
|
|
{- Updating the index file, using a list of streamers that can
|
|
|
|
- be added to as the queue grows. -}
|
|
|
|
= UpdateIndexAction
|
2012-06-13 01:13:15 +00:00
|
|
|
{ getStreamers :: [Git.UpdateIndex.Streamer] -- in reverse order
|
2012-06-07 19:19:44 +00:00
|
|
|
}
|
|
|
|
{- A git command to run, on a list of files that can be added to
|
|
|
|
- as the queue grows. -}
|
|
|
|
| CommandAction
|
|
|
|
{ getSubcommand :: String
|
|
|
|
, getParams :: [CommandParam]
|
|
|
|
, getFiles :: [FilePath]
|
|
|
|
}
|
2010-10-26 19:59:50 +00:00
|
|
|
|
2012-06-07 19:19:44 +00:00
|
|
|
{- A key that can uniquely represent an action in a Map. -}
|
|
|
|
data ActionKey = UpdateIndexActionKey | CommandActionKey String
|
|
|
|
deriving (Eq, Ord)
|
2010-10-26 19:59:50 +00:00
|
|
|
|
2012-06-07 19:19:44 +00:00
|
|
|
actionKey :: Action -> ActionKey
|
|
|
|
actionKey (UpdateIndexAction _) = UpdateIndexActionKey
|
|
|
|
actionKey CommandAction { getSubcommand = s } = CommandActionKey s
|
2012-06-05 00:41:22 +00:00
|
|
|
|
2010-10-26 19:59:50 +00:00
|
|
|
{- A queue of actions to perform (in any order) on a git repository,
|
|
|
|
- with lists of files to perform them on. This allows coalescing
|
|
|
|
- similar git commands. -}
|
2012-02-15 15:13:13 +00:00
|
|
|
data Queue = Queue
|
|
|
|
{ size :: Int
|
|
|
|
, _limit :: Int
|
2012-06-07 19:19:44 +00:00
|
|
|
, items :: M.Map ActionKey Action
|
2012-02-15 15:13:13 +00:00
|
|
|
}
|
2010-10-26 19:59:50 +00:00
|
|
|
|
2011-04-07 17:59:31 +00:00
|
|
|
{- A recommended maximum size for the queue, after which it should be
|
|
|
|
- run.
|
|
|
|
-
|
|
|
|
- 10240 is semi-arbitrary. If we assume git filenames are between 10 and
|
|
|
|
- 255 characters long, then the queue will build up between 100kb and
|
|
|
|
- 2550kb long commands. The max command line length on linux is somewhere
|
|
|
|
- above 20k, so this is a fairly good balance -- the queue will buffer
|
|
|
|
- only a few megabytes of stuff and a minimal number of commands will be
|
|
|
|
- run by xargs. -}
|
2012-02-15 15:13:13 +00:00
|
|
|
defaultLimit :: Int
|
|
|
|
defaultLimit = 10240
|
2011-04-07 17:59:31 +00:00
|
|
|
|
2010-10-26 19:59:50 +00:00
|
|
|
{- Constructor for empty queue. -}
|
2012-02-15 15:13:13 +00:00
|
|
|
new :: Maybe Int -> Queue
|
|
|
|
new lim = Queue 0 (fromMaybe defaultLimit lim) M.empty
|
2010-10-26 19:59:50 +00:00
|
|
|
|
2012-06-07 19:40:44 +00:00
|
|
|
{- Adds an git command to the queue.
|
2012-06-07 19:19:44 +00:00
|
|
|
-
|
2012-06-07 19:40:44 +00:00
|
|
|
- Git commands with the same subcommand but different parameters are
|
|
|
|
- assumed to be equivilant enough to perform in any order with the same
|
|
|
|
- result.
|
2012-06-07 19:19:44 +00:00
|
|
|
-}
|
|
|
|
addCommand :: String -> [CommandParam] -> [FilePath] -> Queue -> Repo -> IO Queue
|
|
|
|
addCommand subcommand params files q repo =
|
|
|
|
updateQueue action different (length newfiles) q repo
|
|
|
|
where
|
|
|
|
key = actionKey action
|
|
|
|
action = CommandAction
|
|
|
|
{ getSubcommand = subcommand
|
|
|
|
, getParams = params
|
|
|
|
, getFiles = newfiles
|
|
|
|
}
|
|
|
|
newfiles = files ++ maybe [] getFiles (M.lookup key $ items q)
|
|
|
|
|
|
|
|
different (CommandAction { getSubcommand = s }) = s /= subcommand
|
|
|
|
different _ = True
|
|
|
|
|
2012-06-10 17:56:04 +00:00
|
|
|
{- Adds an update-index streamer to the queue. -}
|
2012-06-07 19:19:44 +00:00
|
|
|
addUpdateIndex :: Git.UpdateIndex.Streamer -> Queue -> Repo -> IO Queue
|
|
|
|
addUpdateIndex streamer q repo =
|
2012-06-10 17:56:04 +00:00
|
|
|
updateQueue action different 1 q repo
|
2012-06-07 19:19:44 +00:00
|
|
|
where
|
|
|
|
key = actionKey action
|
2012-06-13 01:13:15 +00:00
|
|
|
-- the list is built in reverse order
|
|
|
|
action = UpdateIndexAction $ streamer : streamers
|
2012-06-07 19:19:44 +00:00
|
|
|
streamers = maybe [] getStreamers $ M.lookup key $ items q
|
|
|
|
|
|
|
|
different (UpdateIndexAction _) = False
|
|
|
|
different _ = True
|
|
|
|
|
|
|
|
{- Updates or adds an action in the queue. If the queue already contains a
|
|
|
|
- different action, it will be flushed; this is to ensure that conflicting
|
|
|
|
- actions, like add and rm, are run in the right order.-}
|
|
|
|
updateQueue :: Action -> (Action -> Bool) -> Int -> Queue -> Repo -> IO Queue
|
2012-06-13 01:13:15 +00:00
|
|
|
updateQueue !action different sizeincrease q repo
|
2012-06-07 19:19:44 +00:00
|
|
|
| null (filter different (M.elems (items q))) = return $ go q
|
|
|
|
| otherwise = go <$> flush q repo
|
2010-10-26 19:59:50 +00:00
|
|
|
where
|
2012-06-07 19:19:44 +00:00
|
|
|
go q' = newq
|
|
|
|
where
|
|
|
|
!newq = q'
|
|
|
|
{ size = newsize
|
|
|
|
, items = newitems
|
|
|
|
}
|
|
|
|
!newsize = size q' + sizeincrease
|
|
|
|
!newitems = M.insertWith' const (actionKey action) action (items q')
|
2010-10-26 19:59:50 +00:00
|
|
|
|
2011-04-07 17:59:31 +00:00
|
|
|
{- Is a queue large enough that it should be flushed? -}
|
|
|
|
full :: Queue -> Bool
|
2012-02-15 15:13:13 +00:00
|
|
|
full (Queue cur lim _) = cur > lim
|
2011-04-07 17:59:31 +00:00
|
|
|
|
2010-10-26 19:59:50 +00:00
|
|
|
{- Runs a queue on a git repository. -}
|
2011-11-08 19:34:10 +00:00
|
|
|
flush :: Queue -> Repo -> IO Queue
|
2012-02-15 15:13:13 +00:00
|
|
|
flush (Queue _ lim m) repo = do
|
2012-06-07 19:19:44 +00:00
|
|
|
forM_ (M.elems m) $ runAction repo
|
2012-02-15 15:13:13 +00:00
|
|
|
return $ Queue 0 lim M.empty
|
2010-10-26 19:59:50 +00:00
|
|
|
|
|
|
|
{- Runs an Action on a list of files in a git repository.
|
|
|
|
-
|
2011-07-14 20:56:06 +00:00
|
|
|
- Complicated by commandline length limits.
|
|
|
|
-
|
|
|
|
- Intentionally runs the command even if the list of files is empty;
|
|
|
|
- this allows queueing commands that do not need a list of files. -}
|
2012-06-07 19:19:44 +00:00
|
|
|
runAction :: Repo -> Action -> IO ()
|
2012-06-07 19:40:44 +00:00
|
|
|
runAction repo (UpdateIndexAction streamers) =
|
2012-06-13 01:13:15 +00:00
|
|
|
-- list is stored in reverse order
|
|
|
|
Git.UpdateIndex.streamUpdateIndex repo $ reverse streamers
|
2012-06-07 19:19:44 +00:00
|
|
|
runAction repo action@(CommandAction {}) =
|
2011-07-14 20:56:06 +00:00
|
|
|
pOpen WriteToPipe "xargs" ("-0":"git":params) feedxargs
|
2010-10-26 19:59:50 +00:00
|
|
|
where
|
2011-11-08 19:34:10 +00:00
|
|
|
params = toCommand $ gitCommandLine
|
|
|
|
(Param (getSubcommand action):getParams action) repo
|
support all filename encodings with ghc 7.4
Under ghc 7.4, this seems to be able to handle all filename encodings
again. Including filename encodings that do not match the LANG setting.
I think this will not work with earlier versions of ghc, it uses some ghc
internals.
Turns out that ghc 7.4 has a special filesystem encoding that it uses when
reading/writing filenames (as FilePaths). This encoding is documented
to allow "arbitrary undecodable bytes to be round-tripped through it".
So, to get FilePaths from eg, git ls-files, set the Handle that is reading
from git to use this encoding. Then things basically just work.
However, I have not found a way to make Text read using this encoding.
Text really does assume unicode. So I had to switch back to using String
when reading/writing data to git. Which is a pity, because it's some
percent slower, but at least it works.
Note that stdout and stderr also have to be set to this encoding, or
printing out filenames that contain undecodable bytes causes a crash.
IMHO this is a misfeature in ghc, that the user can pass you a filename,
which you can readFile, etc, but that default, putStr of filename may
cause a crash!
Git.CheckAttr gave me special trouble, because the filenames I got back
from git, after feeding them in, had further encoding breakage.
Rather than try to deal with that, I just zip up the input filenames
with the attributes. Which must be returned in the same order queried
for this to work.
Also of note is an apparent GHC bug I worked around in Git.CheckAttr. It
used to forkProcess and feed git from the child process. Unfortunatly,
after this forkProcess, accessing the `files` variable from the parent
returns []. Not the value that was passed into the function. This screams
of a bad bug, that's clobbering a variable, but for now I just avoid
forkProcess there to work around it. That forkProcess was itself only added
because of a ghc bug, #624389. I've confirmed that the test case for that
bug doesn't reproduce it with ghc 7.4. So that's ok, except for the new ghc
bug I have not isolated and reported. Why does this simple bit of code
magnet the ghc bugs? :)
Also, the symlink touching code is currently broken, when used on utf-8
filenames in a non-utf-8 locale, or probably on any filename containing
undecodable bytes, and I temporarily commented it out.
2012-02-03 19:12:41 +00:00
|
|
|
feedxargs h = do
|
|
|
|
fileEncoding h
|
2012-06-07 19:19:44 +00:00
|
|
|
hPutStr h $ join "\0" $ getFiles action
|