aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Rcs/bzr.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-30 02:29:28 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-30 02:29:28 +0100
commit246e93a300f81d67f5e6339e77cd533b815da9e9 (patch)
treec72ef5ae893c90a0805cd5a35db482dd3147f012 /IkiWiki/Rcs/bzr.pm
parentab414bc56c1ad2620a48902ad6bca1cf3ba11611 (diff)
downloadikiwiki-246e93a300f81d67f5e6339e77cd533b815da9e9.tar
ikiwiki-246e93a300f81d67f5e6339e77cd533b815da9e9.tar.gz
Expand file-id in diffurl in the bzr backend.
Diffstat (limited to 'IkiWiki/Rcs/bzr.pm')
-rw-r--r--IkiWiki/Rcs/bzr.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
index 43822fe8f..a04bfe1cb 100644
--- a/IkiWiki/Rcs/bzr.pm
+++ b/IkiWiki/Rcs/bzr.pm
@@ -95,7 +95,8 @@ sub rcs_recentchanges ($) { #{{{
eval q{use CGI 'escapeHTML'};
error($@) if $@;
- my @cmdline = ("bzr", "log", "-v", "--limit", $num, $config{srcdir});
+ my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num,
+ $config{srcdir});
open (my $out, "@cmdline |");
eval q{use Date::Parse};
@@ -111,12 +112,14 @@ sub rcs_recentchanges ($) { #{{{
}
foreach my $file (split(/\n/, $info->{files})) {
+ my ($filename, $fileid) = split(/[ \t]+/, $file);
my $diffurl = $config{'diffurl'};
- $diffurl =~ s/\[\[file\]\]/$file/go;
+ $diffurl =~ s/\[\[file\]\]/$filename/go;
+ $diffurl =~ s/\[\[file-id\]\]/$fileid/go;
$diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
push @pages, {
- page => pagename($file),
+ page => pagename($filename),
diffurl => $diffurl,
};
}