Joey Hess [Fri, 8 Oct 2010 23:31:06 +0000 (19:31 -0400)]
Merge branch 'revert'
Joey Hess [Fri, 8 Oct 2010 23:27:28 +0000 (19:27 -0400)]
note that recentchanges plugin handles reversions
Joey Hess [Fri, 8 Oct 2010 23:26:31 +0000 (19:26 -0400)]
add blank line
Joey Hess [Fri, 8 Oct 2010 23:25:35 +0000 (19:25 -0400)]
typo
Joey Hess [Fri, 8 Oct 2010 23:24:06 +0000 (19:24 -0400)]
revert interface done
Joey Hess [Fri, 8 Oct 2010 23:19:43 +0000 (19:19 -0400)]
add message field to revert form
Joey Hess [Fri, 8 Oct 2010 23:13:35 +0000 (19:13 -0400)]
fix to have transparent background
Joey Hess [Fri, 8 Oct 2010 23:12:46 +0000 (19:12 -0400)]
better revert icon
based on one of the smileys, fixed to have transparent bg
Joey Hess [Fri, 8 Oct 2010 22:59:04 +0000 (18:59 -0400)]
propigate rcs_revert error message
and misc reorg
Joey Hess [Fri, 8 Oct 2010 22:58:47 +0000 (18:58 -0400)]
taint handling for rev
Joey Hess [Fri, 8 Oct 2010 22:50:24 +0000 (18:50 -0400)]
refactor
Joey Hess [Fri, 8 Oct 2010 22:46:30 +0000 (18:46 -0400)]
remove todo item
I understand the need to avoid chdir when running git_parse_changes
for receive now. At that point, the changes have not been pushed to
the srcdir's repo yet. When running the same code for preprevert,
chdir to the srcdir is ok, and necessary.
Joey Hess [Fri, 8 Oct 2010 22:43:15 +0000 (18:43 -0400)]
update
Joey Hess [Fri, 8 Oct 2010 22:06:38 +0000 (18:06 -0400)]
refactor check_canchange into IkiWiki library
Joey Hess [Fri, 8 Oct 2010 22:02:47 +0000 (18:02 -0400)]
fix rcs_prepedit implementation to match spec
Joey Hess [Fri, 8 Oct 2010 21:54:12 +0000 (17:54 -0400)]
make revert hooks optional
I removed the IkiWiki::rcs_ stubs for the revert hooks. Instead
recentchanges tests to see if the hooks are available and calls
them directly.
Joey Hess [Fri, 8 Oct 2010 21:46:21 +0000 (17:46 -0400)]
update for new hooks
http://jmtd.livejournal.com/ [Thu, 7 Oct 2010 12:37:02 +0000 (12:37 +0000)]
other purpose
http://jmtd.livejournal.com/ [Wed, 6 Oct 2010 20:27:08 +0000 (20:27 +0000)]
gitbranch template
http://jmtd.livejournal.com/ [Wed, 6 Oct 2010 20:25:05 +0000 (20:25 +0000)]
rationale
Joey Hess [Wed, 6 Oct 2010 19:08:12 +0000 (15:08 -0400)]
convert rcs_revert to only stage the reversion
Joey Hess [Wed, 6 Oct 2010 19:02:06 +0000 (15:02 -0400)]
return to recentchanges page on form cancel
Joey Hess [Wed, 6 Oct 2010 18:59:20 +0000 (14:59 -0400)]
put diff at end of revert form
Joey Hess [Wed, 6 Oct 2010 18:55:08 +0000 (14:55 -0400)]
revert html tweaking
JoshTriplett [Wed, 6 Oct 2010 18:49:30 +0000 (18:49 +0000)]
wishlist
JoshTriplett [Wed, 6 Oct 2010 18:49:02 +0000 (18:49 +0000)]
Joey Hess [Wed, 6 Oct 2010 18:39:10 +0000 (14:39 -0400)]
remove rcs_showpatch
Joey Hess [Wed, 6 Oct 2010 18:36:13 +0000 (14:36 -0400)]
Merge branch 'master' into revert
respond to Joey's raw inline comments.
Joey Hess [Tue, 5 Oct 2010 16:01:36 +0000 (12:01 -0400)]
inline already supports raw files though
Joey Hess [Tue, 5 Oct 2010 15:29:44 +0000 (11:29 -0400)]
Merge branch 'master' into revert
Conflicts:
doc/todo/web_reversion.mdwn
Joey Hess [Tue, 5 Oct 2010 15:22:51 +0000 (11:22 -0400)]
add pointer to my branch
Fix wikilink from git to wtk page.
Add gitbranch template to inline_raw_files.mdwn.
Use wtk's github branch instead of drexel.edu branch.
Added github git branch for W. Trevor King.
Added link to git repository with support for inlining raw files.
PeteG [Tue, 5 Oct 2010 02:30:25 +0000 (02:30 +0000)]
JoeRayhawk [Tue, 5 Oct 2010 01:09:42 +0000 (01:09 +0000)]
Bug: UTF-16 and UTF-32 are unhandled: New
Joey Hess [Mon, 4 Oct 2010 21:03:21 +0000 (17:03 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Mon, 4 Oct 2010 20:58:55 +0000 (16:58 -0400)]
second review pass and I have a revert branch now
Joey Hess [Mon, 4 Oct 2010 20:56:21 +0000 (16:56 -0400)]
remove debugging dumper code
Joey Hess [Mon, 4 Oct 2010 20:52:52 +0000 (16:52 -0400)]
indentation and layout
Joey Hess [Mon, 4 Oct 2010 20:35:17 +0000 (16:35 -0400)]
fix $git_root caching
Joey Hess [Mon, 4 Oct 2010 20:34:33 +0000 (16:34 -0400)]
indentation
Joey Hess [Mon, 4 Oct 2010 20:33:36 +0000 (16:33 -0400)]
fix indentation
Joey Hess [Mon, 4 Oct 2010 20:22:50 +0000 (16:22 -0400)]
document new rcs reversion support functions
Joey Hess [Mon, 4 Oct 2010 20:03:00 +0000 (16:03 -0400)]
indentation
Joey Hess [Mon, 4 Oct 2010 20:01:21 +0000 (16:01 -0400)]
fix bug if git_root is "0"
Joey Hess [Mon, 4 Oct 2010 19:59:45 +0000 (15:59 -0400)]
Merge remote branch 'remotes/peteg/revert' into revert
fix a little typo
Adding blog dependencies
Joey Hess [Mon, 4 Oct 2010 14:54:44 +0000 (10:54 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Adding apache2 dependencies to enable CGI
Joey Hess [Sun, 3 Oct 2010 16:34:58 +0000 (12:34 -0400)]
Updated French program translation. Closes: #598918
Added a comment: New dump plugin
Joey Hess [Sat, 2 Oct 2010 16:03:33 +0000 (12:03 -0400)]
close
Joey Hess [Sat, 2 Oct 2010 16:03:04 +0000 (12:03 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Sat, 2 Oct 2010 16:02:34 +0000 (12:02 -0400)]
fixups tidy change
Need checkconfig hook; examples don't become default values.
http://smcv.pseudorandom.co.uk/ [Sat, 2 Oct 2010 13:57:03 +0000 (13:57 +0000)]
tag as patch, I think this version is ready for review
http://smcv.pseudorandom.co.uk/ [Sat, 2 Oct 2010 13:52:45 +0000 (13:52 +0000)]
tested and seems to work
Simon McVittie [Sat, 2 Oct 2010 12:56:15 +0000 (13:56 +0100)]
fix typo spotted by lintian
Peter Gammie [Sat, 2 Oct 2010 05:06:10 +0000 (15:06 +1000)]
Merge branch 'joey' into revert
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 23:01:36 +0000 (23:01 +0000)]
workaround
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 22:50:26 +0000 (22:50 +0000)]
clarification: too many things called cgiurl
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 22:46:50 +0000 (22:46 +0000)]
how much indentation does a code block in a bullet point need? we just don't know
http://smcv.pseudorandom.co.uk/ [Fri, 1 Oct 2010 22:43:52 +0000 (22:43 +0000)]
updated branch; fold discussion of rejected version into a toggleable
Peter Gammie [Fri, 1 Oct 2010 04:53:00 +0000 (14:53 +1000)]
Correct 'alt' text for the revert image.
PeteG [Fri, 1 Oct 2010 04:20:03 +0000 (04:20 +0000)]
Continuing discussion about reverting via the web interface.
Peter Gammie [Fri, 1 Oct 2010 04:08:07 +0000 (14:08 +1000)]
Minor tidy-ups.
Peter Gammie [Fri, 1 Oct 2010 04:06:00 +0000 (14:06 +1000)]
Complete rcs_preprevert and lightly test.
Peter Gammie [Thu, 30 Sep 2010 23:48:03 +0000 (09:48 +1000)]
Merge branch 'joey' into revert
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 21:57:39 +0000 (21:57 +0000)]
done, PEBKAC. Thank you for your time :)
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 21:49:55 +0000 (21:49 +0000)]
gah
Point to my updated mdwn_itex plugin.
Created "configurable tidy" todo item.
W. Trevor King [Thu, 30 Sep 2010 11:53:37 +0000 (07:53 -0400)]
Make tidy command line configurable for the htmltidy plugin.
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 09:00:39 +0000 (09:00 +0000)]
removed
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 08:59:12 +0000 (08:59 +0000)]
lists and bullets
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 08:57:56 +0000 (08:57 +0000)]
+branchable link, demo of actiontabs
http://jmtd.livejournal.com/ [Thu, 30 Sep 2010 08:55:04 +0000 (08:55 +0000)]
code and lists
Peter Gammie [Thu, 30 Sep 2010 06:13:56 +0000 (16:13 +1000)]
Merge branch 'joey' into revert
Joey Hess [Wed, 29 Sep 2010 16:00:34 +0000 (12:00 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Wed, 29 Sep 2010 15:58:45 +0000 (11:58 -0400)]
Fix test suite failure on other side of date line.
Peter Gammie [Wed, 29 Sep 2010 05:43:44 +0000 (15:43 +1000)]
Get things right after moving to a branch.
Peter Gammie [Wed, 29 Sep 2010 05:14:19 +0000 (15:14 +1000)]
First cut at the revert plugin.
PeteG [Wed, 29 Sep 2010 04:22:10 +0000 (04:22 +0000)]
http://smcv.pseudorandom.co.uk/ [Wed, 29 Sep 2010 00:28:14 +0000 (00:28 +0000)]
alternative approach with untested branch
Joey Hess [Tue, 28 Sep 2010 21:07:01 +0000 (17:07 -0400)]
add todo page for web reversion, with code review of patch
Joey Hess [Tue, 28 Sep 2010 20:34:43 +0000 (16:34 -0400)]
add reference to peteg's revert code
better tags
initial page
Joey Hess [Mon, 27 Sep 2010 22:47:13 +0000 (18:47 -0400)]
test case
http://jmtd.livejournal.com/ [Mon, 27 Sep 2010 22:17:29 +0000 (22:17 +0000)]
probably PEBKAC (but still haven't figured it out)
Joey Hess [Mon, 27 Sep 2010 20:10:13 +0000 (16:10 -0400)]
parameterize FIND and SED