From 515f3ef60046312bc170572d9af90518f40d50ca Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Oct 2008 15:45:58 -0400 Subject: anonymous git pushes are now enabled for this wiki --- doc/git.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index e5fef6a5a..cdaf3d4e2 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -1,6 +1,13 @@ Ikiwiki is developed in a git repository and can be checked out like this: +[[!template id=note text=""" +You can push changes back to ikiwiki's git repository over the `git://` +transport, to update the wiki, if you'd like, instead of editing it on the +web. Changes that could not be made via the web will be automatically +rejected. +"""]] + git clone git://git.ikiwiki.info/ Or like this if your firewall only passes http traffic (slow): -- cgit v1.2.3 From 478bed25962908a724bb4ce753b574b86f84dfb8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Oct 2008 16:10:25 -0400 Subject: wording --- doc/git.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index cdaf3d4e2..afe6ed7a8 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -1,9 +1,9 @@ -Ikiwiki is developed in a git repository and can be checked out -like this: +Ikiwiki, and this documentation wiki, are developed in a git repository and +can be checked out like this: [[!template id=note text=""" You can push changes back to ikiwiki's git repository over the `git://` -transport, to update the wiki, if you'd like, instead of editing it on the +transport, to update this wiki, if you'd like, instead of editing it on the web. Changes that could not be made via the web will be automatically rejected. """]] -- cgit v1.2.3 From de74b20d6e0043d2cb1f7091f139b64c09e551fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Oct 2008 17:50:14 -0400 Subject: mention twitter feed --- doc/git.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index afe6ed7a8..e7f47f5a0 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -20,7 +20,8 @@ There is also a mirror [on github](http://github.com/joeyh/ikiwiki/tree/master). Commits to this git repository are fed into [CIA](http://cia.vc), and can be browsed, subscribed to etc on its -[project page](http://cia.vc/stats/project/ikiwiki). +[project page](http://cia.vc/stats/project/ikiwiki). They're also fed into +[twitter](http://twitter.com/ikiwiki). ## branches -- cgit v1.2.3 From d135bd3f983fce11468037792b696cc32316023a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Dec 2008 13:27:50 -0500 Subject: add gitremotes script, parsing list of remotes on doc/git.mdwn Any remotes added will automatically be pulled into my working copy. --- doc/git.mdwn | 26 +++++++++++++++++++------- gitremotes | 29 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 7 deletions(-) create mode 100755 gitremotes (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index e7f47f5a0..00c108616 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -16,17 +16,29 @@ Or like this if your firewall only passes http traffic (slow): The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki). -There is also a mirror [on github](http://github.com/joeyh/ikiwiki/tree/master). - Commits to this git repository are fed into [CIA](http://cia.vc), and can be browsed, subscribed to etc on its [project page](http://cia.vc/stats/project/ikiwiki). They're also fed into [twitter](http://twitter.com/ikiwiki). -## branches +## personal git repositories You are of course free to set up your own ikiwiki git repository with your -own [[patches|patch]]. +own [[patches|patch]]. If you list it here, the `gitremotes` script will +automatically add it to git remotes. Your repo will automatically be pulled +into [[Joey]]'s working tree. This is recommended. :-) + +# Machine-parsed format: * wikilink + +* [[github]] + [browse](http://github.com/joeyh/ikiwiki/tree/master) + A mirror of the main repo, automatically updated. +* [[smcv]] +* [[intrigeri]] +* [[gmcmanus]] +* [[jelmer]] + +## branches Some of the branches included in the main repository include: @@ -38,9 +50,9 @@ Some of the branches included in the main repository include: * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some changes. * `darcs` is being used to add darcs support. -* `pristine-tar` contains deltas that - [pristine-tar](http://kitenet.net/~joey/code/pristine-tar) - can use to recreate released tarballs of ikiwiki * `debian-stable` is used for updates to the old version included in Debian's stable release, and `debian-testing` is used for updates to Debian's testing release. +* `pristine-tar` contains deltas that + [pristine-tar](http://kitenet.net/~joey/code/pristine-tar) + can use to recreate released tarballs of ikiwiki diff --git a/gitremotes b/gitremotes new file mode 100755 index 000000000..b14490924 --- /dev/null +++ b/gitremotes @@ -0,0 +1,29 @@ +#!/usr/bin/perl +# Parses list of remotes in doc/git.mdwn, configures git to use them +# all, and fetches updates from them. + +my $error=0; + +open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!"; +while () { + if (/^\*\s+\[\[(\w+)\]\]\s+<([^>]+)>/) { + # note that the remote name has to be a simple word (\w) + # for security/sanity reasons + my $remote=$1; + my $url=$2; + + # check configured url to deal with it changing + my $info=`git remote show -n $remote`; + my ($oldurl)=$info=~/URL: (.*)/m; + if ($oldurl ne $url) { + system("git remote rm $remote 2>/dev/null"); + $error |= system("git", "remote", "add", "-f", $remote, $url); + } + else { + $error |= system("git", "fetch", $remote); + } + } +} +close IN; + +exit $error; -- cgit v1.2.3 From 8b7c2f29bf316e78d49408b3ce4758cbaea4a42f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Dec 2008 13:29:30 -0500 Subject: fix comment --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 00c108616..511a0a75c 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -28,7 +28,7 @@ own [[patches|patch]]. If you list it here, the `gitremotes` script will automatically add it to git remotes. Your repo will automatically be pulled into [[Joey]]'s working tree. This is recommended. :-) -# Machine-parsed format: * wikilink + * [[github]] [browse](http://github.com/joeyh/ikiwiki/tree/master) -- cgit v1.2.3 From 3305fb9d36de3c32552da036ebc6db2611fe13fe Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Dec 2008 13:31:25 -0500 Subject: markdown fixes --- doc/git.mdwn | 10 +++++----- gitremotes | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 511a0a75c..abb25722a 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -30,13 +30,13 @@ into [[Joey]]'s working tree. This is recommended. :-) -* [[github]] +* github `git://github.com/joeyh/ikiwiki.git` [browse](http://github.com/joeyh/ikiwiki/tree/master) A mirror of the main repo, automatically updated. -* [[smcv]] -* [[intrigeri]] -* [[gmcmanus]] -* [[jelmer]] +* [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git` +* [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git` +* [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git` +* [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git` ## branches diff --git a/gitremotes b/gitremotes index b14490924..7b9484dd1 100755 --- a/gitremotes +++ b/gitremotes @@ -6,7 +6,7 @@ my $error=0; open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!"; while () { - if (/^\*\s+\[\[(\w+)\]\]\s+<([^>]+)>/) { + if (/^\*\s+\[?\[?(\w+)\]?\]?\s+`([^>]+)`/) { # note that the remote name has to be a simple word (\w) # for security/sanity reasons my $remote=$1; -- cgit v1.2.3 From a6a85fa4446e1bdac6220ab40226ca34c13e5381 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Dec 2008 13:32:42 -0500 Subject: formatting --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index abb25722a..e9c2e040f 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -31,7 +31,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * github `git://github.com/joeyh/ikiwiki.git` - [browse](http://github.com/joeyh/ikiwiki/tree/master) + ([browse](http://github.com/joeyh/ikiwiki/tree/master)) A mirror of the main repo, automatically updated. * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git` * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git` -- cgit v1.2.3 From 1473fb0b4fe89eeaf3740c4c6c97338d542b3d97 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Feb 2009 22:16:51 -0500 Subject: add hendy's git repo --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index e9c2e040f..8a89546cf 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -37,6 +37,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git` * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git` * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git` +* [[hendry]] `git://webconverger.org/git/ikiwiki` ## branches -- cgit v1.2.3