diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-26 14:59:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-26 14:59:06 -0400 |
| commit | 056fc2a5bef26f22503aa24084b6827a7e494f37 (patch) | |
| tree | b371ac7771c03b097625d6bd2d083a65dfbcda18 /doc/design | |
| parent | 5469323467e49fa99ff17c0ef7f77d96b35eb0a4 (diff) | |
update for v6 unlocked files
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/metadata.mdwn | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/doc/design/metadata.mdwn b/doc/design/metadata.mdwn index 151ad0ac0..4e43fe344 100644 --- a/doc/design/metadata.mdwn +++ b/doc/design/metadata.mdwn @@ -103,9 +103,8 @@ want to see. * Could use filename metadata for the key, recorded by git-annex add (which may not correspond to filenames being used in regular git branches like master for the key). -* Could use the .map files to get a filename, but this is somewhat - arbitrary (.map can contain multiple filenames), and is only - currently supported in direct mode. +* Could use the Keys database's associated files. Currently only works for v6 + unlocked files, and not for locked files. * Current approach: Have a reference branch (eg master) and walk it to find filenames and keys. Fine as long as it can be done efficiently. Also allows including @@ -144,26 +143,13 @@ in the git-annex branch. This is slow. A fast cache is needed. TODO -# direct mode issues +# unlocked file issues -TODO (direct mode is currently not supported with view branches) +View branches can't be used in direct mode repositories. -Checking out a view branch can result in any number of copies of a file -appearing in different directories. No problem in indirect mode, but -in direct mode these are real, expensive copies. - -But, it's worth supporting direct mode! - -So, possible approaches: - -* Before checking out a view branch, calculate how much space will - be used by duplicates and refuse if not enough is free. -* Only check out one file, and omit the copies. Keep track of which - files were omitted, and make sure that when committing on the branch, - that metadata is not removed. Has the downside that files can seem - to randomly move around in the tree as their metadata changes. -* Disallow view branch checkouts that have duplicate files. - This would cripple it some, but perhaps not too badly? +But, view branches do work with unlocked files in v6 repositories. +The resulting view branch has all its files locked, although you +can unlock them again after entering the branch. # gotchas |