2010-11-10 14:52:43 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2010-2014 Joey Hess <id@joeyh.name>
|
2010-11-10 14:52:43 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2010-11-10 14:52:43 +00:00
|
|
|
-}
|
|
|
|
|
2014-03-21 18:39:50 +00:00
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
|
2010-11-10 14:52:43 +00:00
|
|
|
module Command.PreCommit where
|
|
|
|
|
|
|
|
import Command
|
2010-11-11 22:54:52 +00:00
|
|
|
import qualified Command.Fix
|
2018-10-25 19:40:12 +00:00
|
|
|
import qualified Command.Smudge
|
2014-03-02 22:01:07 +00:00
|
|
|
import Annex.Hook
|
2015-12-09 19:18:25 +00:00
|
|
|
import Annex.Link
|
2014-02-19 18:14:44 +00:00
|
|
|
import Annex.View
|
2014-02-22 17:35:50 +00:00
|
|
|
import Annex.View.ViewedFile
|
2014-02-19 18:14:44 +00:00
|
|
|
import Logs.View
|
|
|
|
import Logs.MetaData
|
|
|
|
import Types.View
|
|
|
|
import Types.MetaData
|
|
|
|
|
|
|
|
import qualified Data.Set as S
|
2019-01-07 19:51:05 +00:00
|
|
|
import qualified Data.Text as T
|
2010-11-11 22:54:52 +00:00
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
2015-07-08 19:08:02 +00:00
|
|
|
cmd = command "pre-commit" SectionPlumbing
|
2015-07-08 16:33:27 +00:00
|
|
|
"run by git pre-commit hook"
|
2015-07-08 19:08:02 +00:00
|
|
|
paramPaths
|
|
|
|
(withParams seek)
|
2010-12-30 19:06:26 +00:00
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
seek :: CmdParams -> CommandSeek
|
2020-03-30 15:54:04 +00:00
|
|
|
seek ps = do
|
2020-05-28 19:55:17 +00:00
|
|
|
let ww = WarnUnmatchWorkTreeItems
|
|
|
|
l <- workTreeItems ww ps
|
2019-08-30 17:54:57 +00:00
|
|
|
-- fix symlinks to files being committed
|
2020-09-14 20:49:33 +00:00
|
|
|
flip withFilesToBeCommitted l $ \(si, f) -> commandAction $
|
|
|
|
maybe stop (Command.Fix.start Command.Fix.FixSymlinks si f)
|
2019-08-30 17:54:57 +00:00
|
|
|
=<< isAnnexLink f
|
|
|
|
-- after a merge conflict or git cherry-pick or stash, pointer
|
|
|
|
-- files in the worktree won't be populated, so populate them here
|
|
|
|
Command.Smudge.updateSmudged (Restage False)
|
2014-03-02 22:01:07 +00:00
|
|
|
|
2019-08-26 19:52:19 +00:00
|
|
|
runAnnexHook preCommitAnnexHook
|
|
|
|
|
|
|
|
-- committing changes to a view updates metadata
|
2023-02-27 18:39:33 +00:00
|
|
|
currentView >>= \case
|
2019-08-26 19:52:19 +00:00
|
|
|
Nothing -> noop
|
2023-02-27 18:39:33 +00:00
|
|
|
Just (v, _madj) -> withViewChanges
|
2019-08-26 19:52:19 +00:00
|
|
|
(addViewMetaData v)
|
|
|
|
(removeViewMetaData v)
|
2010-11-10 14:52:43 +00:00
|
|
|
|
2014-02-22 17:35:50 +00:00
|
|
|
addViewMetaData :: View -> ViewedFile -> Key -> CommandStart
|
2020-09-14 20:49:33 +00:00
|
|
|
addViewMetaData v f k = starting "metadata" ai si $
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
next $ changeMetaData k $ fromView v f
|
2020-09-14 20:49:33 +00:00
|
|
|
where
|
|
|
|
ai = mkActionItem (k, toRawFilePath f)
|
|
|
|
si = SeekInput []
|
2014-02-19 18:14:44 +00:00
|
|
|
|
2014-02-22 17:35:50 +00:00
|
|
|
removeViewMetaData :: View -> ViewedFile -> Key -> CommandStart
|
2020-09-14 20:49:33 +00:00
|
|
|
removeViewMetaData v f k = starting "metadata" ai si $
|
make CommandStart return a StartMessage
The goal is to be able to run CommandStart in the main thread when -J is
used, rather than unncessarily passing it off to a worker thread, which
incurs overhead that is signficant when the CommandStart is going to
quickly decide to stop.
To do that, the message it displays needs to be displayed in the worker
thread, after the CommandStart has run.
Also, the change will mean that CommandStart will no longer necessarily
run with the same Annex state as CommandPerform. While its docs already
said it should avoid modifying Annex state, I audited all the
CommandStart code as part of the conversion. (Note that CommandSeek
already sometimes runs with a different Annex state, and that has not been
a source of any problems, so I am not too worried that this change will
lead to breakage going forward.)
The only modification of Annex state I found was it calling
allowMessages in some Commands that default to noMessages. Dealt with
that by adding a startCustomOutput and a startingUsualMessages.
This lets a command start with noMessages and then select the output it
wants for each CommandStart.
One bit of breakage: onlyActionOn has been removed from commands that used it.
The plan is that, since a StartMessage contains an ActionItem,
when a Key can be extracted from that, the parallel job runner can
run onlyActionOn' automatically. Then commands won't need to worry about
this detail. Future work.
Otherwise, this was a fairly straightforward process of making each
CommandStart compile again. Hopefully other behavior changes were mostly
avoided.
In a few cases, a command had a CommandStart that called a CommandPerform
that then called showStart multiple times. I have collapsed those
down to a single start action. The main command to perhaps suffer from it
is Command.Direct, which used to show a start for each file, and no
longer does.
Another minor behavior change is that some commands used showStart
before, but had an associated file and a Key available, so were changed
to ShowStart with an ActionItemAssociatedFile. That will not change the
normal output or behavior, but --json output will now include the key.
This should not break it for anyone using a real json parser.
2019-06-06 19:42:30 +00:00
|
|
|
next $ changeMetaData k $ unsetMetaData $ fromView v f
|
2020-09-14 20:49:33 +00:00
|
|
|
where
|
|
|
|
ai = mkActionItem (k, toRawFilePath f)
|
|
|
|
si = SeekInput []
|
2014-02-19 18:14:44 +00:00
|
|
|
|
|
|
|
changeMetaData :: Key -> MetaData -> CommandCleanup
|
|
|
|
changeMetaData k metadata = do
|
|
|
|
showMetaDataChange metadata
|
|
|
|
addMetaData k metadata
|
|
|
|
return True
|
|
|
|
|
|
|
|
showMetaDataChange :: MetaData -> Annex ()
|
|
|
|
showMetaDataChange = showLongNote . unlines . concatMap showmeta . fromMetaData
|
|
|
|
where
|
|
|
|
showmeta (f, vs) = map (showmetavalue f) $ S.toList vs
|
2019-01-07 19:51:05 +00:00
|
|
|
showmetavalue f v = T.unpack (fromMetaField f) <> showset v <> "=" <> decodeBS (fromMetaValue v)
|
2014-02-19 18:14:44 +00:00
|
|
|
showset v
|
|
|
|
| isSet v = "+"
|
|
|
|
| otherwise = "-"
|