import: Support file matching options such as --exclude, --include, --smallerthan, --largerthan

CmdLine/Seek.hs

@@ -66,14 +66,20 @@ withFilesInRefs a = mapM_ go
 					void $ commandAction $ a f k
 
 withPathContents :: ((FilePath, FilePath) -> CommandStart) -> CommandSeek
-withPathContents a params = seekActions $ 
-	map a . concat <$> liftIO (mapM get params)
+withPathContents a params = do
+	matcher <- Limit.getMatcher
+	seekActions $ map a <$> (filterM (checkmatch matcher) =<< ps)
   where
+	ps = concat <$> liftIO (mapM get params)
 	get p = ifM (isDirectory <$> getFileStatus p)
 		( map (\f -> (f, makeRelative (parentDir p) f))
 			<$> dirContentsRecursiveSkipping (".git" `isSuffixOf`) True p
 		, return [(p, takeFileName p)]
 		)
+	checkmatch matcher (f, relf) = matcher $ MatchingFile $ FileInfo
+		{ relFile = f
+		, matchFile = relf
+		}
 
 withWords :: ([String] -> CommandStart) -> CommandSeek
 withWords a params = seekActions $ return [a params]

debian/changelog

@@ -6,6 +6,8 @@ git-annex (5.20150206) UNRELEASED; urgency=medium
     parameters it does not understand.
   * groupwanted: New command to set the groupwanted preferred content
     expression.
+  * import: Support file matching options such as --exclude, --include, 
+    --smallerthan, --largerthan
 
  -- Joey Hess <id@joeyh.name>  Fri, 06 Feb 2015 13:57:08 -0400
 

doc/git-annex.mdwn

@@ -272,6 +272,11 @@ subdirectories).
 
   (Note that using `--deduplicate` or `--clean-duplicates` with the WORM
   backend does not look at file content, but filename and mtime.)
+  
+  To control which files are imported, many of the MATCHING OPTIONS can 
+  be used.
+
+		git annex import /dir --include='*.png'
 
 * `importfeed [url ...]`
 
@@ -724,7 +729,7 @@ subdirectories).
   When no item is specified, displays statistics and information
   for the repository as a whole.
 
-  When a directory is specified, the file matching options can be used
+  When a directory is specified, the MATCHING OPTIONS can be used
   to select the files in the directory that are included in the statistics.
 
   To only show the data that can be gathered quickly, use `--fast`.