ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-11 23:42:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,342 Commits 185 Branches 90 Tags 90 MiB
2551.wip.2
Commit Graph

6342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daira Hopwood
72310559ae Add debug prints. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-04 15:40:04 +00:00
Daira Hopwood
06298408ff Clearer names (and fix a formatting issue). 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-04 15:29:01 +00:00
Daira Hopwood
e2a3b5ff63 Fix and simplify conflict/overwrite detection. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-04 15:11:34 +00:00
Daira Hopwood
118a89e418 Refactor is_new_file. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-04 14:43:11 +00:00
Daira Hopwood
c4b9c92600 .gitignore: add /smoke_magicfolder/, delete obsolete stuff. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-04 14:43:11 +00:00
Daira Hopwood
d013262101 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>
 2015-11-04 13:56:49 +00:00
Daira Hopwood
71c65125d7 Clarify corner cases in the conflict/overwrite decision. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-04 13:00:32 +00:00
Daira Hopwood
a41cf014d1 Minor simplification. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-04 12:28:07 +00:00
David Stainton
52f27dfdc6 Simply conflict detection by removing nested if statements 2015-11-04 12:27:31 +01:00
David Stainton
e926c4cf2b Scan our own dmd upon start only 2015-11-04 11:11:05 +01:00
meejah
6ec3b9e7a5 remove print 2015-11-04 01:30:03 +00:00
meejah
174fab9eaf 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.
 2015-11-04 01:30:03 +00:00
David Stainton
aa54712094 Fix test: previously we accounted for the propagation of the conflict 
because alice scaned her own dmd... whereas now she does not.
 2015-11-03 22:26:07 +00:00
David Stainton
e1f21dd123 Fix test helper _check_version_in_local_db 2015-11-03 22:26:07 +00:00
Daira Hopwood
04b8939e65 WIP: Refactoring to get db fields in one query. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-03 22:26:07 +00:00
David Stainton
250f4f4576 WIP 2015-11-03 22:26:07 +00:00
Daira Hopwood
9044ae63d1 Fix pending upload conflict detection. 
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2015-11-03 22:26:01 +00:00
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