From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 30 Jan 2008 00:48:30 +0000 (-0500)
Subject: rename bazaar -> bzr after discussion with jelmer
X-Git-Tag: 2.30~28
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4284719464cf2ed24546e87e8b4dfb4f36d8be4c

rename bazaar -> bzr after discussion with jelmer
---

diff --git a/IkiWiki/Rcs/bazaar.pm b/IkiWiki/Rcs/bazaar.pm
deleted file mode 100644
index 528767099..000000000
--- a/IkiWiki/Rcs/bazaar.pm
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-use IkiWiki;
-use Encode;
-use open qw{:utf8 :std};
-
-package IkiWiki;
-
-sub bazaar_log ($) { #{{{
-	my $out = shift;
-	my @infos = ();
-	my $key = undef;
-
-	while (<$out>) {
-		my $line = $_;
-		my ($value);
-		if ($line =~ /^message:/) {
-			$key = "message";
-			$infos[$#infos]{$key} = "";
-		}
-		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
-			$key = "files";
-			unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; }
-		}
-		elsif (defined($key) and $line =~ /^  (.*)/) {
-			$infos[$#infos]{$key} .= $1;
-		}
-		elsif ($line eq "------------------------------------------------------------\n") {
-			$key = undef;
-			push (@infos, {});
-		}
-		else {
-			chomp $line;
-				($key, $value) = split /: +/, $line, 2;
-			$infos[$#infos]{$key} = $value;
-		} 
-	}
-	close $out;
-
-	return @infos;
-} #}}}
-
-sub rcs_update () { #{{{
-	my @cmdline = ("bzr", $config{srcdir}, "update");
-	if (system(@cmdline) != 0) {
-		warn "'@cmdline' failed: $!";
-	}
-} #}}}
-
-sub rcs_prepedit ($) { #{{{
-	return "";
-} #}}}
-
-sub rcs_commit ($$$;$$) { #{{{
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
-
-	if (defined $user) {
-		$user = possibly_foolish_untaint($user);
-	}
-	elsif (defined $ipaddr) {
-		$user = "Anonymous from ".possibly_foolish_untaint($ipaddr);
-	}
-	else {
-		$user = "Anonymous";
-	}
-
-	$message = possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
-	}
-
-	my @cmdline = ("bzr", "commit", "-m", $message, "--author", $user,
-	               $config{srcdir}."/".$file);
-	if (system(@cmdline) != 0) {
-		warn "'@cmdline' failed: $!";
-	}
-
-	return undef; # success
-} #}}}
-
-sub rcs_add ($) { # {{{
-	my ($file) = @_;
-
-	my @cmdline = ("bzr", "add", "$config{srcdir}/$file");
-	if (system(@cmdline) != 0) {
-		warn "'@cmdline' failed: $!";
-	}
-} #}}}
-
-sub rcs_recentchanges ($) { #{{{
-	my ($num) = @_;
-
-	eval q{use CGI 'escapeHTML'};
-	error($@) if $@;
-
-	my @cmdline = ("bzr", "log", "-v", "--limit", $num, $config{srcdir});
-	open (my $out, "@cmdline |");
-
-	eval q{use Date::Parse};
-	error($@) if $@;
-
-	my @ret;
-	foreach my $info (bazaar_log($out)) {
-		my @pages = ();
-		my @message = ();
-        
-		foreach my $msgline (split(/\n/, $info->{message})) {
-			push @message, { line => $msgline };
-		}
-
-		foreach my $file (split(/\n/, $info->{files})) {
-			my $diffurl = $config{'diffurl'};
-			$diffurl =~ s/\[\[file\]\]/$file/go;
-			$diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
-
-			push @pages, {
-				page => pagename($file),
-				diffurl => $diffurl,
-			};
-		}
-
-		my $user = $info->{"committer"};
-		if (defined($info->{"author"})) { $user = $info->{"author"}; }
-		$user =~ s/\s*<.*>\s*$//;
-		$user =~ s/^\s*//;
-
-		push @ret, {
-			rev        => $info->{"revno"},
-			user       => $user,
-			committype => "bazaar",
-			when       => time - str2time($info->{"timestamp"}),
-			message    => [@message],
-			pages      => [@pages],
-		};
-	}
-
-	return @ret;
-} #}}}
-
-sub rcs_getctime ($) { #{{{
-	my ($file) = @_;
-
-	# XXX filename passes through the shell here, should try to avoid
-	# that just in case
-	my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
-	open (my $out, "@cmdline |");
-
-	my @log = bazaar_log($out);
-
-	if (length @log < 1) {
-		return 0;
-	}
-
-	eval q{use Date::Parse};
-	error($@) if $@;
-	
-	my $ctime = str2time($log[0]->{"timestamp"});
-	return $ctime;
-} #}}}
-
-1
diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
new file mode 100644
index 000000000..43822fe8f
--- /dev/null
+++ b/IkiWiki/Rcs/bzr.pm
@@ -0,0 +1,163 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+use IkiWiki;
+use Encode;
+use open qw{:utf8 :std};
+
+package IkiWiki;
+
+sub bzr_log ($) { #{{{
+	my $out = shift;
+	my @infos = ();
+	my $key = undef;
+
+	while (<$out>) {
+		my $line = $_;
+		my ($value);
+		if ($line =~ /^message:/) {
+			$key = "message";
+			$infos[$#infos]{$key} = "";
+		}
+		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
+			$key = "files";
+			unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; }
+		}
+		elsif (defined($key) and $line =~ /^  (.*)/) {
+			$infos[$#infos]{$key} .= $1;
+		}
+		elsif ($line eq "------------------------------------------------------------\n") {
+			$key = undef;
+			push (@infos, {});
+		}
+		else {
+			chomp $line;
+				($key, $value) = split /: +/, $line, 2;
+			$infos[$#infos]{$key} = $value;
+		} 
+	}
+	close $out;
+
+	return @infos;
+} #}}}
+
+sub rcs_update () { #{{{
+	my @cmdline = ("bzr", $config{srcdir}, "update");
+	if (system(@cmdline) != 0) {
+		warn "'@cmdline' failed: $!";
+	}
+} #}}}
+
+sub rcs_prepedit ($) { #{{{
+	return "";
+} #}}}
+
+sub rcs_commit ($$$;$$) { #{{{
+	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+
+	if (defined $user) {
+		$user = possibly_foolish_untaint($user);
+	}
+	elsif (defined $ipaddr) {
+		$user = "Anonymous from ".possibly_foolish_untaint($ipaddr);
+	}
+	else {
+		$user = "Anonymous";
+	}
+
+	$message = possibly_foolish_untaint($message);
+	if (! length $message) {
+		$message = "no message given";
+	}
+
+	my @cmdline = ("bzr", "commit", "-m", $message, "--author", $user,
+	               $config{srcdir}."/".$file);
+	if (system(@cmdline) != 0) {
+		warn "'@cmdline' failed: $!";
+	}
+
+	return undef; # success
+} #}}}
+
+sub rcs_add ($) { # {{{
+	my ($file) = @_;
+
+	my @cmdline = ("bzr", "add", "$config{srcdir}/$file");
+	if (system(@cmdline) != 0) {
+		warn "'@cmdline' failed: $!";
+	}
+} #}}}
+
+sub rcs_recentchanges ($) { #{{{
+	my ($num) = @_;
+
+	eval q{use CGI 'escapeHTML'};
+	error($@) if $@;
+
+	my @cmdline = ("bzr", "log", "-v", "--limit", $num, $config{srcdir});
+	open (my $out, "@cmdline |");
+
+	eval q{use Date::Parse};
+	error($@) if $@;
+
+	my @ret;
+	foreach my $info (bzr_log($out)) {
+		my @pages = ();
+		my @message = ();
+        
+		foreach my $msgline (split(/\n/, $info->{message})) {
+			push @message, { line => $msgline };
+		}
+
+		foreach my $file (split(/\n/, $info->{files})) {
+			my $diffurl = $config{'diffurl'};
+			$diffurl =~ s/\[\[file\]\]/$file/go;
+			$diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
+
+			push @pages, {
+				page => pagename($file),
+				diffurl => $diffurl,
+			};
+		}
+
+		my $user = $info->{"committer"};
+		if (defined($info->{"author"})) { $user = $info->{"author"}; }
+		$user =~ s/\s*<.*>\s*$//;
+		$user =~ s/^\s*//;
+
+		push @ret, {
+			rev        => $info->{"revno"},
+			user       => $user,
+			committype => "bzr",
+			when       => time - str2time($info->{"timestamp"}),
+			message    => [@message],
+			pages      => [@pages],
+		};
+	}
+
+	return @ret;
+} #}}}
+
+sub rcs_getctime ($) { #{{{
+	my ($file) = @_;
+
+	# XXX filename passes through the shell here, should try to avoid
+	# that just in case
+	my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
+	open (my $out, "@cmdline |");
+
+	my @log = bzr_log($out);
+
+	if (length @log < 1) {
+		return 0;
+	}
+
+	eval q{use Date::Parse};
+	error($@) if $@;
+	
+	my $ctime = str2time($log[0]->{"timestamp"});
+	return $ctime;
+} #}}}
+
+1