Expand file-id in diffurl in the bzr backend.
parent
ab414bc56c
commit
246e93a300
|
@ -95,7 +95,8 @@ sub rcs_recentchanges ($) { #{{{
|
||||||
eval q{use CGI 'escapeHTML'};
|
eval q{use CGI 'escapeHTML'};
|
||||||
error($@) if $@;
|
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 |");
|
open (my $out, "@cmdline |");
|
||||||
|
|
||||||
eval q{use Date::Parse};
|
eval q{use Date::Parse};
|
||||||
|
@ -111,12 +112,14 @@ sub rcs_recentchanges ($) { #{{{
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach my $file (split(/\n/, $info->{files})) {
|
foreach my $file (split(/\n/, $info->{files})) {
|
||||||
|
my ($filename, $fileid) = split(/[ \t]+/, $file);
|
||||||
my $diffurl = $config{'diffurl'};
|
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;
|
$diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
|
||||||
|
|
||||||
push @pages, {
|
push @pages, {
|
||||||
page => pagename($file),
|
page => pagename($filename),
|
||||||
diffurl => $diffurl,
|
diffurl => $diffurl,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ use Test::More tests => 11;
|
||||||
BEGIN { use_ok("IkiWiki"); }
|
BEGIN { use_ok("IkiWiki"); }
|
||||||
|
|
||||||
%config=IkiWiki::defaultconfig();
|
%config=IkiWiki::defaultconfig();
|
||||||
$config{rcs} = "bazaar";
|
$config{rcs} = "bzr";
|
||||||
$config{srcdir} = "$dir/repo";
|
$config{srcdir} = "$dir/repo";
|
||||||
IkiWiki::checkconfig();
|
IkiWiki::checkconfig();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue