Daira Hopwood
|
02dacbc067
|
Minor simplification.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
e990483750
|
Simply conflict detection by removing nested if statements
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
6ed4480eb9
|
Scan our own dmd upon start only
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
0aaabe0ebe
|
remove print
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
ed4e4d053e
|
Add a unit-test and correct the code for "already deleted"
If a Downloader decides that it needs to delete a file, but that
file is already gone locally, the exeption is caugt and a log message
produced.
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
49b5661347
|
Fix test: previously we accounted for the propagation of the conflict
because alice scaned her own dmd... whereas now she does not.
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
eab24d022b
|
Fix test helper _check_version_in_local_db
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
9d59ef493f
|
WIP: Refactoring to get db fields in one query.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
bca4c87e47
|
WIP
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
42f535edf9
|
Fix pending upload conflict detection.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
6eeab03b70
|
Create test for last upload uri conflict
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
e8b6b31373
|
Detect remote conflict by checking for pending upload.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
c7f38a496d
|
Add debugging print statement for timestamp comparison
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
edc671f577
|
Add last uploaded timestamp comparison for remote conflict detection
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
6402159106
|
Fix an unused import.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
c7f298bce5
|
Fix some miscapture bugs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
868c38d228
|
Workaround.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
b21a3dc070
|
Simplify _notify and improve logging.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
17384ac512
|
Simplify _scan_remote_* and remove Downloader._download_scan_batch attribute.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
d686575393
|
Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
4f41be0e70
|
Downloader doesn't need the pending set.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
017d63b47b
|
Delete redundant is_ready attribute from MagicFolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
3fab5caa02
|
test_encodingutil: fixes for Unix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
5f98d73216
|
Add precondition to Uploader._process.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
583066b364
|
Fix test_errors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
9646a3ce3e
|
Fix test_move_tree.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
0c12162bc8
|
Debugging WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
b53efdbf8b
|
Fix a corner case for to_filepath on Windows to make it consistent with Unix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
b9eb8932b6
|
test_encodingutil: add tests for FilePath-related functions.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
b6b638efd1
|
Depend on FilePath.asTextMode().
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
84af199d51
|
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>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
539cf9b378
|
Magic Folder docs: status of tests on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
abb2d6f9a9
|
More Magic Folder doc updates.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
1033c6f0c6
|
Magic Folder doc updates.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
ea14b1bebe
|
Don't add subdirectory watches if the platform's notifier doesn't require them. refs #2559
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
6bb0963197
|
Improve reporting of assertion failures.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
a5b9cf36b8
|
Fix unused import.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
2e93f3436d
|
fix the windows command-line too
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
8b2c54b518
|
some minor fixes for instructions
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
d9acaf605d
|
Windows path fix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
b672dd50fd
|
magic-folder-howto.rst formatting fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
278d713dd5
|
Add docs/magic-folder-howto.rst.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
f77c593177
|
Add test for 'tahoe create-node/client/introducer' output. closes ticket:2556
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
d1eb64c01b
|
bin\tahoe can't be run directly on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
3647ffc3a7
|
Correct type for Windows BOOL.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
9dafa2e759
|
Disable precondition that autoAdd == recursive.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
a6842946ca
|
Fix a type error.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
0e19636146
|
Flush handling WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
5e9792f8d7
|
Use fileutil.write for magic folder tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
f3803c058d
|
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>
|
2016-07-21 12:35:59 -07:00 |
|