cd32099756
whoops, I meant squeeze
2012-02-07 06:05:35 -04:00
9faa0f3c65
Merge branch 'master' into cvs
2012-02-07 02:47:24 -05:00
1b6c189578
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.
2012-02-07 03:06:40 -04:00
64aca7c30b
Merge branch 'master' into cvs
2012-02-07 01:38:53 -05:00
c29a088dd8
testing
...
This reverts commit 26dbe8ba9a
2012-02-07 02:31:59 -04:00
26dbe8ba9a
testing
2012-02-07 02:30:05 -04:00
b2af77da34
Revert spam
2012-02-07 02:21:06 -04:00
742579e109
Merge branch 'master' of ssh://git.ikiwiki.info
2012-02-07 02:20:09 -04:00
4058a5857b
dude, it's a wiki
2012-02-07 02:17:56 -04:00
6320bfcb37
2012-02-07 02:15:51 -04:00
888d2e1875
This reverts commit 0202f169e8
2012-02-07 02:15:04 -04:00
0202f169e8
2012-02-07 02:14:04 -04:00
7d98038700
clarified and largely rewritten
2012-02-07 02:11:17 -04:00
ec33211151
revert spam
...
This reverts commit bd17671c50
2012-02-07 02:09:03 -04:00
bd17671c50
2012-02-07 02:06:56 -04:00
ac2f879757
2012-02-07 01:01:13 -04:00
cd7eb3e625
Merge branch 'master' into cvs
2012-02-05 16:39:32 -05:00
4a47241a3e
Merge branch 'master' of git://git.ikiwiki.info
2012-02-05 16:38:52 -05:00
744642d374
fix rcs_add() of a text file under a name that had been a binary file
2012-02-05 16:38:15 -05:00
c8f7b96909
2012-02-05 17:38:12 -04:00
37bf6114d5
Notes.
2012-02-05 16:35:29 -05:00
e45175d545
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.
2012-02-05 16:33:49 -05:00
d22c764045
2012-02-05 17:32:01 -04:00
69d3b14f14
2012-02-05 09:45:57 -04:00
414ccfb1e2
Remember to run all the tests before committing!
2012-02-05 03:33:20 -05:00
4e7b7a1788
Test checkconfig().
2012-02-05 03:29:14 -05:00
4b596ea5c6
Test RCS Id keyword expansion on typical commit.
2012-02-05 01:34:58 -05:00
d7ff0326b4
Merge branch 'master' into cvs
2012-02-05 01:28:01 -05:00
65b021268b
rcs_diff() would always return unbounded output, fixed
2012-02-05 01:26:39 -05:00
0a05ac9205
Notes from an evening's debugging.
2012-02-05 01:24:09 -05:00
6753235d98
Write rcs_diff() tests according to the API spec, then make them pass.
2012-02-05 01:20:52 -05:00
c1f74efea6
Missed a portability spot.
2012-02-03 12:05:07 -05:00
a125cd5f79
add news item for ikiwiki 3.20120202
2012-02-02 22:48:09 -04:00
9a0ebcf85a
can't do that, and testing transition already resolved
2012-02-02 22:47:05 -04:00
7f591d22d9
Merge branch 'master' of ssh://git.ikiwiki.info
2012-02-02 22:43:25 -04:00
0a9bb3edc2
releasing version 3.20120202
2012-02-02 22:42:46 -04:00
c3f9ef8289
revert change to prettydate
...
Its strftime is from Date::Format, doesn't have the problem, and using the
POSIX one breaks its %o.
2012-02-02 22:27:55 -04:00
5468502b9c
2012-02-02 12:14:26 -04:00
5af14ba1b2
Remove dead blog link and add blipfoto link instead
2012-02-02 10:52:44 -04:00
25cb58771b
Account for the strangeness of my committer email.
2012-02-02 05:13:55 -05:00
be1cf943a6
Merge remote-tracking branch 'schmonz/cvs'
2012-02-02 01:11:45 -04:00
ec2262603c
link added
2012-02-02 00:12:30 -04:00
a65512ad18
Update test plan, missed in previous.
2012-02-01 22:08:21 -05:00
f29c12422e
Merge branch 'master' into cvs
2012-02-01 22:07:03 -05:00
bd5e75fd6d
Merge branch 'master' of git://git.ikiwiki.info
2012-02-01 22:02:45 -05:00
3200515b3d
fix typo in LC_TIME locale lookup
2012-02-01 22:49:35 -04:00
fc316b9da1
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().
2012-02-01 15:17:57 -05:00
b0d97cd20e
Fail a test if an rcs_receive() hook is ever defined for CVS.
2012-02-01 11:04:37 -05:00
1d176f23d2
Extract add_and_commit(), a common test action.
2012-02-01 11:04:15 -05:00
8fe55be60d
clean example blog
...
This reverts commit e8dfb79a80
2012-02-01 06:40:26 -04:00
http://jmtd.net/
Amitai Schlair
Joey Hess
http://joey.kitenet.net/
KataMutiara
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI
http://kevinmehall.net/oid/
https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts
https://www.google.com/accounts/o8/id?id=AItOawnfAvT2c50LDmXkgCPJ6KmPLt8CiEIa96w
https://www.google.com/accounts/o8/id?id=AItOawl-Dfpjeo0tdkNTg42sLTYYyDGTmXE9z9M
https://www.google.com/accounts/o8/id?id=AItOawnpPUuwvqeRyAInHCU3a5UWxXg-iidR2Y4
http://smcv.pseudorandom.co.uk/