diff options
| author | Joey Hess <joey@kitenet.net> | 2011-07-19 11:26:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-07-19 11:26:14 -0400 |
| commit | 86e1dc492ffa26f6546c9c6d3234b762a86ccb61 (patch) | |
| tree | 9cb9d3eddd875bd1abe3fbc7c1e3defd80be3d22 /doc | |
| parent | 91e5375e6e9e1b56d9240e228d033cd90002fc8e (diff) | |
| download | ikiwiki-86e1dc492ffa26f6546c9c6d3234b762a86ccb61.tar ikiwiki-86e1dc492ffa26f6546c9c6d3234b762a86ccb61.tar.gz | |
apply the big mercurial patch
* mercurial: openid nicknames are now used when committing. (Daniel Andersson)
* mercurial: implement rcs_commit_staged so comments, attachments, etc
can be used. (Daniel Andersson)
* mercurial: fix viewing of a diff containing non-utf8 changes.
(Daniel Andersson)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rcs.mdwn | 4 | ||||
| -rw-r--r-- | doc/todo/Attempt_to_extend_Mercurial_backend_support.mdwn | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index 4d75d6325..9f531d442 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -17,7 +17,7 @@ links to more information about each. feature |[[git]]|[[svn]]|[[bzr]] |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]] |[[cvs]] [[ikiwiki-makerepo]]|yes |yes |yes |yes |yes |yes |no |yes auto.setup |yes |yes |incomplete|yes |incomplete |yes |incomplete|yes -`rcs_commit_staged` |yes |yes |yes |yes |no |yes |no |yes +`rcs_commit_staged` |yes |yes |yes |yes |yes |yes |no |yes `rcs_rename` |yes |yes |yes |yes |no |yes |no |yes `rcs_remove` |yes |yes |yes |yes |no |yes |no |yes `rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes @@ -27,7 +27,7 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes `rcs_revert` |yes |no |no |no |no |no |no |no anonymous push |yes |no |no |no |no |no |no |no conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes -openid username |yes |no |no |no |no |no |no |no +openid username |yes |no |no |no |yes |yes |no |no """]] Notes: diff --git a/doc/todo/Attempt_to_extend_Mercurial_backend_support.mdwn b/doc/todo/Attempt_to_extend_Mercurial_backend_support.mdwn index b17960385..8ded94393 100644 --- a/doc/todo/Attempt_to_extend_Mercurial_backend_support.mdwn +++ b/doc/todo/Attempt_to_extend_Mercurial_backend_support.mdwn @@ -24,6 +24,8 @@ Diff follows, for anyone to annotate. First code version is also available at [m >> I changed the by `mercurial.pm` recorded commit messages and the `rcs_recentchanges` logic to include more information, to emulate the `git.pm` behaviour regarding name presentation on RecentChanges. I don't have anything more to add at the moment, so if the code passes review, I'm done, and I tag this page as "patch". [Final patch version as per this page at my hg repo](http://510x.se/hg/program/ikiwiki/file/bc0e2f838fe3/Plugin/mercurial.pm) ([raw format](http://46.239.104.5:81/hg/program/ikiwiki/raw-file/bc0e2f838fe3/Plugin/mercurial.pm)). I keep the below conversation for reference, but it's mostly outdated. --[[Daniel Andersson]] +[[merged|done]] --[[Joey]] + [[!tag patch]] *** |