ipfs add -w directories (and FUSE fixes) #1536
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
unmounting wasn't happening, mostly because of a recent bug in goprocess.SetTeardown. This commit bumps up some messages to log.Warnings, as users may want to see them, and makes sure to Unmount when a node shuts down. License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
|
@whyrusleeping @lgierth @wking @cryptix what do you think about the new |
|
Fixes #1533 |
this commit changes the behavior of ipfs add -w: - it makes it able to work with ipfs add -r <dir> - instead of hacking around the add, we simply just add a wrapper directory around the whole result of the add. this means that ipfs add -w calls will output _two_ lines, but this is actually more correct than outputting one line, as two objects were added. this _may_ break scripts out there which expect the output to look a certain way. we should consider whether the old output is more _useful_ (even if less in-line with the model.) License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
jbenet
changed the title
|
Sample output: > ipfs add -r -w Makefile
added QmeGTUVmV3vp78MDEbWazngNm4h6FfnVRB6Vsz6hvbEQZM Makefile
added QmVQcHzPYHiDfvhTxYkP1fCZhuT3qKYgxifzoJ3KuGFCqD
> ipfs add -r -w lib/sharness/test
added QmZpjKjuF8HSnnrrYJKLgmFYYFUZLzAQfVVDzKhb2uM1UT lib/sharness/test/Makefile
added QmPDBWpwh96penZnbcJAt5U1Q9eC7JNpqu43oz2nozBoF1 lib/sharness/test/aggregate-results.sh
added QmZPfASHMA3o4ba4M4EbXeRW8mwHJQLLZCmZrtuWXhrq3L lib/sharness/test/sharness.sh
added Qmbw64Fp3ujbZ8P3H9VZTgRs2jZTFJK8CcxKWi2LJE3n7A lib/sharness/test/sharness.t
added QmSceeTxacJxUuFxtTeeZC7sYjLbNHh6ZwL54fh6n93Cjo lib/sharness/test/simple.t
added QmZW9QSWG1qyRLEjUjbYUwoQ1RgEc2EGR3oeZkWNCAnnpU lib/sharness/test
added QmY6YmWBEh2f39CDJZ9nQiGVyiMMaPQdYQo5N8z5uQf2Vy |
|
re
Totally down with this. Maybe we can have Rest LGTM, too. nice cleanup! |
> ipfs add a b c added Qmbvkmk9LFsGneteXk3G7YLqtLVME566ho6ibaQZZVHaC9 a added QmR9pC5uCF3UExca8RSrCVL8eKv7nHMpATzbEQkAHpXmVM b added QmetGxZTgo8tYAKQH1KLsY13MxqeVHbxYVmvzBzJAKU6Z7 c added QmXg3WHLcjnz4ejeYF6FKVBkb4m1oKjQmF5fEWL9M1uQF3 > ipfs ls QmXg3WHLcjnz4ejeYF6FKVBkb4m1oKjQmF5fEWL9M1uQF3 Qmbvkmk9LFsGneteXk3G7YLqtLVME566ho6ibaQZZVHaC9 10 a QmR9pC5uCF3UExca8RSrCVL8eKv7nHMpATzbEQkAHpXmVM 10 b QmetGxZTgo8tYAKQH1KLsY13MxqeVHbxYVmvzBzJAKU6Z7 10 c License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
made many more tests for ipfs add -w License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
add -w improvement: wrap multiple files in one dir
> ipfs add -w a b c
added Qmbvkmk9LFsGneteXk3G7YLqtLVME566ho6ibaQZZVHaC9 a
added QmR9pC5uCF3UExca8RSrCVL8eKv7nHMpATzbEQkAHpXmVM b
added QmetGxZTgo8tYAKQH1KLsY13MxqeVHbxYVmvzBzJAKU6Z7 c
added QmXg3WHLcjnz4ejeYF6FKVBkb4m1oKjQmF5fEWL9M1uQF3
> ipfs ls QmXg3WHLcjnz4ejeYF6FKVBkb4m1oKjQmF5fEWL9M1uQF3
Qmbvkmk9LFsGneteXk3G7YLqtLVME566ho6ibaQZZVHaC9 10 a
QmR9pC5uCF3UExca8RSrCVL8eKv7nHMpATzbEQkAHpXmVM 10 b
QmetGxZTgo8tYAKQH1KLsY13MxqeVHbxYVmvzBzJAKU6Z7 10 c |
jbenet
added a commit
that referenced
this pull request
Jul 29, 2015
ipfs add -w directories (and FUSE fixes)
This was referenced Jul 29, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
a8dae30 (Juan Batiz-Benet, 4 minutes ago)
add -w: fix to work correctly with dirs.
578fd02 (Juan Batiz-Benet, 7 minutes ago)
fuse unmount fixes
7a41dcb (Juan Batiz-Benet, 26 minutes ago)
updated goprocess (SetTeardown fix)