urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'jelmer/master'

master
Joey Hess 2008-07-25 15:15:39 -04:00
parent ef1f4defed 3575798564
commit 11872cecfc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IkiWiki/Rcs/bzr.pm
View File

@ -25,7 +25,7 @@ sub bzr_log ($) { #{{{
unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; } unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; }
} }
elsif (defined($key) and $line =~ /^ (.*)/) { elsif (defined($key) and $line =~ /^ (.*)/) {
$infos[$#infos]{$key} .= $1; $infos[$#infos]{$key} .= "$1\n";
} }
elsif ($line eq "------------------------------------------------------------\n") { elsif ($line eq "------------------------------------------------------------\n") {
$key = undef; $key = undef;
@ -128,6 +128,11 @@ sub rcs_remove ($) { # {{{
sub rcs_rename ($$) { # {{{ sub rcs_rename ($$) { # {{{
my ($src, $dest) = @_; my ($src, $dest) = @_;
my $parent = dirname($dest);
if (system("bzr", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
warn("bzr add $parent failed\n");
}
my @cmdline = ("bzr", "mv", "--quiet", "$config{srcdir}/$src", "$config{srcdir}/$dest"); my @cmdline = ("bzr", "mv", "--quiet", "$config{srcdir}/$src", "$config{srcdir}/$dest");
if (system(@cmdline) != 0) { if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!"; warn "'@cmdline' failed: $!";
@ -154,7 +159,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 ($filename, $fileid) = ($file =~ /^(.*?) +([^ ]+)$/);
# Skip directories
next if ($filename =~ /\/$/);
# Skip source name in renames
$filename =~ s/^.* => //;
my $diffurl = $config{'diffurl'}; my $diffurl = $config{'diffurl'};
$diffurl =~ s/\[\[file\]\]/$filename/go; $diffurl =~ s/\[\[file\]\]/$filename/go;
$diffurl =~ s/\[\[file-id\]\]/$fileid/go; $diffurl =~ s/\[\[file-id\]\]/$fileid/go;