Joey Hess [Tue, 7 Feb 2012 06:59:05 +0000 (02:59 -0400)]
fix display of page name in recentchanges after a revert
When the wiki is in a subdir of the git repo, a web revert would show
in recentchanges as eg, doc/index, instead of just index.
This happened because decode_git_file caches a $prefix that is dependant
on the $git_dir setting, and the revert code runs with a different
$git_dir, which polluted the $prefix for later.
Fix this by adding a with_git_dir that juggles the variables properly.
http://joey.kitenet.net/ [Tue, 7 Feb 2012 06:31:59 +0000 (02:31 -0400)]
http://joey.kitenet.net/ [Tue, 7 Feb 2012 06:30:05 +0000 (02:30 -0400)]
testing
Joey Hess [Tue, 7 Feb 2012 06:21:06 +0000 (02:21 -0400)]
Revert spam
Joey Hess [Tue, 7 Feb 2012 06:20:09 +0000 (02:20 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Tue, 7 Feb 2012 06:17:56 +0000 (02:17 -0400)]
dude, it's a wiki
KataMutiara [Tue, 7 Feb 2012 06:15:51 +0000 (02:15 -0400)]
KataMutiara [Tue, 7 Feb 2012 06:15:04 +0000 (02:15 -0400)]
KataMutiara [Tue, 7 Feb 2012 06:14:04 +0000 (02:14 -0400)]
Joey Hess [Tue, 7 Feb 2012 06:11:17 +0000 (02:11 -0400)]
clarified and largely rewritten
KataMutiara [Tue, 7 Feb 2012 06:06:56 +0000 (02:06 -0400)]
http://kevinmehall.net/oid/ [Tue, 7 Feb 2012 05:01:13 +0000 (01:01 -0400)]
Amitai Schlair [Sun, 5 Feb 2012 21:38:52 +0000 (16:38 -0500)]
Merge branch 'master' of git://git.ikiwiki.info
Amitai Schlair [Sun, 5 Feb 2012 21:38:15 +0000 (16:38 -0500)]
fix rcs_add() of a text file under a name that had been a binary file
Amitai Schlair [Sun, 5 Feb 2012 06:26:39 +0000 (01:26 -0500)]
rcs_diff() would always return unbounded output, fixed
Amitai Schlair [Fri, 3 Feb 2012 17:05:07 +0000 (12:05 -0500)]
Missed a portability spot.
Joey Hess [Fri, 3 Feb 2012 02:48:09 +0000 (22:48 -0400)]
add news item for ikiwiki 3.
20120202
Joey Hess [Fri, 3 Feb 2012 02:47:05 +0000 (22:47 -0400)]
can't do that, and testing transition already resolved
Joey Hess [Fri, 3 Feb 2012 02:43:25 +0000 (22:43 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Fri, 3 Feb 2012 02:42:46 +0000 (22:42 -0400)]
releasing version 3.
20120202
Joey Hess [Fri, 3 Feb 2012 02:27:55 +0000 (22:27 -0400)]
revert change to prettydate
Its strftime is from Date::Format, doesn't have the problem, and using the
POSIX one breaks its %o.
http://jmtd.net/ [Thu, 2 Feb 2012 16:14:26 +0000 (12:14 -0400)]
Remove dead blog link and add blipfoto link instead
Amitai Schlair [Thu, 2 Feb 2012 10:13:55 +0000 (05:13 -0500)]
Account for the strangeness of my committer email.
Joey Hess [Thu, 2 Feb 2012 05:11:45 +0000 (01:11 -0400)]
Merge remote-tracking branch 'schmonz/cvs'
link added
Amitai Schlair [Thu, 2 Feb 2012 03:08:21 +0000 (22:08 -0500)]
Update test plan, missed in previous.
Amitai Schlair [Thu, 2 Feb 2012 03:07:03 +0000 (22:07 -0500)]
Merge branch 'master' into cvs
Amitai Schlair [Thu, 2 Feb 2012 03:02:45 +0000 (22:02 -0500)]
Merge branch 'master' of git://git.ikiwiki.info
Joey Hess [Thu, 2 Feb 2012 02:47:21 +0000 (22:47 -0400)]
fix typo in LC_TIME locale lookup
Amitai Schlair [Wed, 1 Feb 2012 20:17:57 +0000 (15:17 -0500)]
Express rcs_recentchanges() tests via utility functions, in preparation
for writing more thorough tests, in order to safely extract the
cvsps output-parsing routine for reuse by an upcoming rcs_revert().
Amitai Schlair [Wed, 1 Feb 2012 16:04:37 +0000 (11:04 -0500)]
Fail a test if an rcs_receive() hook is ever defined for CVS.
Amitai Schlair [Wed, 1 Feb 2012 16:04:15 +0000 (11:04 -0500)]
Extract add_and_commit(), a common test action.
http://smcv.pseudorandom.co.uk/ [Wed, 1 Feb 2012 10:40:26 +0000 (06:40 -0400)]
Amitai Schlair [Tue, 31 Jan 2012 07:41:28 +0000 (02:41 -0500)]
Merge branch 'master' of git://git.ikiwiki.info
A comment.
Amitai Schlair [Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)]
Merge branch 'master' into cvs
Amitai Schlair [Tue, 31 Jan 2012 01:56:35 +0000 (19:56 -0600)]
Merge branch 'master' of git://git.ikiwiki.info
Amitai Schlair [Tue, 31 Jan 2012 01:56:22 +0000 (19:56 -0600)]
Merge branch 'master' of github.com:schmonz/ikiwiki
Amitai Schlair [Tue, 31 Jan 2012 01:52:30 +0000 (19:52 -0600)]
Merge remaining TODO items into CVS page, and delete TODO.cvs.
http://kerravonsen.dreamwidth.org/ [Mon, 30 Jan 2012 22:52:27 +0000 (18:52 -0400)]
agreed
http://kerravonsen.dreamwidth.org/ [Mon, 30 Jan 2012 22:39:34 +0000 (18:39 -0400)]
there are actually reasons, yes
Joey Hess [Mon, 30 Jan 2012 19:47:09 +0000 (15:47 -0400)]
remove non-ikiwiki site
Joey Hess [Mon, 30 Jan 2012 19:40:31 +0000 (15:40 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Mon, 30 Jan 2012 19:37:01 +0000 (15:37 -0400)]
remove stealthy spam
http://joey.kitenet.net/ [Mon, 30 Jan 2012 19:34:01 +0000 (15:34 -0400)]
Added a comment
Joey Hess [Mon, 30 Jan 2012 19:33:02 +0000 (15:33 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Mon, 30 Jan 2012 19:32:18 +0000 (15:32 -0400)]
fix typo (doubled quote)
http://joey.kitenet.net/ [Mon, 30 Jan 2012 19:30:21 +0000 (15:30 -0400)]
Added a comment
Joey Hess [Mon, 30 Jan 2012 19:25:56 +0000 (15:25 -0400)]
changelog
Joey Hess [Mon, 30 Jan 2012 19:20:54 +0000 (15:20 -0400)]
Merge remote-tracking branch 'schmonz/portability'
Joey Hess [Mon, 30 Jan 2012 19:16:13 +0000 (15:16 -0400)]
cleanup
Joey Hess [Mon, 30 Jan 2012 19:15:28 +0000 (15:15 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Mon, 30 Jan 2012 19:14:41 +0000 (15:14 -0400)]
fix
Joey Hess [Mon, 30 Jan 2012 19:13:55 +0000 (15:13 -0400)]
document a bug fix
Original bug was introduced 24 Nov 2011.
Joey Hess [Mon, 30 Jan 2012 19:08:50 +0000 (15:08 -0400)]
calendar, prettydate: Fix strftime encoding bug
strftime is a C function, it does not return decoded utf8.
Several places in ikiwiki manually decoded it, but at least two
forgot to.
Also, strftime might not return even encoded utf8, if LC_TIME is set
to a non-utf8 value. Went ahead and supported decoding whatever encoding
it uses.
The remaining direct calls to strftime() are all ones that first set
LC_TIME=C, in order to get times that are not for human display.
tycho garen [Mon, 30 Jan 2012 18:49:19 +0000 (13:49 -0500)]
comment on haskell rebuild
Joey Hess [Mon, 30 Jan 2012 18:45:29 +0000 (14:45 -0400)]
merged
Joey Hess [Mon, 30 Jan 2012 18:44:52 +0000 (14:44 -0400)]
changelog
Joey Hess [Mon, 30 Jan 2012 18:41:59 +0000 (14:41 -0400)]
nuke
Joey Hess [Mon, 30 Jan 2012 18:41:12 +0000 (14:41 -0400)]
query
Joey Hess [Mon, 30 Jan 2012 18:35:48 +0000 (14:35 -0400)]
Revert "ignore a file that always clutters status on OS X (no known fix)"
This reverts commit
662d256c821d85d041a7620aa0bac6144ff95af4.
I sympathize, but this would prevent commits to that file everywhere else.
Joey Hess [Mon, 30 Jan 2012 18:35:03 +0000 (14:35 -0400)]
Merge remote-tracking branch 'schmonz/cvs'
Joey Hess [Mon, 30 Jan 2012 18:31:26 +0000 (14:31 -0400)]
comments
functional changes are underway
http://kerravonsen.dreamwidth.org/ [Sun, 29 Jan 2012 11:42:02 +0000 (07:42 -0400)]
even further thought
http://kerravonsen.dreamwidth.org/ [Sun, 29 Jan 2012 09:41:47 +0000 (05:41 -0400)]
further thoughts
http://kerravonsen.dreamwidth.org/ [Sun, 29 Jan 2012 09:34:45 +0000 (05:34 -0400)]
comment about Haskell
Joey Hess [Sun, 29 Jan 2012 02:50:28 +0000 (22:50 -0400)]
response
Joey Hess [Sun, 29 Jan 2012 02:01:49 +0000 (22:01 -0400)]
Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
https://rt.cpan.org/Ticket/Display.html?id=74487
Gave up trying to support multiple YAML backends. The XS one requires ugly
manual encoding to get unicode right, and doesn't allow dumping yaml
fragments w/o the yaml header, but at least it doesn't randomly crash
on import like YAML::Mo has started to.
Joey Hess [Sat, 28 Jan 2012 16:22:46 +0000 (12:22 -0400)]
cleanup
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:19:15 +0000 (19:19 -0400)]
why do I always forget something?
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:18:19 +0000 (19:18 -0400)]
new plugins, anyone?
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:11:39 +0000 (19:11 -0400)]
new jssearchfield directive
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:08:55 +0000 (19:08 -0400)]
new plugin "jssearchfield"
spalax [Sat, 28 Jan 2012 19:13:43 +0000 (15:13 -0400)]
Clearer (I hope) bug report
spalax [Sat, 28 Jan 2012 19:09:31 +0000 (15:09 -0400)]
New bug: encoding problem in calendar plugin
seven [Sat, 28 Jan 2012 14:37:33 +0000 (10:37 -0400)]
zut [Sat, 28 Jan 2012 10:30:47 +0000 (06:30 -0400)]
zut [Sat, 28 Jan 2012 10:29:27 +0000 (06:29 -0400)]
Oups
zut [Sat, 28 Jan 2012 10:26:51 +0000 (06:26 -0400)]
Encoding problem in french with ikiwiki-calendar
simonraven [Sat, 28 Jan 2012 10:05:44 +0000 (06:05 -0400)]
simonraven [Sat, 28 Jan 2012 09:16:52 +0000 (05:16 -0400)]
http://kerravonsen.dreamwidth.org/ [Fri, 27 Jan 2012 03:51:04 +0000 (23:51 -0400)]
which came first, the chicken or the egg?
tycho garen [Fri, 27 Jan 2012 02:28:19 +0000 (21:28 -0500)]
comment to multi-threading discussion
http://kerravonsen.dreamwidth.org/ [Fri, 27 Jan 2012 01:57:21 +0000 (21:57 -0400)]
unofficial opinion
Amitai Schlair [Thu, 26 Jan 2012 22:08:12 +0000 (17:08 -0500)]
Move cvs_keyword_subst_args() down with the other internal support routines.
Amitai Schlair [Thu, 26 Jan 2012 21:57:00 +0000 (16:57 -0500)]
Uncomment the CVS keyword substitution mode tests, and make them pass:
Extract cvs_keyword_subst_args() and ensure it runs in $config{srcdir}.
Using Perl's -T operator appears to work equally well, perhaps switch?
Amitai Schlair [Thu, 26 Jan 2012 21:55:13 +0000 (16:55 -0500)]
Mollify strictures about barewords.
http://roughnecks.myopenid.com/ [Wed, 25 Jan 2012 23:58:39 +0000 (19:58 -0400)]
http://smcv.pseudorandom.co.uk/ [Wed, 25 Jan 2012 08:55:25 +0000 (04:55 -0400)]
Fix wikipedia URL: wikipedia.org, not wikimedia.org
Amitai Schlair [Wed, 25 Jan 2012 05:43:07 +0000 (00:43 -0500)]
Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
Amitai Schlair [Wed, 25 Jan 2012 05:41:53 +0000 (00:41 -0500)]
Merge branch 'master' of git://git.ikiwiki.info into cvs
Amitai Schlair [Tue, 24 Jan 2012 10:58:41 +0000 (05:58 -0500)]
Move tests that simulate web commits into test_rcs_add(), then add
a bunch more tests (that wind up exercising rcs_commit(),
rcs_commit_staged(), and rcs_recentchanges()). Extract some support
routines for brevity. Most is_in_keyword_substitution_mode() tests
are commented out because there's a bug -- non-binary files are
being added with "cvs add -kb".
Move tests that inspect recentchanges after direct CVS operations
into test_rcs_recentchanges().
Amitai Schlair [Tue, 24 Jan 2012 07:40:59 +0000 (02:40 -0500)]
Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
Amitai Schlair [Tue, 24 Jan 2012 07:40:43 +0000 (02:40 -0500)]
Merge branch 'master' of git://git.ikiwiki.info into cvs