Commit Graph

6291 Commits

Author SHA1 Message Date
Daira Hopwood
a0af577777 Windows path fix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-28 17:00:57 +00:00
Daira Hopwood
9373b81d0c magic-folder-howto.rst formatting fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-28 16:58:49 +00:00
Daira Hopwood
b33d5480bd Add docs/magic-folder-howto.rst.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-28 16:54:37 +00:00
Daira Hopwood
e12bc5b320 Add test for 'tahoe create-node/client/introducer' output. closes ticket:2556
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-28 13:49:43 +00:00
Daira Hopwood
7ef0c70a92 Quote local paths correctly in the output of node creation commands. fixes ticket:2556
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-28 02:57:15 +00:00
Daira Hopwood
bcdefe41a6 bin\tahoe can't be run directly on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-28 00:33:59 +00:00
Daira Hopwood
319dedb0df Strip any long path marker in the input to flush_volume.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 21:39:05 +00:00
Daira Hopwood
ea55fa5c20 Correct type for Windows BOOL.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 21:38:03 +00:00
Daira Hopwood
fa5d86b55c Depend on Twisted >= 15.2.0 and (finally!) retire the setup_requires hack.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 20:55:14 +00:00
Daira Hopwood
9142b25f00 Disable precondition that autoAdd == recursive.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 20:36:04 +00:00
Daira Hopwood
2130eb4240 Fix a type error.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 20:35:41 +00:00
Daira Hopwood
3a6a62c6d1 Flush handling WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 20:07:41 +00:00
Daira Hopwood
ecc944d5f1 Use fileutil.write for magic folder tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:23 +00:00
Daira Hopwood
b88d450666 Improve all of the Windows-specific error reporting.
Also make the Windows function declarations more readable and consistent.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:22 +00:00
Daira Hopwood
92301cb731 Consolidate Windows-specific imports in fileutil to avoid pyflakes warnings.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:22 +00:00
Daira Hopwood
b04f3d6994 replace_file should allow the replaced file not to exist on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:21 +00:00
Daira Hopwood
c9346d2022 Fix fileutil tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:21 +00:00
Daira Hopwood
2fdc7f2689 More path fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:20 +00:00
Daira Hopwood
fffdd64ab5 Fix a test broken by the last commit.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:20 +00:00
Daira Hopwood
d0515a7427 Don't include [magic_folder]enabled and local.directory fields by default.
Add a comment reminding to do the field modification properly.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:19 +00:00
Daira Hopwood
01a8719179 Don't use a long path for the [magic_folder]local.directory field.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:19 +00:00
Daira Hopwood
035a7c9d31 Fix some path Unixisms.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:18 +00:00
Daira Hopwood
cda88b2f80 Add long_path=False option to abspath_expanduser_unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:34:18 +00:00
Daira Hopwood
70d01cb147 Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:31:22 +00:00
Daira Hopwood
730f4e4ba3 Refactor _check_up/downloader_count.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 19:29:14 +00:00
Daira Hopwood
243c89204d Don't download the deletion marker file unnecessarily.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 18:44:55 +00:00
Daira Hopwood
a7ef6948d9 Distinguish deletion of directories.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 18:44:55 +00:00
Daira Hopwood
f2db5068b9 Rename deleted files to .backup rather than unlinking them.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 18:44:55 +00:00
David Stainton
a1367f6447 Add file conflict unit test 2015-10-27 18:44:55 +00:00
David Stainton
976ea15863 Add basic bob upload test and fix conflict detect 2015-10-27 18:44:55 +00:00
David Stainton
44e2c6acc8 Fix bob's uploading test... 2015-10-27 18:44:55 +00:00
David Stainton
f1bb8afd2b Attempt to teach bob to upload a file 2015-10-27 18:44:55 +00:00
David Stainton
c33e918bbf Count conflicted objects 2015-10-27 18:44:55 +00:00
Daira Hopwood
63ad778b7d Basic remote conflict detection based on ancestor uri
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 18:44:45 +00:00
Daira Hopwood
7a2e021c75 magic-folder.rst: remove "Known Issues and Limitations" that have been fixed.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 01:54:54 +00:00
Daira Hopwood
3530e662d6 magic-folder.rst: update introduction.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 01:53:50 +00:00
Daira Hopwood
61023bd98a Avoid .format, since it is inconsistent between Python 2.6 and 2.7 (and the rest of Tahoe-LAFS doesn't use it).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 01:20:28 +00:00
Daira Hopwood
c4c22767c0 Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
Daira Hopwood
7944d2b30a Add counter for uploader.objects_not_uploaded.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
Daira Hopwood
e8e2038468 Advance Bob's clock after notifying.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
Daira Hopwood
377c30517e test_alice_bob: use magic= argument to notify, rather than self.magicfolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
meejah
0058044128 add excluded check 2015-10-26 14:24:36 -06:00
meejah
7e8577be06 add the 'spurious' notifies 2015-10-26 14:24:36 -06:00
Daira Hopwood
aa6a22fb89 Fix a pyflakes warning and check existence of file in Bob's local dir.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
meejah
ab68608345 implement 'delete' functionality, with tests 2015-10-26 14:24:13 -06:00
meejah
716d45dbdd smoketest for magic-folder functionality 2015-10-26 14:20:03 -06:00
Daira Hopwood
5d2365f6c4 Describe use of size=None for deleted files. refs ticket:1710.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:19:13 +00:00
Daira Hopwood
85bcd89f3a Schema change for last_uploaded_uri.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:18:11 +00:00
Daira Hopwood
277c996e4a Earth Dragons: take into account that the replaced file may not exist.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:17:46 +00:00
Daira Hopwood
7d996dbb19 Writing a file without a db entry is an overwrite.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:13:36 +00:00