9eb10caa27
Turns out that Data.List.Utils.split is slow and makes a lot of allocations. Here's a much simpler single character splitter that behaves the same (even in wacky corner cases) while running in half the time and 75% the allocations. As well as being an optimisation, this helps move toward eliminating use of missingh. (Data.List.Split.splitOn is nearly as slow as Data.List.Utils.split and allocates even more.) I have not benchmarked the effect on git-annex, but would not be surprised to see some parsing of eg, large streams from git commands run twice as fast, and possibly in less memory. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
60 lines
1.9 KiB
Haskell
60 lines
1.9 KiB
Haskell
{- git-annex tagged pushes
|
|
-
|
|
- Copyright 2012 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Annex.TaggedPush where
|
|
|
|
import Annex.Common
|
|
import qualified Remote
|
|
import qualified Annex.Branch
|
|
import qualified Git
|
|
import qualified Git.Ref
|
|
import qualified Git.Command
|
|
import qualified Git.Branch
|
|
import Utility.Base64
|
|
|
|
{- Converts a git branch into a branch that is tagged with a UUID, typically
|
|
- the UUID of the repo that will be pushing it, and possibly with other
|
|
- information.
|
|
-
|
|
- Pushing to branches on the remote that have our uuid in them is ugly,
|
|
- but it reserves those branches for pushing by us, and so our pushes will
|
|
- never conflict with other pushes.
|
|
-
|
|
- To avoid cluttering up the branch display, the branch is put under
|
|
- refs/synced/, rather than the usual refs/remotes/
|
|
-
|
|
- Both UUIDs and Base64 encoded data are always legal to be used in git
|
|
- refs, per git-check-ref-format.
|
|
-}
|
|
toTaggedBranch :: UUID -> Maybe String -> Git.Branch -> Git.Branch
|
|
toTaggedBranch u info b = Git.Ref $ intercalate "/" $ catMaybes
|
|
[ Just "refs/synced"
|
|
, Just $ fromUUID u
|
|
, toB64 <$> info
|
|
, Just $ Git.fromRef $ Git.Ref.base b
|
|
]
|
|
|
|
fromTaggedBranch :: Git.Branch -> Maybe (UUID, Maybe String)
|
|
fromTaggedBranch b = case splitc '/' $ Git.fromRef b of
|
|
("refs":"synced":u:info:_base) ->
|
|
Just (toUUID u, fromB64Maybe info)
|
|
("refs":"synced":u:_base) ->
|
|
Just (toUUID u, Nothing)
|
|
_ -> Nothing
|
|
|
|
taggedPush :: UUID -> Maybe String -> Git.Ref -> Remote -> Git.Repo -> IO Bool
|
|
taggedPush u info branch remote = Git.Command.runBool
|
|
[ Param "push"
|
|
, Param $ Remote.name remote
|
|
{- Using forcePush here is safe because we "own" the tagged branch
|
|
- we're pushing; it has no other writers. Ensures it is pushed
|
|
- even if it has been rewritten by a transition. -}
|
|
, Param $ Git.Branch.forcePush $ refspec Annex.Branch.name
|
|
, Param $ refspec branch
|
|
]
|
|
where
|
|
refspec b = Git.fromRef b ++ ":" ++ Git.fromRef (toTaggedBranch u info b)
|