e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
43 lines
1.1 KiB
Haskell
43 lines
1.1 KiB
Haskell
{- git versions
|
|
-
|
|
- Copyright 2011, 2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Git.Version where
|
|
|
|
import Common
|
|
|
|
data GitVersion = GitVersion String Integer
|
|
deriving (Eq)
|
|
|
|
instance Ord GitVersion where
|
|
compare (GitVersion _ x) (GitVersion _ y) = compare x y
|
|
|
|
instance Show GitVersion where
|
|
show (GitVersion s _) = s
|
|
|
|
installed :: IO GitVersion
|
|
installed = normalize . extract <$> readProcess "git" ["--version"]
|
|
where
|
|
extract s = case lines s of
|
|
[] -> ""
|
|
(l:_) -> unwords $ drop 2 $ words l
|
|
|
|
{- To compare dotted versions like 1.7.7 and 1.8, they are normalized to
|
|
- a somewhat arbitrary integer representation. -}
|
|
normalize :: String -> GitVersion
|
|
normalize v = GitVersion v $
|
|
sum $ mult 1 $ reverse $ extend precision $ take precision $
|
|
map readi $ split "." v
|
|
where
|
|
extend n l = l ++ replicate (n - length l) 0
|
|
mult _ [] = []
|
|
mult n (x:xs) = (n*x) : mult (n*10^width) xs
|
|
readi :: String -> Integer
|
|
readi s = case reads s of
|
|
((x,_):_) -> x
|
|
_ -> 0
|
|
precision = 10 -- number of segments of the version to compare
|
|
width = length "yyyymmddhhmmss" -- maximum width of a segment
|