]>
git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/log
Daira Hopwood [Mon, 28 Dec 2015 19:18:28 +0000 (19:18 +0000)]
Fix a subtle bug in the overwrite algorithm.
See https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2640#comment:3 .
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 28 Dec 2015 16:27:53 +0000 (16:27 +0000)]
configuration.rst: update some stale references to drop-upload.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 21 Dec 2015 21:59:57 +0000 (21:59 +0000)]
Teach magic-folder join to use configutil.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Fri, 4 Dec 2015 12:46:30 +0000 (14:46 +0200)]
Add magic-folder test_scan_once_on_startup
Daira Hopwood [Mon, 21 Dec 2015 21:30:29 +0000 (21:30 +0000)]
Various test cleanups.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 9 Dec 2015 11:12:33 +0000 (13:12 +0200)]
Teach join twice test to test for proper stdout and stderr values
David Stainton [Wed, 9 Dec 2015 10:45:33 +0000 (12:45 +0200)]
More thorough checks to the join leave join test
David Stainton [Fri, 4 Dec 2015 10:00:14 +0000 (12:00 +0200)]
Fix test_join_leave_join
David Stainton [Thu, 3 Dec 2015 12:58:31 +0000 (14:58 +0200)]
Add more magic-folder join leave tests
David Stainton [Thu, 3 Dec 2015 02:44:54 +0000 (04:44 +0200)]
Add unit test for join twice failure
Daira Hopwood [Mon, 14 Dec 2015 22:08:31 +0000 (22:08 +0000)]
Delay only the download scan not the turning of our event queue.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 9 Dec 2015 15:35:26 +0000 (17:35 +0200)]
Fix magic folder constructor signature in test
David Stainton [Wed, 9 Dec 2015 11:26:43 +0000 (13:26 +0200)]
Fix tests usage of umask
David Stainton [Tue, 8 Dec 2015 15:54:36 +0000 (17:54 +0200)]
Fix umask again
David Stainton [Tue, 8 Dec 2015 15:44:59 +0000 (17:44 +0200)]
Fix umask usage bit fiddling and use try finally blocks
David Stainton [Tue, 8 Dec 2015 01:16:33 +0000 (03:16 +0200)]
remove magic_folder from config in test
David Stainton [Tue, 8 Dec 2015 01:01:19 +0000 (03:01 +0200)]
Add download.umask config option with default of 077
David Stainton [Tue, 8 Dec 2015 00:47:27 +0000 (02:47 +0200)]
Add umask to Downloader
David Stainton [Mon, 7 Dec 2015 21:08:09 +0000 (23:08 +0200)]
Remove magic_folder subsection from default tahoe.cfg
David Stainton [Mon, 7 Dec 2015 20:54:59 +0000 (22:54 +0200)]
Remove magic-folder exclude stat
Daira Hopwood [Wed, 2 Dec 2015 15:54:01 +0000 (15:54 +0000)]
Improve the error reporting for 'tahoe magic-folder join/leave'. refs #2568
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Tue, 10 Nov 2015 15:24:44 +0000 (16:24 +0100)]
teach leave to: remove magic_folder section of config
David Stainton [Thu, 5 Nov 2015 16:24:52 +0000 (17:24 +0100)]
Add simple magic-folder leave command
David Stainton [Thu, 5 Nov 2015 16:09:17 +0000 (17:09 +0100)]
Teach join to also check for existing magicfolder db file
David Stainton [Thu, 5 Nov 2015 15:56:31 +0000 (16:56 +0100)]
Prevent magic-folder join if already joined.
Daira Hopwood [Wed, 4 Nov 2015 14:38:53 +0000 (14:38 +0000)]
Refactor is_new_file.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 4 Nov 2015 14:13:31 +0000 (14:13 +0000)]
.gitignore: add /smoke_magicfolder/, delete obsolete stuff.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 4 Nov 2015 13:56:49 +0000 (13:56 +0000)]
Add section for "Conflict/overwrite decision algorithm" and label substeps so that we can refer to them from the code.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 4 Nov 2015 13:00:32 +0000 (13:00 +0000)]
Clarify corner cases in the conflict/overwrite decision.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 4 Nov 2015 12:28:07 +0000 (12:28 +0000)]
Minor simplification.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 4 Nov 2015 11:27:31 +0000 (12:27 +0100)]
Simply conflict detection by removing nested if statements
David Stainton [Wed, 4 Nov 2015 09:55:50 +0000 (10:55 +0100)]
Scan our own dmd upon start only
meejah [Mon, 2 Nov 2015 20:38:15 +0000 (13:38 -0700)]
remove print
meejah [Mon, 2 Nov 2015 20:25:50 +0000 (13:25 -0700)]
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.
David Stainton [Tue, 3 Nov 2015 19:29:51 +0000 (20:29 +0100)]
Fix test: previously we accounted for the propagation of the conflict
because alice scaned her own dmd... whereas now she does not.
David Stainton [Tue, 3 Nov 2015 12:28:28 +0000 (13:28 +0100)]
Fix test helper _check_version_in_local_db
Daira Hopwood [Thu, 29 Oct 2015 20:43:44 +0000 (20:43 +0000)]
WIP: Refactoring to get db fields in one query.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Thu, 29 Oct 2015 16:27:34 +0000 (17:27 +0100)]
WIP
Daira Hopwood [Tue, 3 Nov 2015 22:26:01 +0000 (22:26 +0000)]
Fix pending upload conflict detection.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Thu, 29 Oct 2015 12:19:11 +0000 (13:19 +0100)]
Create test for last upload uri conflict
Daira Hopwood [Tue, 3 Nov 2015 22:23:14 +0000 (22:23 +0000)]
Detect remote conflict by checking for pending upload.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 28 Oct 2015 15:46:30 +0000 (16:46 +0100)]
Add debugging print statement for timestamp comparison
David Stainton [Wed, 28 Oct 2015 15:41:48 +0000 (16:41 +0100)]
Add last uploaded timestamp comparison for remote conflict detection
Daira Hopwood [Tue, 3 Nov 2015 03:03:47 +0000 (03:03 +0000)]
Fix an unused import.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 3 Nov 2015 03:03:33 +0000 (03:03 +0000)]
Fix some miscapture bugs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 3 Nov 2015 02:53:57 +0000 (02:53 +0000)]
Workaround.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 3 Nov 2015 02:32:41 +0000 (02:32 +0000)]
Simplify _notify and improve logging.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 3 Nov 2015 02:31:34 +0000 (02:31 +0000)]
Simplify _scan_remote_* and remove Downloader._download_scan_batch attribute.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 3 Nov 2015 02:28:49 +0000 (02:28 +0000)]
Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 3 Nov 2015 02:27:39 +0000 (02:27 +0000)]
Downloader doesn't need the pending set.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 3 Nov 2015 01:14:19 +0000 (01:14 +0000)]
Delete redundant is_ready attribute from MagicFolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 22:30:34 +0000 (22:30 +0000)]
test_encodingutil: fixes for Unix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 22:12:38 +0000 (22:12 +0000)]
Add precondition to Uploader._process.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 22:12:09 +0000 (22:12 +0000)]
Fix test_errors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 22:11:30 +0000 (22:11 +0000)]
Fix test_move_tree.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 22:10:55 +0000 (22:10 +0000)]
Debugging WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 22:00:31 +0000 (22:00 +0000)]
Fix a corner case for to_filepath on Windows to make it consistent with Unix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 21:43:41 +0000 (21:43 +0000)]
test_encodingutil: add tests for FilePath-related functions.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 21:42:42 +0000 (21:42 +0000)]
test_encodingutil: use self.patch rather than modifying encodingutil.io_encoding directly.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 21:41:10 +0000 (21:41 +0000)]
Depend on FilePath.asTextMode().
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 2 Nov 2015 15:16:21 +0000 (15:16 +0000)]
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>
Daira Hopwood [Fri, 30 Oct 2015 02:04:30 +0000 (02:04 +0000)]
Don't add subdirectory watches if the platform's notifier doesn't require them. refs #2559
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 30 Oct 2015 02:03:26 +0000 (02:03 +0000)]
Improve reporting of assertion failures.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 29 Oct 2015 21:12:14 +0000 (21:12 +0000)]
Fix unused import.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 28 Oct 2015 13:49:43 +0000 (13:49 +0000)]
Add test for 'tahoe create-node/client/introducer' output. closes ticket:2556
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 28 Oct 2015 00:33:59 +0000 (00:33 +0000)]
bin\tahoe can't be run directly on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 21:39:05 +0000 (21:39 +0000)]
Strip any long path marker in the input to flush_volume.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 21:38:03 +0000 (21:38 +0000)]
Correct type for Windows BOOL.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 20:36:04 +0000 (20:36 +0000)]
Disable precondition that autoAdd == recursive.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 20:35:41 +0000 (20:35 +0000)]
Fix a type error.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 20:07:41 +0000 (20:07 +0000)]
Flush handling WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 13:56:32 +0000 (13:56 +0000)]
Use fileutil.write for magic folder tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 14:47:11 +0000 (14:47 +0000)]
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>
Daira Hopwood [Tue, 27 Oct 2015 12:02:57 +0000 (12:02 +0000)]
Consolidate Windows-specific imports in fileutil to avoid pyflakes warnings.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Sat, 24 Oct 2015 00:14:56 +0000 (01:14 +0100)]
replace_file should allow the replaced file not to exist on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Sat, 24 Oct 2015 00:14:18 +0000 (01:14 +0100)]
Fix fileutil tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 22:13:43 +0000 (23:13 +0100)]
More path fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 21:28:35 +0000 (22:28 +0100)]
Fix a test broken by the last commit.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 21:05:34 +0000 (22:05 +0100)]
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>
Daira Hopwood [Fri, 23 Oct 2015 21:04:08 +0000 (22:04 +0100)]
Don't use a long path for the [magic_folder]local.directory field.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 21:02:09 +0000 (22:02 +0100)]
Fix some path Unixisms.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 20:58:39 +0000 (21:58 +0100)]
Add long_path=False option to abspath_expanduser_unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 19:31:22 +0000 (19:31 +0000)]
Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 19:29:14 +0000 (19:29 +0000)]
Refactor _check_up/downloader_count.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 17:10:15 +0000 (17:10 +0000)]
Don't download the deletion marker file unnecessarily.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 17:09:40 +0000 (17:09 +0000)]
Distinguish deletion of directories.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 17:14:25 +0000 (17:14 +0000)]
Rename deleted files to .backup rather than unlinking them.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Tue, 27 Oct 2015 09:59:29 +0000 (10:59 +0100)]
Add file conflict unit test
David Stainton [Tue, 27 Oct 2015 08:44:01 +0000 (09:44 +0100)]
Add basic bob upload test and fix conflict detect
David Stainton [Tue, 27 Oct 2015 08:18:50 +0000 (09:18 +0100)]
Fix bob's uploading test...
David Stainton [Mon, 26 Oct 2015 23:17:47 +0000 (00:17 +0100)]
Attempt to teach bob to upload a file
David Stainton [Mon, 26 Oct 2015 20:59:56 +0000 (21:59 +0100)]
Count conflicted objects
Daira Hopwood [Tue, 27 Oct 2015 18:44:45 +0000 (18:44 +0000)]
Basic remote conflict detection based on ancestor uri
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 01:20:28 +0000 (01:20 +0000)]
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>
Daira Hopwood [Mon, 26 Oct 2015 18:51:30 +0000 (18:51 +0000)]
Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 26 Oct 2015 18:51:09 +0000 (18:51 +0000)]
Add counter for uploader.objects_not_uploaded.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 26 Oct 2015 18:11:12 +0000 (18:11 +0000)]
Advance Bob's clock after notifying.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 26 Oct 2015 18:10:53 +0000 (18:10 +0000)]
test_alice_bob: use magic= argument to notify, rather than self.magicfolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
meejah [Mon, 26 Oct 2015 18:01:03 +0000 (12:01 -0600)]
add excluded check
meejah [Mon, 26 Oct 2015 17:25:56 +0000 (11:25 -0600)]
add the 'spurious' notifies
projects / tahoe-lafs / tahoe-lafs.git / log