2015-09-22 21:32:28 +00:00
|
|
|
{- git status interface
|
|
|
|
-
|
Don't allow entering a view with staged or unstaged changes.
In some cases, unstaged changes are safe, eg dotfiles in the top which
are not affected by a view. Or non-annexed files in general which would
prevent view branch checkout from proceeding. But in other cases,
particularly unstaged changes to annexed files, entering a view would wipe
out those changes! And so don't allow entering a view with any unstaged
changes.
Staged changes are not safe when entering a view, because the changes get
committed to the view branch, and so the user is unlikely to remember them
when they exit the view, and so will effectively lose them, even if they're
still present in the view branch.
Also, improved the git status parser, although the improvement turned out
to not really be needed.
This commit was sponsored by Eric Drechsel on Patreon.
2018-05-14 20:51:06 +00:00
|
|
|
- Copyright 2015-2018 Joey Hess <id@joeyh.name>
|
2015-09-22 21:32:28 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2015-09-22 21:32:28 +00:00
|
|
|
-}
|
|
|
|
|
|
|
|
module Git.Status where
|
|
|
|
|
|
|
|
import Common
|
|
|
|
import Git
|
|
|
|
import Git.Command
|
|
|
|
import Git.FilePath
|
|
|
|
|
|
|
|
data Status
|
|
|
|
= Modified TopFilePath
|
|
|
|
| Deleted TopFilePath
|
|
|
|
| Added TopFilePath
|
|
|
|
| Renamed TopFilePath TopFilePath
|
|
|
|
| TypeChanged TopFilePath
|
|
|
|
| Untracked TopFilePath
|
|
|
|
|
Don't allow entering a view with staged or unstaged changes.
In some cases, unstaged changes are safe, eg dotfiles in the top which
are not affected by a view. Or non-annexed files in general which would
prevent view branch checkout from proceeding. But in other cases,
particularly unstaged changes to annexed files, entering a view would wipe
out those changes! And so don't allow entering a view with any unstaged
changes.
Staged changes are not safe when entering a view, because the changes get
committed to the view branch, and so the user is unlikely to remember them
when they exit the view, and so will effectively lose them, even if they're
still present in the view branch.
Also, improved the git status parser, although the improvement turned out
to not really be needed.
This commit was sponsored by Eric Drechsel on Patreon.
2018-05-14 20:51:06 +00:00
|
|
|
data StagedUnstaged a = StagedUnstaged
|
|
|
|
{ staged :: Maybe a
|
|
|
|
, unstaged :: Maybe a
|
|
|
|
}
|
|
|
|
|
2015-09-22 21:32:28 +00:00
|
|
|
statusChar :: Status -> Char
|
|
|
|
statusChar (Modified _) = 'M'
|
|
|
|
statusChar (Deleted _) = 'D'
|
|
|
|
statusChar (Added _) = 'A'
|
|
|
|
statusChar (Renamed _ _) = 'R'
|
|
|
|
statusChar (TypeChanged _) = 'T'
|
|
|
|
statusChar (Untracked _) = '?'
|
|
|
|
|
|
|
|
statusFile :: Status -> TopFilePath
|
|
|
|
statusFile (Modified f) = f
|
|
|
|
statusFile (Deleted f) = f
|
|
|
|
statusFile (Added f) = f
|
|
|
|
statusFile (Renamed _oldf newf) = newf
|
|
|
|
statusFile (TypeChanged f) = f
|
|
|
|
statusFile (Untracked f) = f
|
|
|
|
|
Don't allow entering a view with staged or unstaged changes.
In some cases, unstaged changes are safe, eg dotfiles in the top which
are not affected by a view. Or non-annexed files in general which would
prevent view branch checkout from proceeding. But in other cases,
particularly unstaged changes to annexed files, entering a view would wipe
out those changes! And so don't allow entering a view with any unstaged
changes.
Staged changes are not safe when entering a view, because the changes get
committed to the view branch, and so the user is unlikely to remember them
when they exit the view, and so will effectively lose them, even if they're
still present in the view branch.
Also, improved the git status parser, although the improvement turned out
to not really be needed.
This commit was sponsored by Eric Drechsel on Patreon.
2018-05-14 20:51:06 +00:00
|
|
|
parseStatusZ :: [String] -> [StagedUnstaged Status]
|
2015-09-22 21:32:28 +00:00
|
|
|
parseStatusZ = go []
|
|
|
|
where
|
|
|
|
go c [] = reverse c
|
|
|
|
go c (x:xs) = case x of
|
Don't allow entering a view with staged or unstaged changes.
In some cases, unstaged changes are safe, eg dotfiles in the top which
are not affected by a view. Or non-annexed files in general which would
prevent view branch checkout from proceeding. But in other cases,
particularly unstaged changes to annexed files, entering a view would wipe
out those changes! And so don't allow entering a view with any unstaged
changes.
Staged changes are not safe when entering a view, because the changes get
committed to the view branch, and so the user is unlikely to remember them
when they exit the view, and so will effectively lose them, even if they're
still present in the view branch.
Also, improved the git status parser, although the improvement turned out
to not really be needed.
This commit was sponsored by Eric Drechsel on Patreon.
2018-05-14 20:51:06 +00:00
|
|
|
(sstaged:sunstaged:' ':f) ->
|
|
|
|
case (cparse sstaged f xs, cparse sunstaged f xs) of
|
|
|
|
((vstaged, xs1), (vunstaged, xs2)) ->
|
|
|
|
let v = StagedUnstaged
|
|
|
|
{ staged = vstaged
|
|
|
|
, unstaged = vunstaged
|
|
|
|
}
|
|
|
|
xs' = fromMaybe xs (xs1 <|> xs2)
|
|
|
|
in go (v : c) xs'
|
2015-09-22 21:32:28 +00:00
|
|
|
_ -> go c xs
|
|
|
|
|
Don't allow entering a view with staged or unstaged changes.
In some cases, unstaged changes are safe, eg dotfiles in the top which
are not affected by a view. Or non-annexed files in general which would
prevent view branch checkout from proceeding. But in other cases,
particularly unstaged changes to annexed files, entering a view would wipe
out those changes! And so don't allow entering a view with any unstaged
changes.
Staged changes are not safe when entering a view, because the changes get
committed to the view branch, and so the user is unlikely to remember them
when they exit the view, and so will effectively lose them, even if they're
still present in the view branch.
Also, improved the git status parser, although the improvement turned out
to not really be needed.
This commit was sponsored by Eric Drechsel on Patreon.
2018-05-14 20:51:06 +00:00
|
|
|
cparse 'M' f _ = (Just (Modified (asTopFilePath f)), Nothing)
|
|
|
|
cparse 'A' f _ = (Just (Added (asTopFilePath f)), Nothing)
|
|
|
|
cparse 'D' f _ = (Just (Deleted (asTopFilePath f)), Nothing)
|
|
|
|
cparse 'T' f _ = (Just (TypeChanged (asTopFilePath f)), Nothing)
|
|
|
|
cparse '?' f _ = (Just (Untracked (asTopFilePath f)), Nothing)
|
|
|
|
cparse 'R' f (oldf:xs) =
|
|
|
|
(Just (Renamed (asTopFilePath oldf) (asTopFilePath f)), Just xs)
|
|
|
|
cparse _ _ _ = (Nothing, Nothing)
|
2015-09-22 21:32:28 +00:00
|
|
|
|
Don't allow entering a view with staged or unstaged changes.
In some cases, unstaged changes are safe, eg dotfiles in the top which
are not affected by a view. Or non-annexed files in general which would
prevent view branch checkout from proceeding. But in other cases,
particularly unstaged changes to annexed files, entering a view would wipe
out those changes! And so don't allow entering a view with any unstaged
changes.
Staged changes are not safe when entering a view, because the changes get
committed to the view branch, and so the user is unlikely to remember them
when they exit the view, and so will effectively lose them, even if they're
still present in the view branch.
Also, improved the git status parser, although the improvement turned out
to not really be needed.
This commit was sponsored by Eric Drechsel on Patreon.
2018-05-14 20:51:06 +00:00
|
|
|
getStatus :: [CommandParam] -> [FilePath] -> Repo -> IO ([StagedUnstaged Status], IO Bool)
|
2017-02-20 20:37:04 +00:00
|
|
|
getStatus ps fs r = do
|
|
|
|
(ls, cleanup) <- pipeNullSplit ps' r
|
2015-09-22 21:32:28 +00:00
|
|
|
return (parseStatusZ ls, cleanup)
|
|
|
|
where
|
2017-02-20 20:37:04 +00:00
|
|
|
ps' = concat
|
|
|
|
[ [Param "status"]
|
|
|
|
, ps
|
|
|
|
, [ Param "-uall" , Param "-z"]
|
|
|
|
, map File fs
|
|
|
|
]
|