X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7816a5dca3754d9c7e7dfc70f251ac50f2c3714b..d3e190ecec67ae45891d8aee3e3c8af9fc9f8cf9:/doc/todo/mercurial.mdwn diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn index 9dd3cbb4d..e5de93521 100644 --- a/doc/todo/mercurial.mdwn +++ b/doc/todo/mercurial.mdwn @@ -6,6 +6,10 @@ passed through to mercurial -u. Will mercurial choke on this? * Nope. Mercurial doesn't expect any particular format for the username, though "Name
" is standard. --[[bma]] +* The way `-u $user` is passed to `hg commit`, there's no way to tell + if a given commit came in over the web or was done directly. So + rcs_recentchanges hardcodes 'committype => "mercurial"'. See the monotone + backend for an example of one that does this right. * The rcs_commit implementation seems not to notice if the file has been changed since a web edit started. Unlike all the other frontends, which use the rcstoken to detect if the web commit started editing an earlier @@ -14,10 +18,16 @@ blindly overwrite the current file with the web edited version, losing any other changes. -Posthook: in $srcdir/.hg/hrc, I have the following +Posthook: in `$srcdir/.hg/hgrc`, I have the following [hooks] incoming.update = hg up - postupdate.ikiwiki = ikiwiki --setup /path/to/ikiwiki.setup --refresh + update.ikiwiki = ikiwiki --setup /path/to/ikiwiki.setup --refresh -This should update the working directory and run ikiwiki every time a change is recorded (someone who knows mercurial better than I do may be able to suggest a better way, but this works for me.) \ No newline at end of file +This should update the working directory and run ikiwiki every time a change is recorded (someone who knows mercurial better than I do may be able to suggest a better way, but this works for me.) + +> Try running it with --post-commit instead of --refresh. That should +> work better, handling both the case where the edit was made via the web +> and then committed, and the case where a commit was made directly. +> It can deadlock if the post-commit hook runs with --refresh in the +> former case. --[[Joey]]