]> sipb.mit.edu Git - ikiwiki.git/log
ikiwiki.git
10 years agoMerge branch 'master' into cvs
Amitai Schlair [Tue, 7 Feb 2012 07:47:24 +0000 (02:47 -0500)] 
Merge branch 'master' into cvs

10 years agofix display of page name in recentchanges after a revert
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.

10 years agoMerge branch 'master' into cvs
Amitai Schlair [Tue, 7 Feb 2012 06:38:53 +0000 (01:38 -0500)] 
Merge branch 'master' into cvs

10 years agotesting
http://joey.kitenet.net/ [Tue, 7 Feb 2012 06:31:59 +0000 (02:31 -0400)] 
testing

This reverts commit 26dbe8ba9a397d5d59af789c7ef3576ebdcf2db8

10 years agotesting
http://joey.kitenet.net/ [Tue, 7 Feb 2012 06:30:05 +0000 (02:30 -0400)] 
testing

10 years agoRevert spam
Joey Hess [Tue, 7 Feb 2012 06:21:06 +0000 (02:21 -0400)] 
Revert spam

10 years agoMerge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Tue, 7 Feb 2012 06:20:09 +0000 (02:20 -0400)] 
Merge branch 'master' of ssh://git.ikiwiki.info

10 years agodude, it's a wiki
Joey Hess [Tue, 7 Feb 2012 06:17:56 +0000 (02:17 -0400)] 
dude, it's a wiki

10 years ago(no commit message)
KataMutiara [Tue, 7 Feb 2012 06:15:51 +0000 (02:15 -0400)] 

10 years agoThis reverts commit 0202f169e82fcfe17e09952902e947254dd9bc82
KataMutiara [Tue, 7 Feb 2012 06:15:04 +0000 (02:15 -0400)] 
This reverts commit 0202f169e82fcfe17e09952902e947254dd9bc82

10 years ago(no commit message)
KataMutiara [Tue, 7 Feb 2012 06:14:04 +0000 (02:14 -0400)] 

10 years agoclarified and largely rewritten
Joey Hess [Tue, 7 Feb 2012 06:11:17 +0000 (02:11 -0400)] 
clarified and largely rewritten

10 years agorevert spam
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI [Tue, 7 Feb 2012 06:09:03 +0000 (02:09 -0400)] 
revert spam

This reverts commit bd17671c506e5ef626b5eef3fe61786ea2c43832

10 years ago(no commit message)
KataMutiara [Tue, 7 Feb 2012 06:06:56 +0000 (02:06 -0400)] 

10 years ago(no commit message)
http://kevinmehall.net/oid/ [Tue, 7 Feb 2012 05:01:13 +0000 (01:01 -0400)] 

10 years agoMerge branch 'master' into cvs
Amitai Schlair [Sun, 5 Feb 2012 21:39:32 +0000 (16:39 -0500)] 
Merge branch 'master' into cvs

10 years agoMerge branch 'master' of git://git.ikiwiki.info
Amitai Schlair [Sun, 5 Feb 2012 21:38:52 +0000 (16:38 -0500)] 
Merge branch 'master' of git://git.ikiwiki.info

10 years agofix rcs_add() of a text file under a name that had been a binary file
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

10 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts [Sun, 5 Feb 2012 21:38:12 +0000 (17:38 -0400)] 

10 years agoNotes.
Amitai Schlair [Sun, 5 Feb 2012 21:35:29 +0000 (16:35 -0500)] 
Notes.

10 years agoMore testings and fixings:
Amitai Schlair [Sun, 5 Feb 2012 21:33:49 +0000 (16:33 -0500)] 
More testings and fixings:

* Test that adding a text file under a name formerly tracked as
  binary (and vice versa) gets the right keyword-substitution
  behavior.
* Explicitly set -kkv for text files to make the tests pass.
* CVS warns in these cases about "changing keyword expansion mode",
  but this is correct behavior, so filter it from stderr. Filter
  stdout the same way in case we ever want to keep any of it.
* In rcs_add(), replace comments with obviousness.

10 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts [Sun, 5 Feb 2012 21:32:01 +0000 (17:32 -0400)] 

10 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawnfAvT2c50LDmXkgCPJ6KmPLt8CiEIa96w [Sun, 5 Feb 2012 13:45:57 +0000 (09:45 -0400)] 

10 years agoRemember to run all the tests before committing!
Amitai Schlair [Sun, 5 Feb 2012 08:33:20 +0000 (03:33 -0500)] 
Remember to run all the tests before committing!

10 years agoTest checkconfig().
Amitai Schlair [Sun, 5 Feb 2012 08:29:14 +0000 (03:29 -0500)] 
Test checkconfig().

10 years agoTest RCS Id keyword expansion on typical commit.
Amitai Schlair [Sun, 5 Feb 2012 06:34:58 +0000 (01:34 -0500)] 
Test RCS Id keyword expansion on typical commit.

10 years agoMerge branch 'master' into cvs
Amitai Schlair [Sun, 5 Feb 2012 06:28:01 +0000 (01:28 -0500)] 
Merge branch 'master' into cvs

10 years agorcs_diff() would always return unbounded output, fixed
Amitai Schlair [Sun, 5 Feb 2012 06:26:39 +0000 (01:26 -0500)] 
rcs_diff() would always return unbounded output, fixed

10 years agoNotes from an evening's debugging.
Amitai Schlair [Sun, 5 Feb 2012 06:24:09 +0000 (01:24 -0500)] 
Notes from an evening's debugging.

10 years agoWrite rcs_diff() tests according to the API spec, then make them pass.
Amitai Schlair [Sun, 5 Feb 2012 06:20:52 +0000 (01:20 -0500)] 
Write rcs_diff() tests according to the API spec, then make them pass.

10 years agoMissed a portability spot.
Amitai Schlair [Fri, 3 Feb 2012 17:05:07 +0000 (12:05 -0500)] 
Missed a portability spot.

10 years agoadd news item for ikiwiki 3.20120202
Joey Hess [Fri, 3 Feb 2012 02:48:09 +0000 (22:48 -0400)] 
add news item for ikiwiki 3.20120202

10 years agocan't do that, and testing transition already resolved
Joey Hess [Fri, 3 Feb 2012 02:47:05 +0000 (22:47 -0400)] 
can't do that, and testing transition already resolved

10 years agoMerge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Fri, 3 Feb 2012 02:43:25 +0000 (22:43 -0400)] 
Merge branch 'master' of ssh://git.ikiwiki.info

10 years agoreleasing version 3.20120202
Joey Hess [Fri, 3 Feb 2012 02:42:46 +0000 (22:42 -0400)] 
releasing version 3.20120202

10 years agorevert change to prettydate
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.

10 years ago(no commit message)
http://jmtd.net/ [Thu, 2 Feb 2012 16:14:26 +0000 (12:14 -0400)] 

10 years agoRemove dead blog link and add blipfoto link instead
https://www.google.com/accounts/o8/id?id=AItOawl-Dfpjeo0tdkNTg42sLTYYyDGTmXE9z9M [Thu, 2 Feb 2012 14:52:44 +0000 (10:52 -0400)] 
Remove dead blog link and add blipfoto link instead

10 years agoAccount for the strangeness of my committer email.
Amitai Schlair [Thu, 2 Feb 2012 10:13:55 +0000 (05:13 -0500)] 
Account for the strangeness of my committer email.

10 years agoMerge remote-tracking branch 'schmonz/cvs'
Joey Hess [Thu, 2 Feb 2012 05:11:45 +0000 (01:11 -0400)] 
Merge remote-tracking branch 'schmonz/cvs'

10 years agolink added
https://www.google.com/accounts/o8/id?id=AItOawnpPUuwvqeRyAInHCU3a5UWxXg-iidR2Y4 [Thu, 2 Feb 2012 04:12:30 +0000 (00:12 -0400)] 
link added

10 years agoUpdate test plan, missed in previous.
Amitai Schlair [Thu, 2 Feb 2012 03:08:21 +0000 (22:08 -0500)] 
Update test plan, missed in previous.

10 years agoMerge branch 'master' into cvs
Amitai Schlair [Thu, 2 Feb 2012 03:07:03 +0000 (22:07 -0500)] 
Merge branch 'master' into cvs

10 years agoMerge branch 'master' of git://git.ikiwiki.info
Amitai Schlair [Thu, 2 Feb 2012 03:02:45 +0000 (22:02 -0500)] 
Merge branch 'master' of git://git.ikiwiki.info

10 years agofix typo in LC_TIME locale lookup
Joey Hess [Thu, 2 Feb 2012 02:47:21 +0000 (22:47 -0400)] 
fix typo in LC_TIME locale lookup

10 years agoExpress rcs_recentchanges() tests via utility functions, in preparation
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().

10 years agoFail a test if an rcs_receive() hook is ever defined for CVS.
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.

10 years agoExtract add_and_commit(), a common test action.
Amitai Schlair [Wed, 1 Feb 2012 16:04:15 +0000 (11:04 -0500)] 
Extract add_and_commit(), a common test action.

10 years agoclean example blog
http://smcv.pseudorandom.co.uk/ [Wed, 1 Feb 2012 10:40:26 +0000 (06:40 -0400)] 
clean example blog

This reverts commit e8dfb79a80103c70371b8c741ecac1e80936a63c

10 years agoMerge branch 'master' of git://git.ikiwiki.info
Amitai Schlair [Tue, 31 Jan 2012 07:41:28 +0000 (02:41 -0500)] 
Merge branch 'master' of git://git.ikiwiki.info

10 years agoA comment.
https://www.google.com/accounts/o8/id?id=AItOawm3nkx3XijKnsGW7VLDQW0SrfY2Hs0GKmM [Tue, 31 Jan 2012 04:55:11 +0000 (00:55 -0400)] 
A comment.

10 years agoMerge branch 'master' into cvs
Amitai Schlair [Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)] 
Merge branch 'master' into cvs

10 years agoMerge branch 'master' of git://git.ikiwiki.info
Amitai Schlair [Tue, 31 Jan 2012 01:56:35 +0000 (19:56 -0600)] 
Merge branch 'master' of git://git.ikiwiki.info

10 years agoMerge branch 'master' of github.com:schmonz/ikiwiki
Amitai Schlair [Tue, 31 Jan 2012 01:56:22 +0000 (19:56 -0600)] 
Merge branch 'master' of github.com:schmonz/ikiwiki

10 years agoMerge remaining TODO items into CVS page, and delete TODO.cvs.
Amitai Schlair [Tue, 31 Jan 2012 01:52:30 +0000 (19:52 -0600)] 
Merge remaining TODO items into CVS page, and delete TODO.cvs.

10 years agoagreed
http://kerravonsen.dreamwidth.org/ [Mon, 30 Jan 2012 22:52:27 +0000 (18:52 -0400)] 
agreed

10 years agothere are actually reasons, yes
http://kerravonsen.dreamwidth.org/ [Mon, 30 Jan 2012 22:39:34 +0000 (18:39 -0400)] 
there are actually reasons, yes

10 years agoremove non-ikiwiki site
Joey Hess [Mon, 30 Jan 2012 19:47:09 +0000 (15:47 -0400)] 
remove non-ikiwiki site

10 years agoMerge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Mon, 30 Jan 2012 19:40:31 +0000 (15:40 -0400)] 
Merge branch 'master' of ssh://git.ikiwiki.info

10 years agoremove stealthy spam
Joey Hess [Mon, 30 Jan 2012 19:37:01 +0000 (15:37 -0400)] 
remove stealthy spam

10 years agoAdded a comment
http://joey.kitenet.net/ [Mon, 30 Jan 2012 19:34:01 +0000 (15:34 -0400)] 
Added a comment

10 years agoMerge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Mon, 30 Jan 2012 19:33:02 +0000 (15:33 -0400)] 
Merge branch 'master' of ssh://git.ikiwiki.info

10 years agofix typo (doubled quote)
Joey Hess [Mon, 30 Jan 2012 19:32:18 +0000 (15:32 -0400)] 
fix typo (doubled quote)

10 years agoAdded a comment
http://joey.kitenet.net/ [Mon, 30 Jan 2012 19:30:21 +0000 (15:30 -0400)] 
Added a comment

10 years agochangelog
Joey Hess [Mon, 30 Jan 2012 19:25:56 +0000 (15:25 -0400)] 
changelog

10 years agoMerge remote-tracking branch 'schmonz/portability'
Joey Hess [Mon, 30 Jan 2012 19:20:54 +0000 (15:20 -0400)] 
Merge remote-tracking branch 'schmonz/portability'

10 years agocleanup
Joey Hess [Mon, 30 Jan 2012 19:16:13 +0000 (15:16 -0400)] 
cleanup

10 years agoMerge branch 'master' of ssh://git.ikiwiki.info
Joey Hess [Mon, 30 Jan 2012 19:15:28 +0000 (15:15 -0400)] 
Merge branch 'master' of ssh://git.ikiwiki.info

10 years agofix
Joey Hess [Mon, 30 Jan 2012 19:14:41 +0000 (15:14 -0400)] 
fix

10 years agodocument a bug 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.

10 years agocalendar, prettydate: Fix strftime encoding bug
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.

10 years agocomment on haskell rebuild
tycho garen [Mon, 30 Jan 2012 18:49:19 +0000 (13:49 -0500)] 
comment on haskell rebuild

10 years agomerged
Joey Hess [Mon, 30 Jan 2012 18:45:29 +0000 (14:45 -0400)] 
merged

10 years agochangelog
Joey Hess [Mon, 30 Jan 2012 18:44:52 +0000 (14:44 -0400)] 
changelog

10 years agonuke
Joey Hess [Mon, 30 Jan 2012 18:41:59 +0000 (14:41 -0400)] 
nuke

10 years agoquery
Joey Hess [Mon, 30 Jan 2012 18:41:12 +0000 (14:41 -0400)] 
query

10 years agoRevert "ignore a file that always clutters status on OS X (no known fix)"
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.

10 years agoMerge remote-tracking branch 'schmonz/cvs'
Joey Hess [Mon, 30 Jan 2012 18:35:03 +0000 (14:35 -0400)] 
Merge remote-tracking branch 'schmonz/cvs'

10 years agocomments
Joey Hess [Mon, 30 Jan 2012 18:31:26 +0000 (14:31 -0400)] 
comments

10 years agofunctional changes are underway
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI [Sun, 29 Jan 2012 14:25:57 +0000 (10:25 -0400)] 
functional changes are underway

10 years agoeven further thought
http://kerravonsen.dreamwidth.org/ [Sun, 29 Jan 2012 11:42:02 +0000 (07:42 -0400)] 
even further thought

10 years agofurther thoughts
http://kerravonsen.dreamwidth.org/ [Sun, 29 Jan 2012 09:41:47 +0000 (05:41 -0400)] 
further thoughts

10 years agocomment about Haskell
http://kerravonsen.dreamwidth.org/ [Sun, 29 Jan 2012 09:34:45 +0000 (05:34 -0400)] 
comment about Haskell

10 years agoresponse
Joey Hess [Sun, 29 Jan 2012 02:50:28 +0000 (22:50 -0400)] 
response

10 years agoSwitch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
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.

10 years agocleanup
Joey Hess [Sat, 28 Jan 2012 16:22:46 +0000 (12:22 -0400)] 
cleanup

10 years agowhy do I always forget something?
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:19:15 +0000 (19:19 -0400)] 
why do I always forget something?

10 years agonew plugins, anyone?
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:18:19 +0000 (19:18 -0400)] 
new plugins, anyone?

10 years agonew jssearchfield directive
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:11:39 +0000 (19:11 -0400)] 
new jssearchfield directive

10 years agonew plugin "jssearchfield"
http://kerravonsen.dreamwidth.org/ [Sat, 28 Jan 2012 23:08:55 +0000 (19:08 -0400)] 
new plugin "jssearchfield"

10 years agoClearer (I hope) bug report
spalax [Sat, 28 Jan 2012 19:13:43 +0000 (15:13 -0400)] 
Clearer (I hope) bug report

10 years agoNew bug: encoding problem in calendar plugin
spalax [Sat, 28 Jan 2012 19:09:31 +0000 (15:09 -0400)] 
New bug: encoding problem in calendar plugin

10 years ago(no commit message)
seven [Sat, 28 Jan 2012 14:37:33 +0000 (10:37 -0400)] 

10 years ago(no commit message)
zut [Sat, 28 Jan 2012 10:30:47 +0000 (06:30 -0400)] 

10 years agoOups
zut [Sat, 28 Jan 2012 10:29:27 +0000 (06:29 -0400)] 
Oups

10 years agoEncoding problem in french with ikiwiki-calendar
zut [Sat, 28 Jan 2012 10:26:51 +0000 (06:26 -0400)] 
Encoding problem in french with ikiwiki-calendar

10 years ago(no commit message)
simonraven [Sat, 28 Jan 2012 10:05:44 +0000 (06:05 -0400)] 

10 years ago(no commit message)
simonraven [Sat, 28 Jan 2012 09:16:52 +0000 (05:16 -0400)] 

10 years agowhich came first, the chicken or the egg?
http://kerravonsen.dreamwidth.org/ [Fri, 27 Jan 2012 03:51:04 +0000 (23:51 -0400)] 
which came first, the chicken or the egg?

10 years agocomment to multi-threading discussion
tycho garen [Fri, 27 Jan 2012 02:28:19 +0000 (21:28 -0500)] 
comment to multi-threading discussion