summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-28 21:24:15 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-28 21:24:15 -0500
commit0f95adbd1d33e267b9654c80ef2d38ca06407ecb (patch)
treec2e4888e24959951a82fed48ec6b24bc15e89e0f
parent3436fed08169893953fef6858f7645437f39d1b0 (diff)
parente30b96babacb6ac48e571105c9f0627f68cf3bca (diff)
Merge branch 'master' into recentchanges
-rw-r--r--IkiWiki/Rcs/Stub.pm2
-rw-r--r--IkiWiki/Rcs/git.pm2
-rw-r--r--IkiWiki/Rcs/mercurial.pm2
-rw-r--r--IkiWiki/Rcs/monotone.pm2
-rw-r--r--IkiWiki/Rcs/svn.pm2
-rw-r--r--IkiWiki/Rcs/tla.pm2
6 files changed, 6 insertions, 6 deletions
diff --git a/IkiWiki/Rcs/Stub.pm b/IkiWiki/Rcs/Stub.pm
index a979ce3fe..ab80a9a47 100644
--- a/IkiWiki/Rcs/Stub.pm
+++ b/IkiWiki/Rcs/Stub.pm
@@ -37,7 +37,7 @@ sub rcs_recentchanges ($) {
# Examine the RCS history and generate a list of recent changes.
# The data structure returned for each change is:
# {
- # id => # the RCSs id for this commit
+ # rev => # the RCSs id for this commit
# user => # name of user who made the change,
# committype => # either "web" or the name of the rcs,
# when => # time when the change was made,
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 9640acfbe..80ffdced2 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -407,7 +407,7 @@ sub rcs_recentchanges ($) { #{{{
}
push @rets, {
- id => $sha1,
+ rev => $sha1,
user => $user,
committype => $type,
when => $when,
diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index e5258b111..15edb3245 100644
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -139,7 +139,7 @@ sub rcs_recentchanges ($) { #{{{
$user =~ s/^\s*//;
push @ret, {
- id => $info->{"changeset"},
+ rev => $info->{"changeset"},
user => $user,
committype => "mercurial",
when => time - str2time($info->{"date"}),
diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index e0f2e046a..5717e0043 100644
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -438,7 +438,7 @@ sub rcs_recentchanges ($) { #{{{
}
push @ret, {
- id => $rev,
+ rev => $rev,
user => $user,
committype => $committype,
when => $when,
diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index a32b0a840..002527bdd 100644
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -204,7 +204,7 @@ sub rcs_recentchanges ($) { #{{{
} if length $file;
}
push @ret, {
- id => $rev,
+ rev => $rev,
user => $user,
committype => $committype,
when => $when,
diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 5275500c3..ffb6ee521 100644
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -146,7 +146,7 @@ sub rcs_recentchanges ($) {
} if length $file;
}
push @ret, {
- id => $change,
+ rev => $change,
user => $user,
committype => $committype,
when => $when,