git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/log

commit | commitdiff | tree

Daira Hopwood [Tue, 8 Dec 2015 16:14:00 +0000 (16:14 +0000)]

Merge pull request #210 from david415/2593.remove_from_config.0

Remove magic_folder subsection from default tahoe.cfg

commit | commitdiff | tree

Daira Hopwood [Tue, 8 Dec 2015 15:51:48 +0000 (15:51 +0000)]

Merge pull request #209 from david415/2554.remove-exclude-stat.0

Remove magic-folder exclude stat

commit | commitdiff | tree

David Stainton [Tue, 8 Dec 2015 01:16:33 +0000 (03:16 +0200)]

remove magic_folder from config in test

commit | commitdiff | tree

David Stainton [Mon, 7 Dec 2015 21:08:09 +0000 (23:08 +0200)]

Remove magic_folder subsection from default tahoe.cfg

commit | commitdiff | tree

David Stainton [Mon, 7 Dec 2015 20:54:59 +0000 (22:54 +0200)]

Remove magic-folder exclude stat

drop Python 2.6 (.travis.yml, doc, setup.py)

Twisted 15 dropped support for it, which causes Travis CI tests to fail on 2.6.
We still theoretically support older versions of Twisted, so perhaps we should
configure Travis to test with those? I think we should drop Python 2.6 in any
case since distros are all on 2.7 now.

I'm leaving Travis running (and ignoring) the failing PyPy tests because I
don't know why that is there.

commit | commitdiff | tree

Daira Hopwood [Thu, 3 Dec 2015 01:00:41 +0000 (01:00 +0000)]

Merge pull request #205 from tahoe-lafs/2568.make-join-useable.1

2568.make-join-useable.1

commit | commitdiff | tree

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>

commit | commitdiff | tree

David Stainton [Tue, 10 Nov 2015 15:24:44 +0000 (16:24 +0100)]

teach leave to: remove magic_folder section of config

commit | commitdiff | tree

David Stainton [Thu, 5 Nov 2015 16:24:52 +0000 (17:24 +0100)]

Add simple magic-folder leave command

commit | commitdiff | tree

David Stainton [Thu, 5 Nov 2015 16:09:17 +0000 (17:09 +0100)]

Teach join to also check for existing magicfolder db file

commit | commitdiff | tree

David Stainton [Thu, 5 Nov 2015 15:56:31 +0000 (16:56 +0100)]

Prevent magic-folder join if already joined.

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Wed, 4 Nov 2015 12:28:07 +0000 (12:28 +0000)]

Minor simplification.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

David Stainton [Wed, 4 Nov 2015 11:27:31 +0000 (12:27 +0100)]

Simply conflict detection by removing nested if statements

commit | commitdiff | tree

David Stainton [Wed, 4 Nov 2015 09:55:50 +0000 (10:55 +0100)]

Scan our own dmd upon start only

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

David Stainton [Tue, 3 Nov 2015 12:28:28 +0000 (13:28 +0100)]

Fix test helper _check_version_in_local_db

commit | commitdiff | tree

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>

commit | commitdiff | tree

David Stainton [Thu, 29 Oct 2015 16:27:34 +0000 (17:27 +0100)]

commit | commitdiff | tree

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>

commit | commitdiff | tree

David Stainton [Thu, 29 Oct 2015 12:19:11 +0000 (13:19 +0100)]

Create test for last upload uri conflict

commit | commitdiff | tree

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>

commit | commitdiff | tree

David Stainton [Wed, 28 Oct 2015 15:46:30 +0000 (16:46 +0100)]

Add debugging print statement for timestamp comparison

commit | commitdiff | tree

David Stainton [Wed, 28 Oct 2015 15:41:48 +0000 (16:41 +0100)]

Add last uploaded timestamp comparison for remote conflict detection

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Tue, 3 Nov 2015 02:53:57 +0000 (02:53 +0000)]

Workaround.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Tue, 3 Nov 2015 02:28:49 +0000 (02:28 +0000)]

Cosmetics.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Mon, 2 Nov 2015 22:12:09 +0000 (22:12 +0000)]

Fix test_errors.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Mon, 2 Nov 2015 22:10:55 +0000 (22:10 +0000)]

Debugging WIP.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Mon, 2 Nov 2015 17:15:36 +0000 (17:15 +0000)]

Magic Folder docs: status of tests on Windows.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Mon, 2 Nov 2015 14:24:24 +0000 (14:24 +0000)]

More Magic Folder doc updates.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Mon, 2 Nov 2015 14:14:49 +0000 (14:14 +0000)]

Magic Folder doc updates.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Thu, 29 Oct 2015 21:15:24 +0000 (21:15 +0000)]

Fix the change to turn off bridging to Twisted log.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Thu, 29 Oct 2015 21:12:14 +0000 (21:12 +0000)]

Fix unused import.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Thu, 29 Oct 2015 21:10:55 +0000 (21:10 +0000)]

Revert pinning of Twisted 15.2.0 which causes more problems than it solves.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Thu, 29 Oct 2015 20:53:36 +0000 (20:53 +0000)]

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>

commit | commitdiff | tree

Daira Hopwood [Wed, 28 Oct 2015 20:57:29 +0000 (20:57 +0000)]

Merge pull request #200 from meejah/2438.magic-folder-stable.5

some minor fixes for instructions

fix the windows command-line too

some minor fixes for instructions

commit | commitdiff | tree

Daira Hopwood [Wed, 28 Oct 2015 17:00:57 +0000 (17:00 +0000)]

Windows path fix.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Wed, 28 Oct 2015 16:58:49 +0000 (16:58 +0000)]

magic-folder-howto.rst formatting fixes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Wed, 28 Oct 2015 16:54:37 +0000 (16:54 +0000)]

Add docs/magic-folder-howto.rst.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Wed, 28 Oct 2015 02:57:15 +0000 (02:57 +0000)]

Quote local paths correctly in the output of node creation commands. fixes ticket:2556

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Tue, 27 Oct 2015 20:55:14 +0000 (20:55 +0000)]

Depend on Twisted >= 15.2.0 and (finally!) retire the setup_requires hack.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Tue, 27 Oct 2015 20:07:41 +0000 (20:07 +0000)]

Flush handling WIP.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Sat, 24 Oct 2015 00:14:18 +0000 (01:14 +0100)]

Fix fileutil tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Fri, 23 Oct 2015 22:13:43 +0000 (23:13 +0100)]

More path fixes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

David Stainton [Tue, 27 Oct 2015 09:59:29 +0000 (10:59 +0100)]

Add file conflict unit test

commit | commitdiff | tree

David Stainton [Tue, 27 Oct 2015 08:44:01 +0000 (09:44 +0100)]

Add basic bob upload test and fix conflict detect

commit | commitdiff | tree

David Stainton [Tue, 27 Oct 2015 08:18:50 +0000 (09:18 +0100)]

Fix bob's uploading test...

commit | commitdiff | tree

David Stainton [Mon, 26 Oct 2015 23:17:47 +0000 (00:17 +0100)]

Attempt to teach bob to upload a file

commit | commitdiff | tree

David Stainton [Mon, 26 Oct 2015 20:59:56 +0000 (21:59 +0100)]

Count conflicted objects

commit | commitdiff | tree

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>

commit | commitdiff | tree

Daira Hopwood [Tue, 27 Oct 2015 01:54:54 +0000 (01:54 +0000)]

magic-folder.rst: remove "Known Issues and Limitations" that have been fixed.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

Daira Hopwood [Tue, 27 Oct 2015 01:53:50 +0000 (01:53 +0000)]

magic-folder.rst: update introduction.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>