commit a503def7624767ab01f06883fe7a1b024cff32be
parent c18de57dc4ecc6b45151ab338166b52f0a738ffb
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 30 Sep 2009 13:55:08 -0400
Merge branch 'master' into next
Diffstat:
6 files changed, 71 insertions(+), 14 deletions(-)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,4 +1,8 @@
+William Morgan <wmorgan-sup at the masanjin dot nets>
+Rich Lane <rlane at the club.cc.cmu dot edus>
+Ismo Puustinen <ismo at the iki dot fis>
Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
+Ben Walton <bwalton at the artsci.utoronto dot cas>
Mike Stipicevic <stipim at the rpi dot edus>
Marcus Williams <marcus-sup at the bar-coded dot nets>
Lionel Ott <white.magic at the gmx dot des>
@@ -6,17 +10,20 @@ Ingmar Vanhassel <ingmar at the exherbo dot orgs>
Mark Alexander <marka at the pobox dot coms>
Christopher Warrington <chrisw at the rice dot edus>
Richard Brown <rbrown at the exherbo dot orgs>
-Ben Walton <bwalton at the artsci.utoronto dot cas>
Marc Hartstein <marc.hartstein at the alum.vassar dot edus>
+Israel Herraiz <israel.herraiz at the gmail dot coms>
Grant Hollingworth <grant at the antiflux dot orgs>
+Adeodato Simó <dato at the net.com.org dot ess>
Steve Goldman <sgoldman at the tower-research dot coms>
+Edward Z. Yang <ezyang at the mit dot edus>
Decklin Foster <decklin at the red-bean dot coms>
-Ismo Puustinen <ismo at the iki dot fis>
+Alex Vandiver <alex at the chmrr dot nets>
Jeff Balogh <its.jeff.balogh at the gmail dot coms>
-Alex Vandiver <alexmv at the mit dot edus>
+Carl Worth <cworth at the cworth dot orgs>
+Kornilios Kourtis <kkourt at the cslab.ece.ntua dot grs>
Giorgio Lando <patroclo7 at the gmail dot coms>
-Israel Herraiz <israel.herraiz at the gmail dot coms>
+Benoît PIERRE <benoit.pierre at the gmail dot coms>
Ian Taylor <ian at the lorf dot orgs>
-Stefan Lundström <lundst at the snabb.(none)>
-Rich Lane <rlane at the club.cc.cmu dot edus>
+Stefan Lundström
+Michael Hamann <michael at the content-space dot des>
Kirill Smelkov <kirr at the landau.phys.spbu dot rus>
diff --git a/History.txt b/History.txt
@@ -1,3 +1,22 @@
+== 0.9 / 2009-09-30
+* Experimental Xapian backend to replace Ferret. Not everything works with it,
+ but it's fast and less likely to barf. See release notes.
+* New keybinding: "G" for reply-all.
+* New hook: custom-search, for adding your own query expansions.
+* Better preemptive thread loading.
+* Random UI tweaks: display labels before subjects, change thread-view-mode's
+ 'n' and 'p' commands slightly
+* Better killing of other Sup processes.
+* Die gracefully upon SIGKILL.
+* Finally figure out the curses+ruby magic to make SIGWINCH (i.e. xterm
+ resizing) work correctly.
+* Add a console mode (press ~) for interactively playing with the index.
+* Finally figure out the curses magic to stop the weird keyboard behavior after
+ leaving the editor.
+* Improved logging. Logging now supports SUP_LOG_LEVEL environment variable.
+ Set this to "debug" for verbiage.
+* As always, many bugfixes and tweaks.
+
== 0.8.1 / 2009-06-15
* make multibyte display "work" for non-utf8 locales
* fix reply-mode always selecting "Customized"
diff --git a/ReleaseNotes b/ReleaseNotes
@@ -1,3 +1,38 @@
+Release 0.9:
+
+There's a new Xapian backend as an alternative to the Ferret one. It's still in
+a beta stage. It's much faster and much less prone to the random crashes than
+Ferret, but certain things don't work yet, most noticeably the unread message
+counts in label-list-mode.
+
+You can switch back and forth between both indexes without harm, *except* any
+new messages added to the one index won't be picked up by the other. Follow
+these instructions:
+
+To TRY the Xapian index, without screwing Ferret up:
+
+1. sup-dump > dump # takes a while
+2. export SUP_INDEX=xapian # or however you do it in your shell
+3. sup-sync --all --all-sources --restore dump # takes a long time
+4. sup -n # -n ensures that no polling is done. don't hit 'P' either
+
+Step 1 will take a long time, and step 3 will take a very long time.
+
+At this point, whenever you run Sup, the SUP_INDEX environment variable will
+determine which index you use. If it's unset, or "ferret", you will use the
+ferret index. If it's "xapian", the Xapian index. Make sure when you run sup
+with the Xapian index, you use -n and don't hit 'P', to avoid loading new
+messages into it.
+
+If you want to switch to Xapian permanently, you can then:
+
+1. rm -rf ~/.sup/ferret
+2. permanently set SUP_INDEX=xapian according to your shell
+3. Run sup as normal, i.e. without -n.
+
+If you want to go back to Ferret, you can just rm -rf ~/.sup/xapian and make
+sure your SUP_INDEX environment variable is unset.
+
Release 0.8.1:
A bugfix release with fixes for quote parsing (bad behavior in certain long
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
@@ -161,7 +161,7 @@ class Message
@dirty = true if @refs.delete ref
end
- def snippet; @snippet || (chunks && @snippet); end
+ attr_reader :snippet
def is_list_message?; !@list_address.nil?; end
def is_draft?; @source.is_a? DraftLoader; end
def draft_filename
diff --git a/release-script.txt b/release-script.txt
@@ -1,11 +1,7 @@
Just a few simple steps to make a new release.
-ditz release <releasename>
-ditz changelog <releasename> > tmp.txt
-cat History.txt >> tmp.txt
-mv tmp.txt History.txt
-vi History.txt # and cleanup
-vi ReleaseNotes # and add whatever's necessary
+vi History.txt
+vi ReleaseNotes
vi www/index.html # and bump version number
git rank-contributors -o > CONTRIBUTORS
vi CONTRIBUTORS # and merge
diff --git a/www/index.html b/www/index.html
@@ -109,7 +109,7 @@
<h2>Status</h2>
<p>
- The current version of Sup is 0.8.1, released 2009-06-15. This is a
+ The current version of Sup is 0.9, released 2009-09-30. This is a
beta release. It supports mbox, IMAP, IMAPS, and Maildir mailstores.
</p>