Commit graph

34107 commits

Author SHA1 Message Date
Joey Hess
5afe4135c2
import --from option parsing 2019-02-26 12:06:19 -04:00
Joey Hess
760f26ebc6
Merge branch 'master' into importtree 2019-02-26 11:36:36 -04:00
sameerds
22e9a49bd9 Added a comment: +1 2019-02-24 17:06:30 +00:00
Joey Hess
413c101850
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-24 12:45:32 -04:00
Joey Hess
19f833b0b1
aws-0.21.1
* S3: Support enabling bucket versioning when built with aws-0.21.1.
* stack.yaml: Build with aws-0.21.1
2019-02-24 12:45:09 -04:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
ea3e6322e7 Added a comment 2019-02-24 07:01:35 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
1202a2a48c removed 2019-02-24 06:59:21 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
24ebc3d12e Added a comment 2019-02-24 06:56:43 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
8c777cb36d removed 2019-02-24 06:43:34 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
eb6c0608e6 Added a comment 2019-02-24 06:41:01 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
3f450e5271 Added a comment 2019-02-24 01:20:15 +00:00
Joey Hess
89ee156059
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-23 16:04:15 -04:00
Joey Hess
15a4f91d07
devblog 2019-02-23 16:03:29 -04:00
Joey Hess
7072f7a071
note 2019-02-23 15:57:18 -04:00
Joey Hess
4747fa923d
export: Deprecated the --tracking option.
Instead, users can configure remote.<name>.annex-tracking-branch themselves.
2019-02-23 15:54:33 -04:00
Joey Hess
d805401708
fairly happy withbuildImportCommit now
still not yet tested
2019-02-23 15:47:55 -04:00
Joey Hess
5bac8babdb
doc updated for import tree
Deprecated git annex export --tracking because it makes sense to have a
single configuration of tracking for both imports and exports.
2019-02-23 15:46:03 -04:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
663c62d7ce 2019-02-23 18:38:42 +00:00
Joey Hess
464485bffe
Merge branch 'master' into importtree 2019-02-23 13:58:22 -04:00
Joey Hess
d685b119df
more design 2019-02-23 13:55:26 -04:00
Joey Hess
c5ceefdca6
Merge branch 'master' into importtree 2019-02-22 22:03:00 -04:00
Joey Hess
3c405838f8
more design 2019-02-22 22:02:50 -04:00
Joey Hess
d65a78ff5b
Fix cleanup of git-annex:export.log after git-annex forget --drop-dead
This log, unlike all other current top-level logs, is a new format log.

I have not checked what throwing it at the old log parser did, but it seems
likely it ignored unparsable lines, and so perhaps deleted all lines from
the log.
2019-02-22 21:34:31 -04:00
Joey Hess
4e0d08b66b
Merge branch 'master' into importtree 2019-02-22 21:18:13 -04:00
Joey Hess
200dc632f5
more design 2019-02-22 21:18:01 -04:00
Joey Hess
8c836623b7
design work 2019-02-22 16:18:09 -04:00
Joey Hess
d7e5a884f7
response 2019-02-22 16:03:19 -04:00
gan
5b7daecbd3 removed 2019-02-22 18:03:32 +00:00
gan
776916d5fe Added a comment: Clarification 2019-02-22 18:03:16 +00:00
gan
9e38dfd700 Added a comment: Clarification 2019-02-22 18:03:03 +00:00
gan
baa1699570 Added a comment: Provide flags to youtube-dl? 2019-02-22 18:01:26 +00:00
Joey Hess
33bb62ff13
fix parent 2019-02-22 12:44:22 -04:00
Joey Hess
bab6c570b0
buildImportTrees is fully working
buildImportCommit not yet tested
2019-02-22 12:41:17 -04:00
Joey Hess
7af55de83c
optimisation: use graftTree to remember the export branch
Sped up git-annex export in repositories with lots of keys.

Old method read whole git-annex branch tree into memory.
2019-02-22 11:16:22 -04:00
Joey Hess
1580ff3866
graphTree now works properly in all cases
(That I could think of.)
2019-02-21 22:25:42 -04:00
Joey Hess
d67494716c
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-21 17:46:09 -04:00
Joey Hess
433fef865f
devblog 2019-02-21 17:45:47 -04:00
Joey Hess
8fdea8f444
WIP
Added graftTree but it's buggy.

Should use graftTree in Annex.Branch.graftTreeish; it will be faster
than the current implementation there.

Started Annex.Import, but untested and it doesn't yet handle tree
grafting.
2019-02-21 17:32:59 -04:00
62.226.58.176
8428a74a0e poll vote (My phone (or MP3 player)) 2019-02-21 18:36:04 +00:00
Joey Hess
56137ce0d2
use colon not space to delimit content identifier list
InodeCache serializes to a value with spaces, and seems likely other
things will too, and want to avoid unncessary base64 of content
identifiers when possible.
2019-02-21 13:45:16 -04:00
Joey Hess
1f6339ade7
fix parsing of empty content identifier
Seems very unlikely an empty content identifier would be used, but
quickcheck found this bug.
2019-02-21 13:44:09 -04:00
Joey Hess
9887a378fe
renamings to make clean when old-format logs are being used 2019-02-21 13:43:44 -04:00
Joey Hess
fd304dce60
split out Types.Import and some changes to the types in it 2019-02-21 13:39:09 -04:00
Joey Hess
936aee6a60
quickcheck property for parsing of content identifier logs 2019-02-21 13:17:43 -04:00
Joey Hess
a66ab6a9eb
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-20 17:36:14 -04:00
Joey Hess
c605478e41
devblog 2019-02-20 17:34:45 -04:00
Joey Hess
7c25cc7715
fix build 2019-02-20 17:31:08 -04:00
Joey Hess
5a294f0dd7
add Logs.ContentIdentifier 2019-02-20 17:22:56 -04:00
Joey Hess
7392304f1c
notes 2019-02-20 17:06:36 -04:00
Joey Hess
a818bc5e73
add Database.ContentIdentifier
Does not yet have a way to update with new information from the
git-annex branch, which will be needed when multiple repos are importing
from the same remote.
2019-02-20 16:59:10 -04:00