git-annex/Git
Joey Hess 10b5f79e2d
fix empty tree import when directory does not exist
Fix behavior when importing a tree from a directory remote when the
directory does not exist. An empty tree was imported, rather than the
import failing. Merging that tree would delete every file in the
branch, if those files had been exported to the directory before.

The problem was that dirContentsRecursive returned [] when the directory
did not exist. Better for it to throw an exception. But in commit
74f0d67aa3 back in 2012, I made it never
theow exceptions, because exceptions throw inside unsafeInterleaveIO become
untrappable when the list is being traversed.

So, changed it to list the contents of the directory before entering
unsafeInterleaveIO. So exceptions are thrown for the directory. But still
not if it's unable to list the contents of a subdirectory. That's less of a
problem, because the subdirectory does exist (or if not, it got removed
after being listed, and it's ok to not include it in the list). A
subdirectory that has permissions that don't allow listing it will have its
contents omitted from the list still.

(Might be better to have it return a type that includes indications of
errors listing contents of subdirectories?)

The rest of the changes are making callers of dirContentsRecursive
use emptyWhenDoesNotExist when they relied on the behavior of it not
throwing an exception when the directory does not exist. Note that
it's possible some callers of dirContentsRecursive that used to ignore
permissions problems listing a directory will now start throwing exceptions
on them.

The fix to the directory special remote consisted of not making its
call in listImportableContentsM use emptyWhenDoesNotExist. So it will
throw an exception as desired.

Sponsored-by: Joshua Antonishen on Patreon
2023-08-15 12:57:41 -04:00
..
Command update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Remote Removed support for git versions older than 2.1 2019-09-11 16:14:43 -04:00
AutoCorrect.hs all commands building except for assistant 2019-12-05 14:41:18 -04:00
Branch.hs sync --quiet 2021-07-19 11:28:47 -04:00
BuildVersion.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CatFile.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
CheckAttr.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
CheckIgnore.hs more RawFilePath conversion 2020-11-03 10:11:04 -04:00
Command.hs convert some error to giveup 2021-12-09 14:36:54 -04:00
Config.hs Fix breakage when git is configured with safe.bareRepository = explicit 2023-07-05 14:43:14 -04:00
ConfigTypes.hs Support core.sharedRepository=0xxx at long last 2023-04-26 17:03:29 -04:00
Construct.hs split out Utility.Url.Parse 2023-08-14 12:28:10 -04:00
Credential.hs split out Utility.Url.Parse 2023-08-14 12:28:10 -04:00
CurrentRepo.hs Revert "revert recent bug fix temporarily for release" 2023-02-14 14:11:23 -04:00
DiffTree.hs rename Git.Filename to Git.Quote 2023-04-12 17:22:03 -04:00
DiffTreeItem.hs ByteString Ref continued 2020-04-07 11:54:27 -04:00
Env.hs convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00
FileMode.hs Fix ambigous typos 2023-03-17 15:14:47 -04:00
FilePath.hs implement importChanges optimisaton (not used yet) 2023-05-31 16:01:34 -04:00
FilterProcess.hs filter-process: Fix protocol for empty files 2022-07-13 17:13:54 -04:00
Fsck.hs simplify and speed up Utility.FileSystemEncoding 2021-08-11 12:13:31 -04:00
GCrypt.hs sync: Fix parsing of gcrypt::rsync:// urls that use a relative path 2023-03-23 15:20:00 -04:00
HashObject.hs make hashFile support paths with newlines 2023-03-13 13:43:40 -04:00
History.hs convert to withCreateProcess for async exception safety 2020-06-03 15:48:09 -04:00
Hook.hs fix build warnings on windows 2023-03-21 18:41:23 -04:00
Index.hs more RawFilePath conversion 2020-11-05 18:45:37 -04:00
LockFile.hs fix build with unix-2.8.0 2023-08-01 18:41:27 -04:00
LsFiles.hs Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
LsTree.hs rename Git.Filename to Git.Quote 2023-04-12 17:22:03 -04:00
Merge.hs sync --quiet 2021-07-19 11:28:47 -04:00
Objects.hs fix empty tree import when directory does not exist 2023-08-15 12:57:41 -04:00
PktLine.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Queue.hs Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
Quote.hs rename Git.Filename to Git.Quote 2023-04-12 17:22:03 -04:00
Ref.hs remove errant print debug 2021-10-03 18:18:04 -04:00
RefLog.hs ByteString Ref continued 2020-04-07 11:54:27 -04:00
Remote.hs sync: Fix parsing of gcrypt::rsync:// urls that use a relative path 2023-03-23 15:20:00 -04:00
Repair.hs fix empty tree import when directory does not exist 2023-08-15 12:57:41 -04:00
Sha.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Ssh.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Status.hs convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00
Tree.hs build git trees using ContentIdentifier to speed up import 2023-05-31 12:46:54 -04:00
Types.hs skip checkRepoConfigInaccessible when git directory specified explicitly 2022-09-20 14:52:43 -04:00
UnionMerge.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
UpdateIndex.hs rawfilepath conversion 2023-02-27 15:06:32 -04:00
Url.hs avoid partial functions in Git.Url 2021-01-18 15:07:23 -04:00
Version.hs more RawFilePath conversion 2020-10-29 12:03:50 -04:00