chiark / gitweb /
Ian Jackson [Thu, 10 Sep 2009 18:34:13 +0000 (19:34 +0100)]
Merge branch 'anaplian' into stable-3.x
Ian Jackson [Thu, 10 Sep 2009 18:33:06 +0000 (19:33 +0100)]
Revert bogus parts of "Look for master-info-v2.txt not master-info-2.txt"
This reverts most of commit
c925ba9b2af7a212378a1bb5e9f20697be857523
because that appears to accidentally revert several other changes.
We retain the one intended hunk, in Commods.pm, which had a conflict anyway.
Conflicts:
yarrg/Commods.pm
Ian Jackson [Thu, 10 Sep 2009 16:03:22 +0000 (17:03 +0100)]
Gate parsing master-info-v* on YPPSC_YARRG_YARRG rather than YPPSC_YARRG_DICT_UPDATE so --dict-no-update works better
Ian Jackson [Thu, 10 Sep 2009 16:02:25 +0000 (17:02 +0100)]
Move coping with ENOENT into parse_info1 and allow it for master-info-v*.txt
Ian Jackson [Thu, 10 Sep 2009 15:48:25 +0000 (16:48 +0100)]
Do not attempt (and fail due to safety catch) to update reject dict if --dict-no-update
Ian Jackson [Thu, 10 Sep 2009 15:44:58 +0000 (16:44 +0100)]
Do not crash if --upload-yarrg is specified but not --upload-pctb
Ian Jackson [Thu, 10 Sep 2009 15:44:32 +0000 (16:44 +0100)]
Do not spuriously refuse to upload from single-page commodity lists
Ian Jackson [Thu, 10 Sep 2009 15:44:06 +0000 (16:44 +0100)]
Expand pixmap (island name) listboxes as necessary
Ian Jackson [Thu, 10 Sep 2009 14:41:34 +0000 (15:41 +0100)]
Fix assertion failure on 2-page commodity listings
Ian Jackson [Thu, 10 Sep 2009 13:17:33 +0000 (14:17 +0100)]
Change instances of "git-foobar" to "git foobar"
Ian Jackson [Thu, 10 Sep 2009 13:04:46 +0000 (14:04 +0100)]
Use "git describe" if "git-describe" isn't on the path
Ian Jackson [Thu, 10 Sep 2009 12:59:16 +0000 (13:59 +0100)]
Look for master-info-v2.txt not master-info-2.txt
Ian Jackson [Thu, 10 Sep 2009 01:07:07 +0000 (02:07 +0100)]
Fix typos in README.privacy
Ian Jackson [Wed, 9 Sep 2009 15:46:18 +0000 (16:46 +0100)]
"Released" version is client
Ian Jackson [Wed, 9 Sep 2009 15:45:04 +0000 (16:45 +0100)]
Fix source code clone rune to add .git
Ian Jackson [Wed, 9 Sep 2009 14:26:49 +0000 (15:26 +0100)]
Fix absolute URLs to refer to chiark
Ian Jackson [Wed, 9 Sep 2009 13:52:41 +0000 (14:52 +0100)]
Merge branch 'dict' into live
Ian Jackson [Wed, 9 Sep 2009 13:48:20 +0000 (14:48 +0100)]
Split off devel info
Ian Jackson [Wed, 9 Sep 2009 13:23:49 +0000 (14:23 +0100)]
Merge ../ypp-sc-tools.pctb-dict-test
Ian Jackson [Wed, 9 Sep 2009 13:03:17 +0000 (14:03 +0100)]
Nicer intro
Ian Jackson [Wed, 9 Sep 2009 12:47:59 +0000 (13:47 +0100)]
Fix location of Manu
Ian Jackson [Wed, 9 Sep 2009 12:42:33 +0000 (13:42 +0100)]
update-master-info can copy databases to rsync area
Ian Jackson [Sat, 5 Sep 2009 19:14:36 +0000 (20:14 +0100)]
Remove some debugging
Ian Jackson [Sat, 5 Sep 2009 19:11:07 +0000 (20:11 +0100)]
Implement capacity limit
Ian Jackson [Fri, 4 Sep 2009 18:31:01 +0000 (19:31 +0100)]
Docs correct for new expected losses box
Ian Jackson [Fri, 4 Sep 2009 18:29:40 +0000 (19:29 +0100)]
Make docs page executable
Ian Jackson [Fri, 4 Sep 2009 18:29:17 +0000 (19:29 +0100)]
Merge branch 'ijackson'
Ian Jackson [Fri, 4 Sep 2009 18:29:08 +0000 (19:29 +0100)]
Cosmetic improvements to loss per league box
Ian Jackson [Fri, 4 Sep 2009 18:26:25 +0000 (19:26 +0100)]
Implement percentage loss per league
Ian Jackson [Thu, 3 Sep 2009 16:50:29 +0000 (17:50 +0100)]
Rename docs to intro; write new docs
Ian Jackson [Wed, 2 Sep 2009 23:39:36 +0000 (00:39 +0100)]
Merge branch 'ijackson'
Ian Jackson [Wed, 2 Sep 2009 23:38:31 +0000 (00:38 +0100)]
Cosmetic and error report bugfixes
Ian Jackson [Wed, 2 Sep 2009 23:17:06 +0000 (00:17 +0100)]
Permit entry of loss per league
Ian Jackson [Wed, 2 Sep 2009 22:55:19 +0000 (23:55 +0100)]
Plumb max mass/vol through to routetrade
Ian Jackson [Wed, 2 Sep 2009 22:49:42 +0000 (23:49 +0100)]
Actually commit the capacity string parser
Ian Jackson [Wed, 2 Sep 2009 22:49:16 +0000 (23:49 +0100)]
Reverse colours of all stripey tables to have dark (different) first
Ian Jackson [Wed, 2 Sep 2009 22:44:49 +0000 (23:44 +0100)]
Calculate total distance correctly
Ian Jackson [Wed, 2 Sep 2009 22:43:19 +0000 (23:43 +0100)]
Reverse alternating colours in route plan
Ian Jackson [Wed, 2 Sep 2009 22:42:32 +0000 (23:42 +0100)]
Show total mass/volumes
Ian Jackson [Wed, 2 Sep 2009 22:27:15 +0000 (23:27 +0100)]
Query for vessel capacity
Ian Jackson [Wed, 2 Sep 2009 20:19:25 +0000 (21:19 +0100)]
Bug in route total distance calculation found eg with input Eta,Turtle
Ian Jackson [Wed, 2 Sep 2009 12:28:38 +0000 (13:28 +0100)]
Render topology as input to neato.
Ian Jackson [Wed, 2 Sep 2009 00:16:30 +0000 (01:16 +0100)]
Testing with new setup shows problem with Sage
Ian Jackson [Wed, 2 Sep 2009 00:04:29 +0000 (01:04 +0100)]
Use parse_info_serverside_ocean in commod-update-receiver
Ian Jackson [Wed, 2 Sep 2009 00:07:16 +0000 (01:07 +0100)]
Merge branch 'test-install'
Ian Jackson [Tue, 1 Sep 2009 17:18:15 +0000 (18:18 +0100)]
Some TODO list items now done
Ian Jackson [Tue, 1 Sep 2009 17:17:20 +0000 (18:17 +0100)]
Do not include approved client info in master-info
Ian Jackson [Tue, 1 Sep 2009 17:11:28 +0000 (18:11 +0100)]
Seems to be charset problems still ...
Ian Jackson [Tue, 1 Sep 2009 17:10:18 +0000 (18:10 +0100)]
Usage information
Ian Jackson [Tue, 1 Sep 2009 16:52:10 +0000 (17:52 +0100)]
Fix charset problems; support Opal and Jade
Ian Jackson [Tue, 1 Sep 2009 16:11:58 +0000 (17:11 +0100)]
More oceans
Ian Jackson [Tue, 1 Sep 2009 15:58:30 +0000 (16:58 +0100)]
Support Hunter
Ian Jackson [Tue, 1 Sep 2009 15:58:17 +0000 (16:58 +0100)]
Cope with {{ }} rather than [[ ]] in arch labels
Ian Jackson [Tue, 1 Sep 2009 15:57:51 +0000 (16:57 +0100)]
More robust way to find arch/islands table
Ian Jackson [Tue, 1 Sep 2009 15:57:30 +0000 (16:57 +0100)]
Show which ocean failed if yppedia-chart-parser fails
Ian Jackson [Tue, 1 Sep 2009 15:43:50 +0000 (16:43 +0100)]
Actually produce ocean arch/island info in output master-info files
Ian Jackson [Tue, 1 Sep 2009 15:32:10 +0000 (16:32 +0100)]
Support Cobalt
Ian Jackson [Tue, 1 Sep 2009 15:31:17 +0000 (16:31 +0100)]
Cope with some features of the Cobalt WP chart
Ian Jackson [Tue, 1 Sep 2009 15:23:26 +0000 (16:23 +0100)]
Fixups for Sage
Ian Jackson [Tue, 1 Sep 2009 15:20:29 +0000 (16:20 +0100)]
Ignore size of connected component when assigning labels (some arches have no purchaseable charts)
Ian Jackson [Tue, 1 Sep 2009 15:12:52 +0000 (16:12 +0100)]
Cope with multi-word arches
Ian Jackson [Tue, 1 Sep 2009 15:11:36 +0000 (16:11 +0100)]
Cope with <big> arch labels and a big ocean label
Ian Jackson [Tue, 1 Sep 2009 15:11:15 +0000 (16:11 +0100)]
Remove test chart
Ian Jackson [Tue, 1 Sep 2009 15:05:33 +0000 (16:05 +0100)]
Show messages immediately in debug mode
Ian Jackson [Tue, 1 Sep 2009 14:52:47 +0000 (15:52 +0100)]
Don't choke on apsp discrepancy for arch-isolated islands
Ian Jackson [Tue, 1 Sep 2009 14:48:53 +0000 (15:48 +0100)]
new --stdin-chart for testing yppedia-chart-parser
Ian Jackson [Tue, 1 Sep 2009 14:39:54 +0000 (15:39 +0100)]
Do entity conversion ourselves; lenny's BS won't for some reason
Ian Jackson [Tue, 1 Sep 2009 14:12:27 +0000 (15:12 +0100)]
Reject non-option args to u-d-mi
Ian Jackson [Mon, 31 Aug 2009 23:47:32 +0000 (00:47 +0100)]
Trying Hunter but it failed
Ian Jackson [Mon, 31 Aug 2009 23:42:14 +0000 (00:42 +0100)]
Do not include self-edges in routes
Ian Jackson [Mon, 31 Aug 2009 23:34:50 +0000 (00:34 +0100)]
new update-master-info seems to work
Ian Jackson [Mon, 31 Aug 2009 23:07:24 +0000 (00:07 +0100)]
chart-parser updates things
Ian Jackson [Mon, 31 Aug 2009 17:16:02 +0000 (18:16 +0100)]
WIP move route and distance update into chart-parser
Ian Jackson [Mon, 31 Aug 2009 16:57:42 +0000 (17:57 +0100)]
Message confirmation loop thing
Ian Jackson [Mon, 31 Aug 2009 16:34:01 +0000 (17:34 +0100)]
yppedia chart parser gets chart from yppedia
Ian Jackson [Mon, 31 Aug 2009 16:23:12 +0000 (17:23 +0100)]
ocean scraper can fetch charts
Ian Jackson [Mon, 31 Aug 2009 15:59:28 +0000 (16:59 +0100)]
chart parser calls ocean scraper
Ian Jackson [Mon, 31 Aug 2009 15:36:42 +0000 (16:36 +0100)]
Cope with spaces in arch names as found on Hunter
Ian Jackson [Mon, 31 Aug 2009 15:34:48 +0000 (16:34 +0100)]
Ocean scraper seems to work properly now
Ian Jackson [Mon, 31 Aug 2009 15:21:13 +0000 (16:21 +0100)]
WIP ocean scraper seems to mostly work, need to do arg parsing and IO
Ian Jackson [Mon, 31 Aug 2009 15:14:51 +0000 (16:14 +0100)]
WIP ocean scraper before redo parser
Ian Jackson [Mon, 31 Aug 2009 15:06:05 +0000 (16:06 +0100)]
Merge branch 'stable-3.x'
Ian Jackson [Mon, 31 Aug 2009 15:05:44 +0000 (16:05 +0100)]
Merge branch 'ijackson' into stable-3.x
Ian Jackson [Mon, 31 Aug 2009 15:04:52 +0000 (16:04 +0100)]
WIP scraper still not working right
Ian Jackson [Mon, 31 Aug 2009 13:43:11 +0000 (14:43 +0100)]
Initial version of scraper for oceans' arches and islands
Ian Jackson [Sun, 30 Aug 2009 22:03:23 +0000 (23:03 +0100)]
Distance sailed shows in voyage plan now
Ian Jackson [Sun, 30 Aug 2009 22:02:43 +0000 (23:02 +0100)]
Another todo list item for uploader, but it works on felix now
Ian Jackson [Sun, 30 Aug 2009 22:02:01 +0000 (23:02 +0100)]
Another todo list item
Ian Jackson [Sun, 30 Aug 2009 18:42:07 +0000 (19:42 +0100)]
Show total distance
Ian Jackson [Sun, 30 Aug 2009 18:16:31 +0000 (19:16 +0100)]
Show distances in various places
Ian Jackson [Fri, 28 Aug 2009 23:17:42 +0000 (00:17 +0100)]
Merge branch 'web' of ijackson@login.chiark.greenend.org.uk:/home/ijackson/things/ypp-sc-tools
Ian Jackson [Fri, 28 Aug 2009 22:53:56 +0000 (23:53 +0100)]
Uploader now works on harley
Ian Jackson [Fri, 28 Aug 2009 22:45:18 +0000 (23:45 +0100)]
New All selector as seen on harley
Ian Jackson [Fri, 28 Aug 2009 22:19:01 +0000 (23:19 +0100)]
fivemack's bug report unreproduceable
Ian Jackson [Fri, 28 Aug 2009 22:18:43 +0000 (23:18 +0100)]
Pager checking implemented in
7f9df3a472dda7008366c3fdf865adeb3467b66b on stable branch
Ian Jackson [Fri, 28 Aug 2009 22:16:51 +0000 (23:16 +0100)]
New paging arrangements:
- check pager motion to detect multi-paging
- do not duplicate first page
This is the bugfix `checkpager'
Ian Jackson [Fri, 28 Aug 2009 17:27:32 +0000 (18:27 +0100)]
Extend proof to non-connected graphs; cosmetic improvements
Ian Jackson [Fri, 28 Aug 2009 17:13:08 +0000 (18:13 +0100)]
Add proof (from email)
Ian Jackson [Fri, 28 Aug 2009 17:00:45 +0000 (18:00 +0100)]
Do topology comparison with new reduction algorithm
Ian Jackson [Thu, 27 Aug 2009 18:16:26 +0000 (19:16 +0100)]
Fixes etc. for ypp map parser and distance processor