2011-12-13 01:12:51 +00:00
|
|
|
{- git branch stuff
|
|
|
|
-
|
|
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
2012-08-05 19:45:47 +00:00
|
|
|
{-# LANGUAGE BangPatterns #-}
|
|
|
|
|
2011-12-13 01:12:51 +00:00
|
|
|
module Git.Branch where
|
|
|
|
|
|
|
|
import Common
|
|
|
|
import Git
|
2011-12-14 19:30:14 +00:00
|
|
|
import Git.Sha
|
2011-12-14 19:56:11 +00:00
|
|
|
import Git.Command
|
2013-05-21 22:24:29 +00:00
|
|
|
import Git.Ref (headRef)
|
2011-12-13 01:12:51 +00:00
|
|
|
|
2012-08-05 19:45:47 +00:00
|
|
|
{- The currently checked out branch.
|
|
|
|
-
|
|
|
|
- In a just initialized git repo before the first commit,
|
|
|
|
- symbolic-ref will show the master branch, even though that
|
|
|
|
- branch is not created yet. So, this also looks at show-ref HEAD
|
|
|
|
- to double-check.
|
|
|
|
-}
|
2011-12-31 07:38:58 +00:00
|
|
|
current :: Repo -> IO (Maybe Git.Ref)
|
2012-08-05 19:45:47 +00:00
|
|
|
current r = do
|
2012-08-05 20:35:30 +00:00
|
|
|
v <- currentUnsafe r
|
|
|
|
case v of
|
|
|
|
Nothing -> return Nothing
|
|
|
|
Just branch ->
|
2012-10-04 22:04:09 +00:00
|
|
|
ifM (null <$> pipeReadStrict [Param "show-ref", Param $ show branch] r)
|
2012-08-05 20:35:30 +00:00
|
|
|
( return Nothing
|
|
|
|
, return v
|
|
|
|
)
|
|
|
|
|
|
|
|
{- The current branch, which may not really exist yet. -}
|
|
|
|
currentUnsafe :: Repo -> IO (Maybe Git.Ref)
|
|
|
|
currentUnsafe r = parse . firstLine
|
2013-05-21 22:24:29 +00:00
|
|
|
<$> pipeReadStrict [Param "symbolic-ref", Param $ show headRef] r
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
parse l
|
|
|
|
| null l = Nothing
|
|
|
|
| otherwise = Just $ Git.Ref l
|
2011-12-31 07:38:58 +00:00
|
|
|
|
2011-12-13 01:12:51 +00:00
|
|
|
{- Checks if the second branch has any commits not present on the first
|
|
|
|
- branch. -}
|
|
|
|
changed :: Branch -> Branch -> Repo -> IO Bool
|
|
|
|
changed origbranch newbranch repo
|
|
|
|
| origbranch == newbranch = return False
|
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
|
|
|
| otherwise = not . null <$> diffs
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
diffs = pipeReadStrict
|
|
|
|
[ Param "log"
|
|
|
|
, Param (show origbranch ++ ".." ++ show newbranch)
|
|
|
|
, Params "--oneline -n1"
|
|
|
|
] repo
|
2011-12-13 01:12:51 +00:00
|
|
|
|
|
|
|
{- Given a set of refs that are all known to have commits not
|
|
|
|
- on the branch, tries to update the branch by a fast-forward.
|
|
|
|
-
|
|
|
|
- In order for that to be possible, one of the refs must contain
|
|
|
|
- every commit present in all the other refs.
|
|
|
|
-}
|
|
|
|
fastForward :: Branch -> [Ref] -> Repo -> IO Bool
|
|
|
|
fastForward _ [] _ = return True
|
2012-03-16 05:59:07 +00:00
|
|
|
fastForward branch (first:rest) repo =
|
2011-12-13 01:12:51 +00:00
|
|
|
-- First, check that the branch does not contain any
|
|
|
|
-- new commits that are not in the first ref. If it does,
|
|
|
|
-- cannot fast-forward.
|
2012-03-16 05:59:07 +00:00
|
|
|
ifM (changed first branch repo)
|
|
|
|
( no_ff
|
|
|
|
, maybe no_ff do_ff =<< findbest first rest
|
|
|
|
)
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
no_ff = return False
|
|
|
|
do_ff to = do
|
2013-03-03 17:39:07 +00:00
|
|
|
run [Param "update-ref", Param $ show branch, Param $ show to] repo
|
2012-12-13 04:24:19 +00:00
|
|
|
return True
|
|
|
|
findbest c [] = return $ Just c
|
|
|
|
findbest c (r:rs)
|
|
|
|
| c == r = findbest c rs
|
|
|
|
| otherwise = do
|
|
|
|
better <- changed c r repo
|
|
|
|
worse <- changed r c repo
|
|
|
|
case (better, worse) of
|
|
|
|
(True, True) -> return Nothing -- divergent fail
|
|
|
|
(True, False) -> findbest r rs -- better
|
|
|
|
(False, True) -> findbest c rs -- worse
|
|
|
|
(False, False) -> findbest c rs -- same
|
2011-12-13 19:08:44 +00:00
|
|
|
|
|
|
|
{- Commits the index into the specified branch (or other ref),
|
|
|
|
- with the specified parent refs, and returns the committed sha -}
|
|
|
|
commit :: String -> Branch -> [Ref] -> Repo -> IO Sha
|
|
|
|
commit message branch parentrefs repo = do
|
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
|
|
|
tree <- getSha "write-tree" $
|
2012-10-04 22:04:09 +00:00
|
|
|
pipeReadStrict [Param "write-tree"] repo
|
2012-07-17 18:40:05 +00:00
|
|
|
sha <- getSha "commit-tree" $ pipeWriteRead
|
|
|
|
(map Param $ ["commit-tree", show tree] ++ ps)
|
|
|
|
message repo
|
2013-03-03 17:39:07 +00:00
|
|
|
run [Param "update-ref", Param $ show branch, Param $ show sha] repo
|
2011-12-13 19:08:44 +00:00
|
|
|
return sha
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
ps = concatMap (\r -> ["-p", show r]) parentrefs
|
2013-08-29 18:15:32 +00:00
|
|
|
|
|
|
|
{- A leading + makes git-push force pushing a branch. -}
|
|
|
|
forcePush :: String -> String
|
|
|
|
forcePush b = "+" ++ b
|