2016-02-25 20:11:13 +00:00
|
|
|
{- adjusted version of main branch
|
|
|
|
-
|
|
|
|
- Copyright 2016 Joey Hess <id@joeyh.name>
|
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
2016-02-29 19:04:03 +00:00
|
|
|
module Annex.AdjustedBranch (
|
|
|
|
Adjustment(..),
|
|
|
|
OrigBranch,
|
|
|
|
AdjBranch,
|
|
|
|
adjustedToOriginal,
|
2016-03-03 18:13:54 +00:00
|
|
|
fromAdjustedBranch,
|
2016-02-29 19:04:03 +00:00
|
|
|
enterAdjustedBranch,
|
|
|
|
updateAdjustedBranch,
|
2016-03-03 18:13:54 +00:00
|
|
|
propigateAdjustedCommits,
|
2016-02-29 19:04:03 +00:00
|
|
|
) where
|
2016-02-25 20:11:13 +00:00
|
|
|
|
|
|
|
import Annex.Common
|
|
|
|
import qualified Annex
|
|
|
|
import Git.Types
|
|
|
|
import qualified Git.Branch
|
|
|
|
import qualified Git.Ref
|
|
|
|
import qualified Git.Command
|
|
|
|
import Git.Tree
|
|
|
|
import Git.Env
|
2016-03-03 16:55:00 +00:00
|
|
|
import Git.Index
|
|
|
|
import qualified Git.LockFile
|
2016-02-25 20:11:13 +00:00
|
|
|
import Annex.CatFile
|
|
|
|
import Annex.Link
|
|
|
|
import Git.HashObject
|
2016-02-29 21:16:56 +00:00
|
|
|
import Annex.AutoMerge
|
2016-02-29 21:27:19 +00:00
|
|
|
import qualified Database.Keys
|
2016-02-25 20:11:13 +00:00
|
|
|
|
|
|
|
data Adjustment = UnlockAdjustment
|
|
|
|
deriving (Show)
|
|
|
|
|
|
|
|
adjustTreeItem :: Adjustment -> HashObjectHandle -> TreeItem -> Annex (Maybe TreeItem)
|
|
|
|
adjustTreeItem UnlockAdjustment h ti@(TreeItem f m s)
|
|
|
|
| toBlobType m == Just SymlinkBlob = do
|
|
|
|
mk <- catKey s
|
|
|
|
case mk of
|
2016-02-29 21:27:19 +00:00
|
|
|
Just k -> do
|
|
|
|
Database.Keys.addAssociatedFile k f
|
|
|
|
Just . TreeItem f (fromBlobType FileBlob)
|
|
|
|
<$> hashPointerFile' h k
|
2016-02-25 20:11:13 +00:00
|
|
|
Nothing -> return (Just ti)
|
|
|
|
| otherwise = return (Just ti)
|
|
|
|
|
|
|
|
type OrigBranch = Branch
|
|
|
|
type AdjBranch = Branch
|
|
|
|
|
|
|
|
adjustedBranchPrefix :: String
|
|
|
|
adjustedBranchPrefix = "refs/heads/adjusted/"
|
|
|
|
|
2016-02-29 19:04:03 +00:00
|
|
|
serialize :: Adjustment -> String
|
|
|
|
serialize UnlockAdjustment = "unlock"
|
2016-02-25 20:11:13 +00:00
|
|
|
|
2016-02-29 19:04:03 +00:00
|
|
|
deserialize :: String -> Maybe Adjustment
|
|
|
|
deserialize "unlock" = Just UnlockAdjustment
|
|
|
|
deserialize _ = Nothing
|
|
|
|
|
|
|
|
originalToAdjusted :: OrigBranch -> Adjustment -> AdjBranch
|
|
|
|
originalToAdjusted orig adj = Git.Ref.under base orig
|
|
|
|
where
|
|
|
|
base = adjustedBranchPrefix ++ serialize adj
|
|
|
|
|
|
|
|
adjustedToOriginal :: AdjBranch -> Maybe (Adjustment, OrigBranch)
|
2016-02-25 20:11:13 +00:00
|
|
|
adjustedToOriginal b
|
2016-02-29 19:04:03 +00:00
|
|
|
| adjustedBranchPrefix `isPrefixOf` bs = do
|
|
|
|
adj <- deserialize (takeWhile (/= '/') (drop prefixlen bs))
|
|
|
|
Just (adj, Git.Ref.basename b)
|
2016-02-25 20:11:13 +00:00
|
|
|
| otherwise = Nothing
|
|
|
|
where
|
|
|
|
bs = fromRef b
|
|
|
|
prefixlen = length adjustedBranchPrefix
|
|
|
|
|
2016-03-03 18:13:54 +00:00
|
|
|
fromAdjustedBranch :: Branch -> OrigBranch
|
|
|
|
fromAdjustedBranch b = maybe b snd (adjustedToOriginal b)
|
|
|
|
|
2016-02-25 20:11:13 +00:00
|
|
|
originalBranch :: Annex (Maybe OrigBranch)
|
2016-03-03 18:13:54 +00:00
|
|
|
originalBranch = fmap fromAdjustedBranch <$> inRepo Git.Branch.current
|
2016-02-25 20:11:13 +00:00
|
|
|
|
|
|
|
{- Enter an adjusted version of current branch (or, if already in an
|
|
|
|
- adjusted version of a branch, changes the adjustment of the original
|
|
|
|
- branch).
|
|
|
|
-
|
|
|
|
- Can fail, if no branch is checked out, or perhaps if staged changes
|
|
|
|
- conflict with the adjusted branch.
|
|
|
|
-}
|
|
|
|
enterAdjustedBranch :: Adjustment -> Annex ()
|
|
|
|
enterAdjustedBranch adj = go =<< originalBranch
|
|
|
|
where
|
2016-03-03 16:55:00 +00:00
|
|
|
go (Just origbranch) = preventCommits $ do
|
2016-02-25 20:11:13 +00:00
|
|
|
adjbranch <- adjustBranch adj origbranch
|
|
|
|
inRepo $ Git.Command.run
|
|
|
|
[ Param "checkout"
|
|
|
|
, Param $ fromRef $ Git.Ref.base $ adjbranch
|
|
|
|
]
|
|
|
|
go Nothing = error "not on any branch!"
|
|
|
|
|
|
|
|
adjustBranch :: Adjustment -> OrigBranch -> Annex AdjBranch
|
|
|
|
adjustBranch adj origbranch = do
|
2016-02-29 21:16:56 +00:00
|
|
|
sha <- adjust adj origbranch
|
|
|
|
inRepo $ Git.Branch.update adjbranch sha
|
2016-02-25 20:11:13 +00:00
|
|
|
return adjbranch
|
|
|
|
where
|
2016-02-29 19:04:03 +00:00
|
|
|
adjbranch = originalToAdjusted origbranch adj
|
2016-02-25 20:11:13 +00:00
|
|
|
|
2016-02-29 21:16:56 +00:00
|
|
|
adjust :: Adjustment -> Ref -> Annex Sha
|
|
|
|
adjust adj orig = do
|
|
|
|
h <- inRepo hashObjectStart
|
|
|
|
treesha <- adjustTree (adjustTreeItem adj h) orig =<< Annex.gitRepo
|
|
|
|
liftIO $ hashObjectStop h
|
|
|
|
commitAdjustedTree treesha orig
|
|
|
|
|
2016-03-03 16:55:00 +00:00
|
|
|
{- Locks git's index file, preventing git from making a commit, merge,
|
|
|
|
- or otherwise changing the HEAD ref while the action is run.
|
|
|
|
-
|
|
|
|
- Throws an IO exception if the index file is already locked.
|
|
|
|
-}
|
|
|
|
preventCommits :: Annex a -> Annex a
|
|
|
|
preventCommits = bracket setup cleanup . const
|
|
|
|
where
|
|
|
|
setup = do
|
|
|
|
lck <- fromRepo indexFileLock
|
|
|
|
liftIO $ Git.LockFile.openLock lck
|
|
|
|
cleanup lckhandle = liftIO $ Git.LockFile.closeLock lckhandle
|
|
|
|
|
2016-02-25 20:11:13 +00:00
|
|
|
{- Commits a given adjusted tree, with the provided parent ref.
|
|
|
|
-
|
|
|
|
- This should always yield the same value, even if performed in different
|
|
|
|
- clones of a repo, at different times. The commit message and other
|
|
|
|
- metadata is based on the parent.
|
|
|
|
-}
|
|
|
|
commitAdjustedTree :: Sha -> Ref -> Annex Sha
|
|
|
|
commitAdjustedTree treesha parent = go =<< catCommit parent
|
|
|
|
where
|
|
|
|
go Nothing = inRepo mkcommit
|
|
|
|
go (Just parentcommit) = inRepo $ commitWithMetaData
|
|
|
|
(commitAuthorMetaData parentcommit)
|
|
|
|
(commitCommitterMetaData parentcommit)
|
|
|
|
mkcommit
|
|
|
|
mkcommit = Git.Branch.commitTree
|
|
|
|
Git.Branch.AutomaticCommit "adjusted branch" [parent] treesha
|
2016-02-29 19:04:03 +00:00
|
|
|
|
|
|
|
{- Update the currently checked out adjusted branch, merging the provided
|
|
|
|
- branch into it. -}
|
2016-02-29 19:57:47 +00:00
|
|
|
updateAdjustedBranch :: Branch -> (OrigBranch, Adjustment) -> Git.Branch.CommitMode -> Annex Bool
|
2016-03-03 16:55:00 +00:00
|
|
|
updateAdjustedBranch tomerge (origbranch, adj) commitmode =
|
|
|
|
catchBoolIO $ preventCommits $ go =<< (,)
|
2016-02-29 21:16:56 +00:00
|
|
|
<$> inRepo (Git.Ref.sha tomerge)
|
|
|
|
<*> inRepo Git.Branch.current
|
|
|
|
where
|
|
|
|
go (Just mergesha, Just currbranch) = ifM (inRepo $ Git.Branch.changed currbranch mergesha)
|
|
|
|
( do
|
|
|
|
propigateAdjustedCommits origbranch adj
|
|
|
|
adjustedtomerge <- adjust adj mergesha
|
|
|
|
ifM (inRepo $ Git.Branch.changed currbranch adjustedtomerge)
|
|
|
|
( ifM (autoMergeFrom adjustedtomerge (Just currbranch) commitmode)
|
|
|
|
( recommit currbranch mergesha =<< catCommit currbranch
|
|
|
|
, return False
|
|
|
|
)
|
|
|
|
, return True -- no changes to merge
|
|
|
|
)
|
|
|
|
, return True -- no changes to merge
|
|
|
|
)
|
|
|
|
go _ = return False
|
|
|
|
{- Once a merge commit has been made, re-do it, removing
|
|
|
|
- the old version of the adjusted branch as a parent, and
|
|
|
|
- making the only parent be the branch that was merged in.
|
|
|
|
-
|
|
|
|
- Doing this ensures that the same commit Sha is
|
|
|
|
- always arrived at for a given commit from the merged in branch.
|
|
|
|
-}
|
|
|
|
recommit currbranch parent (Just commit) = do
|
|
|
|
commitsha <- commitAdjustedTree (commitTree commit) parent
|
|
|
|
inRepo $ Git.Branch.update currbranch commitsha
|
2016-03-03 18:13:54 +00:00
|
|
|
propigateAdjustedCommits origbranch adj
|
2016-02-29 21:16:56 +00:00
|
|
|
return True
|
|
|
|
recommit _ _ Nothing = return False
|
|
|
|
|
|
|
|
{- Check for any commits present on the adjusted branch that have not yet
|
2016-03-03 18:13:54 +00:00
|
|
|
- been propigated to the orig branch, and propigate them. -}
|
2016-02-29 21:16:56 +00:00
|
|
|
propigateAdjustedCommits :: OrigBranch -> Adjustment -> Annex ()
|
|
|
|
propigateAdjustedCommits originbranch adj = return () -- TODO
|