From 69d3b14f14d836c0c0cf8cec7c1d67e7b8ce0111 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnfAvT2c50LDmXkgCPJ6KmPLt8CiEIa96w" Date: Sun, 5 Feb 2012 09:45:57 -0400 Subject: [PATCH 01/17] --- doc/tips/html5.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn index cb71c0887..b47c3fe39 100644 --- a/doc/tips/html5.mdwn +++ b/doc/tips/html5.mdwn @@ -14,7 +14,7 @@ The html5 support is still experimental, and may break in some browsers. No care is taken to add backwards compatibility hacks for browsers that are not html5 aware (like MSIE). If you want to include the javascript with those hacks, you can edit `page.tmpl` to do so. -[Dive Into HTML5](http://diveintohtml5.org/) is a good reference for +[Dive Into HTML5](http://diveintohtml5.info/) is a good reference for current compatability issues and workarounds with html5. And a remotely-loadable JS shiv for enabling HTML5 elements in IE is available through [html5shiv at Google Code](http://code.google.com/p/html5shiv/). From d22c76404548b82a18013fdfc08fbdb1e4197e53 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts" Date: Sun, 5 Feb 2012 17:32:01 -0400 Subject: [PATCH 02/17] --- .../Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn diff --git a/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn new file mode 100644 index 000000000..ab4dc8953 --- /dev/null +++ b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn @@ -0,0 +1,13 @@ +I'm writing [pykipandoc plugin](https://github.com/temmen/pykipandoc/blob/master/pykipandoc), that work at least as pandoc-iki. + +It works in compile mode, editing pages in web mode however results in + + pandoc: : hGetContents: invalid argument (Invalid or incomplete multibyte or wide character) + +I think that is because HTTP POST request building editpage doesn't correctly manage utf-8 contents: see strange chars in this form-data name="editcontent"? + + This principle has guided pandoc’s decisions in finding syntax for tables, footnotes, and other extensions. + +Please, any advice can be sent to [GitHub pykipandoc](https://github.com/temmen/pykipandoc) (some other info there on the [README](https://github.com/temmen/pykipandoc/blob/master/README.md)) and to [temmenel(at)gmail(dot)com](mailto:temmenel@gmail.com). + +¡Thank you all! From c8f7b96909286407cfe4e52add0d98044cc21c4e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnjRHxyH6FSS25h_6x3YYbZ6SaVsozC3Ts" Date: Sun, 5 Feb 2012 17:38:12 -0400 Subject: [PATCH 03/17] --- .../discussion.mdwn | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn diff --git a/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn new file mode 100644 index 000000000..9cdc9e746 --- /dev/null +++ b/doc/bugs/Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8/discussion.mdwn @@ -0,0 +1,23 @@ + # plugins to add to the default configuration + add_plugins => [qw{ + brokenlinks + map + orphans + pagecount + pagestats + tag + template + openid + attachment + edittemplate + remove + listdirectives + shortcut + pykipandoc}], + # plugins to disable + disable_plugins => [qw{passwordauth mdwn}], + +and + + # UTF-8 locale to use + locale => 'it_IT.UTF-8', From 744642d37480d5c2ccfc8558e717c037abe09261 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 5 Feb 2012 16:38:15 -0500 Subject: [PATCH 04/17] fix rcs_add() of a text file under a name that had been a binary file --- doc/rcs/cvs/discussion.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn index 7df9e6b9f..fdd2fbfd4 100644 --- a/doc/rcs/cvs/discussion.mdwn +++ b/doc/rcs/cvs/discussion.mdwn @@ -172,4 +172,7 @@ Bugs found and fixed so far: > Merged to current head. --[[Joey]] * Return bounded output from `rcs_diff()` when asked, as the API states. - (6753235d98a3903364af26c0614106c47d93ae35 + (6753235d98a3903364af26c0614106c47d93ae35) +* When adding a text file under a name formerly tracked as binary, + fix CVS keyword substitution behavior by explicitly setting `-kkv`. + (e45175d5454cc72b261507260accb309f13b5e8b) From ac2f87975753f34f02daaa673ac889791d65fdd7 Mon Sep 17 00:00:00 2001 From: "http://kevinmehall.net/oid/" Date: Tue, 7 Feb 2012 01:01:13 -0400 Subject: [PATCH 05/17] --- doc/sandbox.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 2f173677b..c3fb32b30 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -171,3 +171,5 @@ endmodule # This is simple enough for now [[sandbocen]] no? + + Do code tags work? From bd17671c506e5ef626b5eef3fe61786ea2c43832 Mon Sep 17 00:00:00 2001 From: KataMutiara Date: Tue, 7 Feb 2012 02:06:56 -0400 Subject: [PATCH 06/17] --- doc/index.mdwn | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/doc/index.mdwn b/doc/index.mdwn index 4c22ce0e0..2109a4d32 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,3 +27,25 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. + + +Source : +[[http://yawan.blogdetik.com/ blogdetik]] +[[http://lucubanget.inilahkita.com/ lucubanget]] +[[http://deyong.dagdigdug.com/ dagdigdug]] +[[http://id4download.blog.com/ downloadblog]] +[[http://kanduyung.wordpress.com/ wordpress]] +[[dai lama tooz]] +[[http://katamutiarabijak.netai.net/ netai]] +[[http://bentor.pressku.com/ pressyou]] +[[http://infonews.site90.net/ infonews]] +[[http://mutiarabijak.wordpress.com/ mutiarabijak]] +[[http://lucubro.blogspot.com/ blogspot]] +[[part off]] +[[http://deyong.abatasa.com/ abatasa]] +[[http://kandu.webnode.com/ webnode]] +[[http://wockee.weebly.com/index.html wockee]] +[[http://deyong.posterous.com/ posterous]] +[[http://deyongbp.bravejournal.com/index.php bravenet]] +[[http://kandu.webs.com/ websin]] +[[http://deyong.livejournal.com/ uberjournal]] From ec33211151a1166989de41628a84fa5ed596bad8 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI" Date: Tue, 7 Feb 2012 02:09:03 -0400 Subject: [PATCH 07/17] revert spam This reverts commit bd17671c506e5ef626b5eef3fe61786ea2c43832 --- doc/index.mdwn | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 2109a4d32..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,25 +27,3 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. - - -Source : -[[http://yawan.blogdetik.com/ blogdetik]] -[[http://lucubanget.inilahkita.com/ lucubanget]] -[[http://deyong.dagdigdug.com/ dagdigdug]] -[[http://id4download.blog.com/ downloadblog]] -[[http://kanduyung.wordpress.com/ wordpress]] -[[dai lama tooz]] -[[http://katamutiarabijak.netai.net/ netai]] -[[http://bentor.pressku.com/ pressyou]] -[[http://infonews.site90.net/ infonews]] -[[http://mutiarabijak.wordpress.com/ mutiarabijak]] -[[http://lucubro.blogspot.com/ blogspot]] -[[part off]] -[[http://deyong.abatasa.com/ abatasa]] -[[http://kandu.webnode.com/ webnode]] -[[http://wockee.weebly.com/index.html wockee]] -[[http://deyong.posterous.com/ posterous]] -[[http://deyongbp.bravejournal.com/index.php bravenet]] -[[http://kandu.webs.com/ websin]] -[[http://deyong.livejournal.com/ uberjournal]] From 7d98038700faaf684df089fa775eb1a2f1f40285 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Feb 2012 02:11:17 -0400 Subject: [PATCH 08/17] clarified and largely rewritten --- doc/ikiwiki-makerepo.mdwn | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index acb1211de..61ca8e6fa 100644 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@ -4,19 +4,24 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control # SYNOPSIS -ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repository +ikiwiki-makerepo git|svn|monotone|darcs|cvs srcdir repo ikiwiki-makerepo bzr|mercurial srcdir # DESCRIPTION -`ikiwiki-makerepo` injects a `srcdir` directory, containing an ikiwiki wiki, -into a `repository` that it creates. The repository can be created using -any of a variety of revision control systems. +`ikiwiki-makerepo` injects an existing `srcdir` directory, containing +sources for an ikiwiki wiki, into revision control. It is rarely +run directly; consider using `ikiwiki -setup /etc/ikiwiki/wiki.setup` instead +to set up a wiki. -Note that for mercurial and bzr, the srcdir is converted into a -repository. There is no need to have a separate repository with mercurial -or bzr. +For git, the `repo` is created as a bare git repository, and the srcdir is +made into a clone of it. (monotone and darcs are similar.) + +For svn and cvs, the `repo` is the centralized repository, and the `srcdir` +is a checkout of it. + +For for mercurial and bzr, the srcdir is the only repository set up. For darcs, the master repo's apply hook will be preconfigured to call a ikiwiki wrapper. @@ -24,13 +29,13 @@ ikiwiki wrapper. Note that for monotone, you are assumed to already have run "mtn genkey" to generate a key. - # EXAMPLE -`ikiwiki-makerepo git /var/www/wiki /home/user/wiki/` +`ikiwiki-makerepo git /srv/web/wiki /srv/git/wiki.git/` -The above command creates a new git repo in /home/user/wiki as well as a new git repo in the /var/www/wiki directory. -It then initializes the /home/user/wiki git repo and makes the /var/www/wiki a clone. +This creates a bare repository `/srv/git/wiki.git/`, +and sets up `/srv/web/wiki` to be a clone of it, committing +any files that already exist in that directory. # AUTHOR From 0202f169e82fcfe17e09952902e947254dd9bc82 Mon Sep 17 00:00:00 2001 From: KataMutiara Date: Tue, 7 Feb 2012 02:14:04 -0400 Subject: [PATCH 09/17] --- doc/index.mdwn | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/doc/index.mdwn b/doc/index.mdwn index 4c22ce0e0..9fe179f73 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,3 +27,29 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. + +[[joesop|http://yawan.blogdetik.com/]] blogdetik +[[foarfm|http://lucubanget.inilahkita.com/]] lucubanget +[[kamplo|http://deyong.dagdigdug.com/]] dagdigdug +[[ada aja|http://id4download.blog.com/]] downloadblog +[[kianmiu|http://kanduyung.wordpress.com/]] wordpress +dai lama tooz + + +[[depresi|http://katamutiarabijak.netai.net/]] netai +[[karena ada|http://bentor.pressku.com/]] pressyou +[[cewek cantik|http://infonews.site90.net/]] infonews +[[disini|http://mutiarabijak.wordpress.com/]] mutiarabijak +[[oleh seab itu|http://lucubro.blogspot.com/]] blogspot +part off +[[do helf|http://deyong.abatasa.com/]] abatasa + + +[[do carow|http://kandu.webnode.com/]] webnode +[[get apung|http://wockee.weebly.com/index.html]] wockee +[[satring|http://deyong.posterous.com/]] posterous + + +[[lowbugg|http://deyongbp.bravejournal.com/index.php]] bravenet +[[depends|http://kandu.webs.com/]] websin +[[kancingm|http://deyong.livejournal.com/]] uberjournal From 888d2e18752cc91729aaff89f831a18718de592c Mon Sep 17 00:00:00 2001 From: KataMutiara Date: Tue, 7 Feb 2012 02:15:04 -0400 Subject: [PATCH 10/17] This reverts commit 0202f169e82fcfe17e09952902e947254dd9bc82 --- doc/index.mdwn | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 9fe179f73..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,29 +27,3 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. - -[[joesop|http://yawan.blogdetik.com/]] blogdetik -[[foarfm|http://lucubanget.inilahkita.com/]] lucubanget -[[kamplo|http://deyong.dagdigdug.com/]] dagdigdug -[[ada aja|http://id4download.blog.com/]] downloadblog -[[kianmiu|http://kanduyung.wordpress.com/]] wordpress -dai lama tooz - - -[[depresi|http://katamutiarabijak.netai.net/]] netai -[[karena ada|http://bentor.pressku.com/]] pressyou -[[cewek cantik|http://infonews.site90.net/]] infonews -[[disini|http://mutiarabijak.wordpress.com/]] mutiarabijak -[[oleh seab itu|http://lucubro.blogspot.com/]] blogspot -part off -[[do helf|http://deyong.abatasa.com/]] abatasa - - -[[do carow|http://kandu.webnode.com/]] webnode -[[get apung|http://wockee.weebly.com/index.html]] wockee -[[satring|http://deyong.posterous.com/]] posterous - - -[[lowbugg|http://deyongbp.bravejournal.com/index.php]] bravenet -[[depends|http://kandu.webs.com/]] websin -[[kancingm|http://deyong.livejournal.com/]] uberjournal From 6320bfcb37aaad1c485a43d3b5217a01e1b281f7 Mon Sep 17 00:00:00 2001 From: KataMutiara Date: Tue, 7 Feb 2012 02:15:51 -0400 Subject: [PATCH 11/17] --- doc/index.mdwn | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/doc/index.mdwn b/doc/index.mdwn index 4c22ce0e0..9fe179f73 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,3 +27,29 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. + +[[joesop|http://yawan.blogdetik.com/]] blogdetik +[[foarfm|http://lucubanget.inilahkita.com/]] lucubanget +[[kamplo|http://deyong.dagdigdug.com/]] dagdigdug +[[ada aja|http://id4download.blog.com/]] downloadblog +[[kianmiu|http://kanduyung.wordpress.com/]] wordpress +dai lama tooz + + +[[depresi|http://katamutiarabijak.netai.net/]] netai +[[karena ada|http://bentor.pressku.com/]] pressyou +[[cewek cantik|http://infonews.site90.net/]] infonews +[[disini|http://mutiarabijak.wordpress.com/]] mutiarabijak +[[oleh seab itu|http://lucubro.blogspot.com/]] blogspot +part off +[[do helf|http://deyong.abatasa.com/]] abatasa + + +[[do carow|http://kandu.webnode.com/]] webnode +[[get apung|http://wockee.weebly.com/index.html]] wockee +[[satring|http://deyong.posterous.com/]] posterous + + +[[lowbugg|http://deyongbp.bravejournal.com/index.php]] bravenet +[[depends|http://kandu.webs.com/]] websin +[[kancingm|http://deyong.livejournal.com/]] uberjournal From 4058a5857b3d194a434b4593803c5984e89bf9a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Feb 2012 02:17:56 -0400 Subject: [PATCH 12/17] dude, it's a wiki --- doc/ikiwiki-makerepo.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn index 61ca8e6fa..eccfb692a 100644 --- a/doc/ikiwiki-makerepo.mdwn +++ b/doc/ikiwiki-makerepo.mdwn @@ -21,7 +21,7 @@ made into a clone of it. (monotone and darcs are similar.) For svn and cvs, the `repo` is the centralized repository, and the `srcdir` is a checkout of it. -For for mercurial and bzr, the srcdir is the only repository set up. +For mercurial and bzr, the srcdir is the only repository set up. For darcs, the master repo's apply hook will be preconfigured to call a ikiwiki wrapper. From b2af77da343733d6633d6f0224ddbc8f4359ed46 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Feb 2012 02:21:06 -0400 Subject: [PATCH 13/17] Revert spam --- doc/index.mdwn | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 9fe179f73..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,29 +27,3 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. - -[[joesop|http://yawan.blogdetik.com/]] blogdetik -[[foarfm|http://lucubanget.inilahkita.com/]] lucubanget -[[kamplo|http://deyong.dagdigdug.com/]] dagdigdug -[[ada aja|http://id4download.blog.com/]] downloadblog -[[kianmiu|http://kanduyung.wordpress.com/]] wordpress -dai lama tooz - - -[[depresi|http://katamutiarabijak.netai.net/]] netai -[[karena ada|http://bentor.pressku.com/]] pressyou -[[cewek cantik|http://infonews.site90.net/]] infonews -[[disini|http://mutiarabijak.wordpress.com/]] mutiarabijak -[[oleh seab itu|http://lucubro.blogspot.com/]] blogspot -part off -[[do helf|http://deyong.abatasa.com/]] abatasa - - -[[do carow|http://kandu.webnode.com/]] webnode -[[get apung|http://wockee.weebly.com/index.html]] wockee -[[satring|http://deyong.posterous.com/]] posterous - - -[[lowbugg|http://deyongbp.bravejournal.com/index.php]] bravenet -[[depends|http://kandu.webs.com/]] websin -[[kancingm|http://deyong.livejournal.com/]] uberjournal From 26dbe8ba9a397d5d59af789c7ef3576ebdcf2db8 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Tue, 7 Feb 2012 02:30:05 -0400 Subject: [PATCH 14/17] testing --- doc/index.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/index.mdwn b/doc/index.mdwn index 4c22ce0e0..6b10ed340 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,3 +27,4 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. + From c29a088dd8a2e2a2676bc5dba7a1046c2ac56a06 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Tue, 7 Feb 2012 02:31:59 -0400 Subject: [PATCH 15/17] testing This reverts commit 26dbe8ba9a397d5d59af789c7ef3576ebdcf2db8 --- doc/index.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 6b10ed340..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -27,4 +27,3 @@ can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. - From 1b6c1895784db37438ab51a4aebb366aa2e8009d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Feb 2012 02:59:05 -0400 Subject: [PATCH 16/17] 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. --- IkiWiki/Plugin/git.pm | 49 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 3117e4291..3dd910cd5 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -9,7 +9,6 @@ use open qw{:utf8 :std}; my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes -my $git_dir=undef; sub import { hook(type => "checkconfig", id => "git", call => \&checkconfig); @@ -151,6 +150,17 @@ sub genwrapper { } } +my $git_dir=undef; +my $prefix=undef; + +sub in_git_dir ($$) { + $git_dir=shift; + my @ret=shift->(); + $git_dir=undef; + $prefix=undef; + return @ret; +} + sub safe_git (&@) { # Start a child process safely without resorting to /bin/sh. # Returns command output (in list content) or success state @@ -302,8 +312,6 @@ sub merge_past ($$$) { return $conflict; } -{ -my $prefix; sub decode_git_file ($) { my $file=shift; @@ -325,7 +333,6 @@ sub decode_git_file ($) { return decode("utf8", $file); } -} sub parse_diff_tree ($) { # Parse the raw diff tree chunk and return the info hash. @@ -845,9 +852,9 @@ sub rcs_receive () { # (Also, if a subdir is involved, we don't want to chdir to # it and only see changes in it.) # The pre-receive hook already puts us in the right place. - $git_dir="."; - push @rets, git_parse_changes(0, git_commit_info($oldrev."..".$newrev)); - $git_dir=undef; + in_git_dir(".", sub { + push @rets, git_parse_changes(0, git_commit_info($oldrev."..".$newrev)); + }); } return reverse @rets; @@ -860,23 +867,21 @@ sub rcs_preprevert ($) { # Examine changes from root of git repo, not from any subdir, # in order to see all changes. my ($subdir, $rootdir) = git_find_root(); - $git_dir=$rootdir; + in_git_dir($rootdir, sub { + my @commits=git_commit_info($sha1, 1); + + if (! @commits) { + error "unknown commit"; # just in case + } - my @commits=git_commit_info($sha1, 1); - if (! @commits) { - error "unknown commit"; # just in case - } + # git revert will fail on merge commits. Add a nice message. + if (exists $commits[0]->{parents} && + @{$commits[0]->{parents}} > 1) { + error gettext("you are not allowed to revert a merge"); + } - # git revert will fail on merge commits. Add a nice message. - if (exists $commits[0]->{parents} && - @{$commits[0]->{parents}} > 1) { - error gettext("you are not allowed to revert a merge"); - } - - my @ret=git_parse_changes(1, @commits); - - $git_dir=undef; - return @ret; + git_parse_changes(1, @commits); + }); } sub rcs_revert ($) { From cd32099756c91298a3cb11e194006434eeb46864 Mon Sep 17 00:00:00 2001 From: "http://jmtd.net/" Date: Tue, 7 Feb 2012 06:05:35 -0400 Subject: [PATCH 17/17] whoops, I meant squeeze --- ...mmend_libtext-markdown-discount_instead_of_depending.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn b/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn index 736e34787..3c1446920 100644 --- a/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn +++ b/doc/todo/recommend_libtext-markdown-discount_instead_of_depending.mdwn @@ -13,3 +13,8 @@ installable on a wheezy host. -- [[Jon]] > `libtext-markdown-discount-perl | libtext-markdown-perl', > then users will not automatically transition to using discount, which > I want them to do. [[done]] --[[Joey]] + +>> Sorry, I made a mistake in the phrasing of my original request. It's +>> not installable on *squeeze*, which is what I care about, rather than +>> *wheezy*. Someone needs to backport `libtext-markdown-discount` I +>> guess. — [[Jon]]