6325 Commits

Author SHA1 Message Date
David Stainton
b5bbfe55ab Create test for last upload uri conflict 2015-11-03 22:23:21 +00:00
Daira Hopwood
dadde12eb7 Detect remote conflict by checking for pending upload.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 22:23:14 +00:00
David Stainton
cb180192c1 Add debugging print statement for timestamp comparison 2015-11-03 22:17:06 +00:00
David Stainton
dbe6395313 Add last uploaded timestamp comparison for remote conflict detection 2015-11-03 22:17:06 +00:00
Daira Hopwood
045e6844e7 Fix an unused import.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 03:03:47 +00:00
Daira Hopwood
a79d452e47 Fix some miscapture bugs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 03:03:33 +00:00
Daira Hopwood
a2e18bf43e Workaround.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 02:53:57 +00:00
Daira Hopwood
6b4dc3ac4c Simplify _notify and improve logging.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 02:32:41 +00:00
Daira Hopwood
5938535b87 Simplify _scan_remote_* and remove Downloader._download_scan_batch attribute.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 02:31:34 +00:00
Daira Hopwood
f14d24b140 Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 02:28:49 +00:00
Daira Hopwood
46bf76a1b2 Downloader doesn't need the pending set.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 02:27:39 +00:00
Daira Hopwood
4a24d3a8c0 Delete redundant is_ready attribute from MagicFolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-03 01:14:19 +00:00
Daira Hopwood
995de3bddb test_encodingutil: fixes for Unix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:30:34 +00:00
Daira Hopwood
6f7b19ab49 Add precondition to Uploader._process.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:12:38 +00:00
Daira Hopwood
09f856e487 Fix test_errors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:12:09 +00:00
Daira Hopwood
515427668a Fix test_move_tree.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:11:30 +00:00
Daira Hopwood
8a0ed1e861 Debugging WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:10:55 +00:00
Daira Hopwood
b0a9a8c847 Fix a corner case for to_filepath on Windows to make it consistent with Unix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:08:55 +00:00
Daira Hopwood
b432ef3269 test_encodingutil: add tests for FilePath-related functions.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:08:55 +00:00
Daira Hopwood
cc42b20f97 test_encodingutil: use self.patch rather than modifying encodingutil.io_encoding directly.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:08:55 +00:00
Daira Hopwood
bafac70c13 Depend on FilePath.asTextMode().
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:08:55 +00:00
Daira Hopwood
08f34a11ec WIP: exclude own dirnode from scan. This is not quite right; we shouldn't exclude it on startup. refs #2553
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:08:55 +00:00
Daira Hopwood
7720dd53a5 Magic Folder docs: status of tests on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 22:08:55 +00:00
Daira Hopwood
725903c338 More Magic Folder doc updates.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 14:24:24 +00:00
Daira Hopwood
394887c833 Magic Folder doc updates.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-11-02 14:14:49 +00:00
Daira Hopwood
14097eec7e Don't add subdirectory watches if the platform's notifier doesn't require them. refs #2559
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-30 02:04:30 +00:00
Daira Hopwood
38bf092525 Improve reporting of assertion failures.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-30 02:03:26 +00:00
Daira Hopwood
0583141543 Fix the change to turn off bridging to Twisted log.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-29 21:15:24 +00:00
Daira Hopwood
a2a4b91fd5 Fix unused import.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-29 21:12:14 +00:00
Daira Hopwood
cd81d42084 Revert pinning of Twisted 15.2.0 which causes more problems than it solves.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-29 21:10:55 +00:00
Daira Hopwood
eb4f07ffb7 Turn off bridging to Twisted log, and pin to Twisted 15.2.0.
Hopefully this will avoid http://foolscap.lothar.com/trac/ticket/244 .

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-29 20:54:14 +00:00
Daira Hopwood
6da832cf14 Merge pull request #200 from meejah/2438.magic-folder-stable.5
some minor fixes for instructions
2015-10-28 20:57:29 +00:00
meejah
6f19e74e07 fix the windows command-line too 2015-10-28 14:45:50 -06:00
meejah
fef48788b0 some minor fixes for instructions 2015-10-28 14:41:15 -06:00
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