2014-02-19 00:01:56 +00:00
|
|
|
{- git-annex command
|
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2014 Joey Hess <id@joeyh.name>
|
2014-02-19 00:01:56 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2014-02-19 00:01:56 +00:00
|
|
|
-}
|
|
|
|
|
|
|
|
|
|
module Command.VAdd where
|
|
|
|
|
|
|
|
|
|
import Command
|
2023-02-07 20:28:46 +00:00
|
|
|
import qualified Annex
|
2014-02-19 00:01:56 +00:00
|
|
|
import Annex.View
|
2023-02-07 22:09:10 +00:00
|
|
|
import Command.View (checkoutViewBranch, paramView)
|
2014-02-19 00:01:56 +00:00
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
cmd :: Command
|
2019-08-26 19:52:19 +00:00
|
|
|
cmd = notBareRepo $
|
2015-07-08 19:08:02 +00:00
|
|
|
command "vadd" SectionMetaData
|
|
|
|
|
"add subdirs to current view"
|
2023-02-07 22:09:10 +00:00
|
|
|
paramView (withParams seek)
|
2014-02-19 00:01:56 +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-19 00:01:56 +00:00
|
|
|
|
|
|
|
|
start :: [String] -> CommandStart
|
2020-09-14 20:49:33 +00:00
|
|
|
start params = starting "vadd" (ActionItemOther Nothing) (SeekInput params) $
|
2023-02-27 18:39:33 +00:00
|
|
|
withCurrentView $ \view madj -> do
|
2023-02-07 20:28:46 +00:00
|
|
|
vu <- annexViewUnsetDirectory <$> Annex.getGitConfig
|
add tip about metadata driven views (and more flexible view filtering)
While writing this documentation, I realized that there needed to be a way
to stay in a view like tag=* while adding a filter like tag=work that
applies to the same field.
So, there are really two ways a view can be refined. It can have a new
"field=explicitvalue" filter added to it, which does not change the
"shape" of the view, but narrows the files it shows.
Or, it can have a new view added, which adds another level of
subdirectories.
So, added a vfilter command, which takes explicit values to add to the
filter, and rejects changes that would change the shape of the view.
And, made vadd only accept changes that change the shape of the view.
And, changed the View data type slightly; now components that can match
multiple metadata values can be visible, or not visible.
This commit was sponsored by Stelian Iancu.
2014-02-19 19:10:18 +00:00
|
|
|
let (view', change) = refineView view $
|
2023-02-07 20:28:46 +00:00
|
|
|
map (parseViewParam vu) (reverse params)
|
2014-02-19 00:01:56 +00:00
|
|
|
case change of
|
|
|
|
|
Unchanged -> do
|
|
|
|
|
showNote "unchanged"
|
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 $ return True
|
|
|
|
|
Narrowing -> next $ do
|
add tip about metadata driven views (and more flexible view filtering)
While writing this documentation, I realized that there needed to be a way
to stay in a view like tag=* while adding a filter like tag=work that
applies to the same field.
So, there are really two ways a view can be refined. It can have a new
"field=explicitvalue" filter added to it, which does not change the
"shape" of the view, but narrows the files it shows.
Or, it can have a new view added, which adds another level of
subdirectories.
So, added a vfilter command, which takes explicit values to add to the
filter, and rejects changes that would change the shape of the view.
And, made vadd only accept changes that change the shape of the view.
And, changed the View data type slightly; now components that can match
multiple metadata values can be visible, or not visible.
This commit was sponsored by Stelian Iancu.
2014-02-19 19:10:18 +00:00
|
|
|
if visibleViewSize view' == visibleViewSize view
|
2016-11-16 01:29:54 +00:00
|
|
|
then giveup "That would not add an additional level of directory structure to the view. To filter the view, use vfilter instead of vadd."
|
2023-02-27 18:39:33 +00:00
|
|
|
else checkoutViewBranch view' madj narrowView
|
2016-11-16 01:29:54 +00:00
|
|
|
Widening -> giveup "Widening view to match more files is not currently supported."
|