tahoe-lafs/tahoe-lafs.git
9 years agoMove declaration of is_conflict to a smaller scope
David Stainton [Mon, 26 Oct 2015 17:41:47 +0000 (18:41 +0100)]
Move declaration of is_conflict to a smaller scope

9 years agoOnly compare dmd_last_downloaded_uri if it's not None
David Stainton [Mon, 26 Oct 2015 14:14:21 +0000 (15:14 +0100)]
Only compare dmd_last_downloaded_uri if it's not None

9 years agofix format string
David Stainton [Mon, 26 Oct 2015 14:04:51 +0000 (15:04 +0100)]
fix format string

9 years agoAdd get conflicted filename helper function
David Stainton [Mon, 26 Oct 2015 14:01:53 +0000 (15:01 +0100)]
Add get conflicted filename helper function

9 years agoBasic remote conflict detection based on ancestor uri
Daira Hopwood [Tue, 27 Oct 2015 15:13:31 +0000 (15:13 +0000)]
Basic remote conflict detection based on ancestor uri

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agomagic-folder.rst: remove "Known Issues and Limitations" that have been fixed. 2438.magic-folder-stable.4
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>
9 years agomagic-folder.rst: update introduction.
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>
9 years agoAvoid .format, since it is inconsistent between Python 2.6 and 2.7 (and the rest...
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>
9 years agoFix test_alice_bob. 199/head
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>
9 years agoAdd counter for uploader.objects_not_uploaded.
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>
9 years agoAdvance Bob's clock after notifying.
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>
9 years agotest_alice_bob: use magic= argument to notify, rather than self.magicfolder.
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>
9 years agoadd excluded check
meejah [Mon, 26 Oct 2015 18:01:03 +0000 (12:01 -0600)]
add excluded check

9 years agoadd the 'spurious' notifies
meejah [Mon, 26 Oct 2015 17:25:56 +0000 (11:25 -0600)]
add the 'spurious' notifies

9 years agoFix a pyflakes warning and check existence of file in Bob's local dir.
Daira Hopwood [Mon, 26 Oct 2015 17:22:13 +0000 (17:22 +0000)]
Fix a pyflakes warning and check existence of file in Bob's local dir.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoimplement 'delete' functionality, with tests
meejah [Thu, 8 Oct 2015 19:00:25 +0000 (13:00 -0600)]
implement 'delete' functionality, with tests

9 years agosmoketest for magic-folder functionality
meejah [Thu, 8 Oct 2015 18:51:21 +0000 (12:51 -0600)]
smoketest for magic-folder functionality

9 years agoDescribe use of size=None for deleted files. refs ticket:1710.
Daira Hopwood [Sun, 25 Oct 2015 13:19:13 +0000 (13:19 +0000)]
Describe use of size=None for deleted files. refs ticket:1710.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoSchema change for last_uploaded_uri.
Daira Hopwood [Sun, 25 Oct 2015 13:18:11 +0000 (13:18 +0000)]
Schema change for last_uploaded_uri.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoEarth Dragons: take into account that the replaced file may not exist.
Daira Hopwood [Sun, 25 Oct 2015 13:17:46 +0000 (13:17 +0000)]
Earth Dragons: take into account that the replaced file may not exist.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoWriting a file without a db entry is an overwrite.
Daira Hopwood [Sun, 25 Oct 2015 13:13:36 +0000 (13:13 +0000)]
Writing a file without a db entry is an overwrite.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoremote-to-local-sync.rst: fix an inconsistency in the representation option table.
Daira Hopwood [Sun, 25 Oct 2015 11:18:23 +0000 (11:18 +0000)]
remote-to-local-sync.rst: fix an inconsistency in the representation option table.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd test that we don't write files outside the magic folder directory. refs ticket... 2506.enforce-paths.5
Daira Hopwood [Thu, 22 Oct 2015 13:30:13 +0000 (14:30 +0100)]
Add test that we don't write files outside the magic folder directory. refs ticket:2506

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFix infinite loop in should_ignore_path for absolute paths.
Daira Hopwood [Thu, 22 Oct 2015 13:28:26 +0000 (14:28 +0100)]
Fix infinite loop in should_ignore_path for absolute paths.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMore debug logging.
Daira Hopwood [Thu, 22 Oct 2015 13:27:39 +0000 (14:27 +0100)]
More debug logging.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoUnicode fix for do_join. 2533.fix-cli-parsing.1
Daira Hopwood [Tue, 20 Oct 2015 20:50:00 +0000 (21:50 +0100)]
Unicode fix for do_join.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMinor cleanups to tests.
Daira Hopwood [Tue, 20 Oct 2015 20:43:54 +0000 (21:43 +0100)]
Minor cleanups to tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoEnsure that errors from Alice-and-Bob tests are reported correctly if setup fails.
Daira Hopwood [Tue, 20 Oct 2015 20:37:05 +0000 (21:37 +0100)]
Ensure that errors from Alice-and-Bob tests are reported correctly if setup fails.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoCosmetics.
Daira Hopwood [Tue, 20 Oct 2015 20:36:11 +0000 (21:36 +0100)]
Cosmetics.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoEliminate duplicate parsing of invite code.
Daira Hopwood [Tue, 20 Oct 2015 20:19:04 +0000 (21:19 +0100)]
Eliminate duplicate parsing of invite code.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoRemaining test fixes.
Daira Hopwood [Tue, 20 Oct 2015 16:31:03 +0000 (17:31 +0100)]
Remaining test fixes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMake sure that do_cli is only called with strs, and avoid unnecessary use of attribut...
Daira Hopwood [Tue, 20 Oct 2015 16:30:53 +0000 (17:30 +0100)]
Make sure that do_cli is only called with strs, and avoid unnecessary use of attributes in tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoCosmetics.
Daira Hopwood [Tue, 20 Oct 2015 16:27:38 +0000 (17:27 +0100)]
Cosmetics.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoURIs are strs.
Daira Hopwood [Tue, 20 Oct 2015 16:16:32 +0000 (17:16 +0100)]
URIs are strs.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAliases and nicknames are Unicode.
Daira Hopwood [Tue, 20 Oct 2015 16:13:58 +0000 (17:13 +0100)]
Aliases and nicknames are Unicode.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd precondition that arguments to do_cli are strs.
Daira Hopwood [Tue, 20 Oct 2015 14:12:36 +0000 (15:12 +0100)]
Add precondition that arguments to do_cli are strs.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFix call to argv_to_abspath. Also rename localdir to local_dir.
Daira Hopwood [Tue, 20 Oct 2015 13:52:00 +0000 (14:52 +0100)]
Fix call to argv_to_abspath. Also rename localdir to local_dir.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFix magic-folder cli tests
David Stainton [Tue, 20 Oct 2015 12:27:05 +0000 (14:27 +0200)]
Fix magic-folder cli tests

convert path to abs path when matching
strings in the generated config file.

9 years agoAttempt to fix cli tests
David Stainton [Tue, 20 Oct 2015 11:08:14 +0000 (13:08 +0200)]
Attempt to fix cli tests

9 years agoBetter but still broken tests.
Daira Hopwood [Mon, 19 Oct 2015 17:25:02 +0000 (18:25 +0100)]
Better but still broken tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFix check for initial '-' in argv_to_abspath.
Daira Hopwood [Mon, 19 Oct 2015 17:24:33 +0000 (18:24 +0100)]
Fix check for initial '-' in argv_to_abspath.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFix tests by submitting unicode args instead of str
David Stainton [Mon, 19 Oct 2015 14:14:12 +0000 (16:14 +0200)]
Fix tests by submitting unicode args instead of str

9 years agoTeach magic-folder join to use argv_to_abspath
David Stainton [Mon, 19 Oct 2015 14:02:28 +0000 (16:02 +0200)]
Teach magic-folder join to use argv_to_abspath

- also we modify argv_to_abspath to through a usage error
if the name starts with a '-'

- add a test
currently the tests fail

9 years agoUse argv_to_abspath for magic-folder join file path arg
David Stainton [Mon, 19 Oct 2015 12:14:32 +0000 (14:14 +0200)]
Use argv_to_abspath for magic-folder join file path arg

9 years agoTest creation of a subdirectory. 2521.magic-db-schema.1
Daira Hopwood [Fri, 16 Oct 2015 19:39:39 +0000 (20:39 +0100)]
Test creation of a subdirectory.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoWatch for IN_CREATE events but filter them out for non-directories.
Daira Hopwood [Fri, 16 Oct 2015 15:21:50 +0000 (16:21 +0100)]
Watch for IN_CREATE events but filter them out for non-directories.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoPatch Downloader.REMOTE_SCAN_INTERVAL rather than setting it persistently.
Daira Hopwood [Fri, 16 Oct 2015 02:27:59 +0000 (03:27 +0100)]
Patch Downloader.REMOTE_SCAN_INTERVAL rather than setting it persistently.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoImplement creating local directories in downloader.
Daira Hopwood [Fri, 16 Oct 2015 02:27:20 +0000 (03:27 +0100)]
Implement creating local directories in downloader.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoDecode names in the scanned remote.
Daira Hopwood [Fri, 16 Oct 2015 02:25:45 +0000 (03:25 +0100)]
Decode names in the scanned remote.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoRefactoring to allow logging from _write_downloaded_file and _rename_conflicted_file.
Daira Hopwood [Fri, 16 Oct 2015 02:24:46 +0000 (03:24 +0100)]
Refactoring to allow logging from _write_downloaded_file and _rename_conflicted_file.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoSimplify and fix non-existent-file handling.
Daira Hopwood [Thu, 15 Oct 2015 22:02:30 +0000 (23:02 +0100)]
Simplify and fix non-existent-file handling.
Also make the existent and non-existent cases as similar as possible,
with a view to merging them.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoLogging/debugging improvements.
Daira Hopwood [Thu, 15 Oct 2015 22:02:07 +0000 (23:02 +0100)]
Logging/debugging improvements.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoRefactor and fix race conditions in test_alice_bob.
Daira Hopwood [Thu, 15 Oct 2015 21:56:38 +0000 (22:56 +0100)]
Refactor and fix race conditions in test_alice_bob.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoCorrect a call to did_upload_version in the downloader.
Daira Hopwood [Tue, 13 Oct 2015 14:56:31 +0000 (15:56 +0100)]
Correct a call to did_upload_version in the downloader.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMake sure that test_move_tree waits until files have been uploaded as well as downloaded.
Daira Hopwood [Tue, 13 Oct 2015 14:56:00 +0000 (15:56 +0100)]
Make sure that test_move_tree waits until files have been uploaded as well as downloaded.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoRestore a call to increment files_uploaded that was mistakenly removed.
Daira Hopwood [Tue, 13 Oct 2015 14:55:00 +0000 (15:55 +0100)]
Restore a call to increment files_uploaded that was mistakenly removed.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoTeach uploader+downloader to use to db schema
David Stainton [Mon, 12 Oct 2015 18:07:39 +0000 (20:07 +0200)]
Teach uploader+downloader to use to db schema

here we attempt to fix all the unit tests as well...
however two tests still fail

9 years agoAdd magicfolderdb.py.
Daira Hopwood [Thu, 8 Oct 2015 15:01:46 +0000 (16:01 +0100)]
Add magicfolderdb.py.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoRemove magic-folder db code from backupdb.py
David Stainton [Thu, 8 Oct 2015 14:33:27 +0000 (16:33 +0200)]
Remove magic-folder db code from backupdb.py

9 years agoWIP
David Stainton [Wed, 7 Oct 2015 16:45:44 +0000 (18:45 +0200)]
WIP

9 years agoInclude brief summary of magic-folder CLI commands
David Stainton [Tue, 6 Oct 2015 16:11:08 +0000 (18:11 +0200)]
Include brief summary of magic-folder CLI commands

9 years agoAdd link to our cli design doc
David Stainton [Tue, 6 Oct 2015 16:04:16 +0000 (18:04 +0200)]
Add link to our cli design doc

9 years agoMention gc is not part of the otf grant and link to the gc ticket
David Stainton [Tue, 6 Oct 2015 15:57:18 +0000 (17:57 +0200)]
Mention gc is not part of the otf grant and link to the gc ticket

9 years agoRemove old obsolete/inaccurate statements
David Stainton [Tue, 6 Oct 2015 15:52:26 +0000 (17:52 +0200)]
Remove old obsolete/inaccurate statements

9 years agoMinor comment correction for get_all_relpaths
David Stainton [Mon, 5 Oct 2015 11:54:38 +0000 (13:54 +0200)]
Minor comment correction for get_all_relpaths

9 years agoFor all downloaded files ensure parent dir exists
David Stainton [Mon, 5 Oct 2015 10:59:58 +0000 (12:59 +0200)]
For all downloaded files ensure parent dir exists

9 years agoSimplify the cleanup_Alice_and_Bob callback.
Daira Hopwood [Thu, 8 Oct 2015 13:42:47 +0000 (14:42 +0100)]
Simplify the cleanup_Alice_and_Bob callback.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMake downloader delay a class-variable
meejah [Thu, 8 Oct 2015 02:32:19 +0000 (20:32 -0600)]
Make downloader delay a class-variable

This gives the integration-style CLI-based tests a chance
to set the delay to 0 before the first 3-second delayed
call is queued to _lazy_tail in the Downloader

9 years agoTeach unit-tests to time-warp
meejah [Wed, 7 Oct 2015 23:03:28 +0000 (17:03 -0600)]
Teach unit-tests to time-warp

1. Split alice/bob clocks to avoid races conditions
   in the tests
2. Wrap ._notify so we can advance the clock after inotify
   calls in the RealTest (since it takes >0ms to do the "real" notifies)

9 years agoMerge pull request #193 from meejah/2438.magic-folder-stable.3
Daira Hopwood [Thu, 8 Oct 2015 13:07:05 +0000 (14:07 +0100)]
Merge pull request #193 from meejah/2438.magic-folder-stable.3

Fix call to ready()

9 years agoFix call to ready() 193/head
meejah [Tue, 6 Oct 2015 20:11:32 +0000 (14:11 -0600)]
Fix call to ready()

9 years agoCorrect a string-type error.
Daira Hopwood [Fri, 2 Oct 2015 21:08:54 +0000 (22:08 +0100)]
Correct a string-type error.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoWIP.
Daira Hopwood [Thu, 1 Oct 2015 21:40:10 +0000 (22:40 +0100)]
WIP.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMagic Folder file moves.
Daira Hopwood [Thu, 1 Oct 2015 21:36:18 +0000 (22:36 +0100)]
Magic Folder file moves.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoPrepare to move drop_upload.py to magic_folder.py. 2438.magic-folder-stable.2
Daira Hopwood [Wed, 16 Sep 2015 13:59:49 +0000 (14:59 +0100)]
Prepare to move drop_upload.py to magic_folder.py.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMove backupdb.py to src/allmydata.
Daira Hopwood [Wed, 16 Sep 2015 13:32:13 +0000 (14:32 +0100)]
Move backupdb.py to src/allmydata.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoRename upload_ready_d to connected_enough_d.
Daira Hopwood [Wed, 16 Sep 2015 13:28:46 +0000 (14:28 +0100)]
Rename upload_ready_d to connected_enough_d.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoDocumentation changes for Magic Folder.
Daira Hopwood [Wed, 16 Sep 2015 13:24:10 +0000 (14:24 +0100)]
Documentation changes for Magic Folder.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoTeach StorageFarmBroker to fire a deferred when a connection threshold is reached...
Daira Hopwood [Tue, 28 Apr 2015 20:03:45 +0000 (21:03 +0100)]
Teach StorageFarmBroker to fire a deferred when a connection threshold is reached. refs #1449

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoEnable Windows inotify support.
Daira Hopwood [Tue, 28 Apr 2015 19:58:07 +0000 (20:58 +0100)]
Enable Windows inotify support.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoNew code for Windows drop-upload support. refs #1431
Daira Hopwood [Tue, 28 Apr 2015 19:13:44 +0000 (20:13 +0100)]
New code for Windows drop-upload support. refs #1431

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoDocs for drop-upload on Windows.
Daira Hopwood [Tue, 28 Apr 2015 19:11:40 +0000 (20:11 +0100)]
Docs for drop-upload on Windows.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd magic folder db.
Daira Hopwood [Tue, 28 Apr 2015 19:52:05 +0000 (20:52 +0100)]
Add magic folder db.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoUnicode path fixes for drop-upload.
Daira Hopwood [Tue, 28 Apr 2015 19:43:09 +0000 (20:43 +0100)]
Unicode path fixes for drop-upload.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years ago.travis.yml: pin coverage version to 3.7.1. fixes ticket:2511 2511.fix-coveralls.0
Daira Hopwood [Thu, 1 Oct 2015 00:11:14 +0000 (01:11 +0100)]
.travis.yml: pin coverage version to 3.7.1. fixes ticket:2511

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMerge branch '2510-new-foolscap'
Brian Warner [Wed, 23 Sep 2015 04:30:03 +0000 (21:30 -0700)]
Merge branch '2510-new-foolscap'

9 years agointroweb: fix connection hints for server announcements 190/head
Brian Warner [Tue, 22 Sep 2015 23:37:12 +0000 (16:37 -0700)]
introweb: fix connection hints for server announcements

A long time ago, the introducer's status web page would show the
advertised IP addresses for all published services, by parsing their
FURL's connection hints. This hasn't worked since about 12-Aug-2014 when
foolscap-0.6.5 changed the internal format of these hints (the column
has been empty this whole time).

This removes the "Advertised IPs" column from the Service Announcements
table. Instead, the service's full connection hints (not just the IP
address) is displayed in a tooltip/popup on the "Announced" timestamp
column.

The code that pulls these connection hints is now tolerant of all three
foolscap styles:

* foolscap<=0.6.4 : tuples of ("ipv4",host,port)
* 0.6.5 .. 0.8.0  : tuples of ("tcp",host,port)
* foolscap>=0.9.0 : strings

fixes ticket:2510

9 years agoremove "announcement_distinct_hosts" from introweb JSON
Brian Warner [Tue, 22 Sep 2015 23:34:50 +0000 (16:34 -0700)]
remove "announcement_distinct_hosts" from introweb JSON

The machine-parseable JSON output for the introducer status web page
used to include a key named "announcement_distinct_hosts", which counted
the number of distinct IP addresses advertised by all connected storage
servers. This hasn't worked since Aug-2014 when foolscap-0.6.5 change
the internal hints format.

This removes that field.

9 years agointroducer: stop tracking hints for subscribed clients
Brian Warner [Tue, 22 Sep 2015 23:29:34 +0000 (16:29 -0700)]
introducer: stop tracking hints for subscribed clients

A long time ago, the introducer's status web page would show the
advertised IP addresses for all subscribers, by parsing their
RemoteReference's FURL's connection hints. This hasn't worked since
about 12-Aug-2014 when foolscap-0.6.5 changed the internal format of
these hints.

This removes the feature: we no longer attempt to show advertised IP
addresses of subscribed clients. It also removes the code that looked
inside foolscap internals for this information.

9 years agotravis: use 'git fetch' to deepen, not 'git pull'
Brian Warner [Tue, 22 Sep 2015 19:10:15 +0000 (12:10 -0700)]
travis: use 'git fetch' to deepen, not 'git pull'

Travis builds of branches (i.e. pull-requests) were testing the wrong
thing, because the 'git pull' was causing current trunk to be
auto-merged. At least that's what seemed to break
https://travis-ci.org/tahoe-lafs/tahoe-lafs/jobs/81517826 : it hung
forever waiting for a commit message to be entered.

Also add "sudo: false" to use travis containers (faster) instead of new
VMs. We only use pip to install dependencies, not apt, so we don't need
root.

9 years agoAvoid spurious errors when an imported version is consistent with pkg_resources 2499.avoid-spurious-version-errors.0 188/head
Daira Hopwood [Fri, 11 Sep 2015 23:59:51 +0000 (00:59 +0100)]
Avoid spurious errors when an imported version is consistent with pkg_resources
but not parseable; also improve related error reporting. fixes ticket:2499

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMerge pull request #187 from tahoe-lafs/2493.cleanup-osx-packaging.1
Daira Hopwood [Thu, 3 Sep 2015 14:23:10 +0000 (15:23 +0100)]
Merge pull request #187 from tahoe-lafs/2493.cleanup-osx-packaging.1

2493.cleanup osx packaging.1

9 years agoMove manpage into a heirarchical man1 path. 2493.cleanup-osx-packaging.1 187/head
Ramakrishnan Muthukrishnan [Thu, 3 Sep 2015 13:47:27 +0000 (19:17 +0530)]
Move manpage into a heirarchical man1 path.

Author: Ramakrishnan Muthukrishnan <ram@leastauthority.com>

9 years agoOS-X package: add a preinstall script and copy the manpage into /etc/manpaths.d.
Ramakrishnan Muthukrishnan [Wed, 2 Sep 2015 04:44:06 +0000 (10:14 +0530)]
OS-X package: add a preinstall script and copy the manpage into /etc/manpaths.d.

The preinstall script detects previous installation and removes it.

Author: Ramakrishnan Muthukrishnan <ram@leastauthority.com>

9 years agoChange some instances of "filesystem" that were missed to "file store".
Daira Hopwood [Fri, 31 Jul 2015 17:21:47 +0000 (18:21 +0100)]
Change some instances of "filesystem" that were missed to "file store".

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoupdate docs for 1.10.2 release allmydata-tahoe-1.10.2
Brian Warner [Fri, 31 Jul 2015 02:35:00 +0000 (19:35 -0700)]
update docs for 1.10.2 release

9 years agoadd a pypy that is allowed to fail 180/head 181/head
HawkOwl [Wed, 29 Jul 2015 02:21:31 +0000 (12:21 +1000)]
add a pypy that is allowed to fail

9 years agoupdate NEWS with recent changes allmydata-tahoe-1.10.2b1
Brian Warner [Wed, 29 Jul 2015 01:10:40 +0000 (18:10 -0700)]
update NEWS with recent changes

9 years agoquickstart: Mention python-dev package for Python.h
Brian Warner [Mon, 15 Jun 2015 04:21:22 +0000 (21:21 -0700)]
quickstart: Mention python-dev package for Python.h

Closes ticket:2328.

9 years agoMerge branch '2447-cp-overwrite'
Brian Warner [Wed, 29 Jul 2015 00:39:39 +0000 (17:39 -0700)]
Merge branch '2447-cp-overwrite'