2014-02-18 21:38:23 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2014 Joey Hess <id@joeyh.name>
|
2014-02-18 21:38:23 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Command.View where
|
|
|
|
|
|
|
|
import Command
|
|
|
|
import qualified Git
|
|
|
|
import qualified Git.Command
|
|
|
|
import qualified Git.Ref
|
|
|
|
import qualified Git.Branch
|
2018-05-14 18:58:13 +00:00
|
|
|
import qualified Git.LsFiles as LsFiles
|
|
|
|
import Git.FilePath
|
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
|
|
|
import Git.Status
|
2014-02-18 21:38:23 +00:00
|
|
|
import Types.View
|
|
|
|
import Annex.View
|
|
|
|
import Logs.View
|
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
|
|
|
cmd = notBareRepo $ notDirect $
|
2015-07-08 19:08:02 +00:00
|
|
|
command "view" SectionMetaData "enter a view branch"
|
|
|
|
paramView (withParams seek)
|
2014-02-18 21:38:23 +00:00
|
|
|
|
2015-07-08 19:08:02 +00:00
|
|
|
seek :: CmdParams -> CommandSeek
|
2018-10-01 18:12:06 +00:00
|
|
|
seek = withWords (commandAction . start)
|
2014-02-18 21:38:23 +00:00
|
|
|
|
|
|
|
start :: [String] -> CommandStart
|
2016-11-16 01:29:54 +00:00
|
|
|
start [] = giveup "Specify metadata to include in view"
|
2015-07-08 19:08:02 +00:00
|
|
|
start ps = do
|
2017-11-28 18:40:26 +00:00
|
|
|
showStart' "view" Nothing
|
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
|
|
|
ifM safeToEnterView
|
|
|
|
( do
|
|
|
|
view <- mkView ps
|
|
|
|
go view =<< currentView
|
|
|
|
, giveup "Not safe to enter view."
|
|
|
|
)
|
2014-02-18 21:38:23 +00:00
|
|
|
where
|
|
|
|
go view Nothing = next $ perform view
|
|
|
|
go view (Just v)
|
|
|
|
| v == view = stop
|
2016-11-16 01:29:54 +00:00
|
|
|
| otherwise = giveup "Already in a view. Use the vfilter and vadd commands to further refine this view."
|
2014-02-18 21:38:23 +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
|
|
|
safeToEnterView :: Annex Bool
|
|
|
|
safeToEnterView = do
|
|
|
|
(l, cleanup) <- inRepo $ getStatus [] []
|
|
|
|
case filter dangerous l of
|
|
|
|
[] -> liftIO cleanup
|
|
|
|
_ -> do
|
|
|
|
warning "Your uncommitted changes would be lost when entering a view."
|
|
|
|
void $ liftIO cleanup
|
|
|
|
return False
|
|
|
|
where
|
|
|
|
dangerous (StagedUnstaged { staged = Nothing, unstaged = Nothing }) = False
|
|
|
|
-- Untracked files will not be affected by entering a view,
|
|
|
|
-- so are not dangerous.
|
|
|
|
dangerous (StagedUnstaged { staged = Just (Untracked _), unstaged = Nothing }) = False
|
|
|
|
dangerous (StagedUnstaged { unstaged = Just (Untracked _), staged = Nothing }) = False
|
|
|
|
dangerous (StagedUnstaged { unstaged = Just (Untracked _), staged = Just (Untracked _) }) = False
|
|
|
|
-- Staged changes would have their modifications either be
|
|
|
|
-- lost when entering a view, or committed as part of the view.
|
|
|
|
-- Either is dangerous because upon leaving the view; the staged
|
|
|
|
-- changes would be lost.
|
|
|
|
dangerous (StagedUnstaged { staged = Just _ }) = True
|
|
|
|
-- Unstaged changes to annexed files would get lost when entering a
|
|
|
|
-- view.
|
|
|
|
dangerous (StagedUnstaged { unstaged = Just _ }) = True
|
|
|
|
|
2014-02-18 21:38:23 +00:00
|
|
|
perform :: View -> CommandPerform
|
|
|
|
perform view = do
|
2015-10-11 17:29:44 +00:00
|
|
|
showAction "searching"
|
2014-02-19 00:57:14 +00:00
|
|
|
next $ checkoutViewBranch view applyView
|
2014-02-18 21:38:23 +00:00
|
|
|
|
|
|
|
paramView :: String
|
2014-10-21 17:00:05 +00:00
|
|
|
paramView = paramRepeating "FIELD=VALUE"
|
2014-02-18 21:38:23 +00:00
|
|
|
|
|
|
|
mkView :: [String] -> Annex View
|
2015-07-08 19:08:02 +00:00
|
|
|
mkView ps = go =<< inRepo Git.Branch.current
|
2014-02-18 21:38:23 +00:00
|
|
|
where
|
2016-11-16 01:29:54 +00:00
|
|
|
go Nothing = giveup "not on any branch!"
|
2014-03-02 20:00:56 +00:00
|
|
|
go (Just b) = return $ fst $ refineView (View b []) $
|
2015-07-08 19:08:02 +00:00
|
|
|
map parseViewParam $ reverse ps
|
2014-02-18 21:38:23 +00:00
|
|
|
|
2014-02-19 00:57:14 +00:00
|
|
|
checkoutViewBranch :: View -> (View -> Annex Git.Branch) -> CommandCleanup
|
|
|
|
checkoutViewBranch view mkbranch = do
|
2015-01-07 01:01:05 +00:00
|
|
|
here <- liftIO getCurrentDirectory
|
2014-02-19 00:57:14 +00:00
|
|
|
|
|
|
|
branch <- mkbranch view
|
|
|
|
|
2014-02-19 01:57:21 +00:00
|
|
|
showOutput
|
2014-02-18 21:38:23 +00:00
|
|
|
ok <- inRepo $ Git.Command.runBool
|
|
|
|
[ Param "checkout"
|
2014-02-19 05:09:17 +00:00
|
|
|
, Param (Git.fromRef $ Git.Ref.base branch)
|
2014-02-18 21:38:23 +00:00
|
|
|
]
|
|
|
|
when ok $ do
|
|
|
|
setView view
|
|
|
|
{- A git repo can easily have empty directories in it,
|
2018-05-14 18:58:13 +00:00
|
|
|
- and this pollutes the view, so remove them.
|
|
|
|
- (However, emptry directories used by submodules are not
|
|
|
|
- removed.) -}
|
|
|
|
top <- liftIO . absPath =<< fromRepo Git.repoPath
|
|
|
|
(l, cleanup) <- inRepo $
|
|
|
|
LsFiles.notInRepoIncludingEmptyDirectories False [top]
|
|
|
|
forM_ l (removeemptydir top)
|
|
|
|
liftIO $ void cleanup
|
2015-01-07 01:01:05 +00:00
|
|
|
unlessM (liftIO $ doesDirectoryExist here) $ do
|
2014-02-18 21:38:23 +00:00
|
|
|
showLongNote (cwdmissing top)
|
|
|
|
return ok
|
|
|
|
where
|
2018-05-14 18:58:13 +00:00
|
|
|
removeemptydir top d = do
|
|
|
|
p <- inRepo $ toTopFilePath d
|
|
|
|
liftIO $ tryIO $ removeDirectory (top </> getTopFilePath p)
|
2014-02-18 21:38:23 +00:00
|
|
|
cwdmissing top = unlines
|
|
|
|
[ "This view does not include the subdirectory you are currently in."
|
|
|
|
, "Perhaps you should: cd " ++ top
|
|
|
|
]
|