diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-09-01 23:32:36 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-09-01 23:32:36 +0000 |
commit | 531e60835aa20dcc0ed4b48fdc571c8724af85ca (patch) | |
tree | 72a7c93ee19237252e991aca606486a2af58cdab | |
parent | a1a6b2057a991995c5859ea2895c069b3529c649 (diff) | |
download | ikiwiki-531e60835aa20dcc0ed4b48fdc571c8724af85ca.tar ikiwiki-531e60835aa20dcc0ed4b48fdc571c8724af85ca.tar.gz |
web commit by http://subvert.org.uk/~bma/: Add my bzr.pm code to the patch queue.
-rw-r--r-- | doc/todo/bzr.mdwn | 167 |
1 files changed, 167 insertions, 0 deletions
diff --git a/doc/todo/bzr.mdwn b/doc/todo/bzr.mdwn new file mode 100644 index 000000000..46f2ecdc0 --- /dev/null +++ b/doc/todo/bzr.mdwn @@ -0,0 +1,167 @@ +This is mostly based on the Mercurial plugin (in fact, apart from the commands +being run, only the name of the rcs was changed in rcs_recentchanges, and +rcs_commit was only changed to work around bzr's lack of a switch to set the +username). bzr_log could probably be written better by someone better at perl, +and rcs_getctime and rcs_notify aren't written at all. --[[bma]] + + #!/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 @lines = <$out>; + + my @entries = split(/\n-+\s/,join("", @lines)); + + my @ret = (); + + foreach my $entry (@entries) { + + my ($initial,$i) = split(/message:/,$entry,2); + my ($message, $j, $files) = split(/(added|modified|removed):/,$i,3); + $message =~ s/\n/\\n/g; + $files =~ s/\n//g; + $entry = $initial . "\ndescription: " . $message . "\nfiles: " . $files; + + my @lines = split(/\n/,$entry); + shift(@lines); + + my %entry; + foreach (@lines) { + my ($key,$value) = split(/: /); + $entry{$key} = $value; + } + $entry{description}=~s/\\n/\n/g; + $entry{files}=~s/\s\s+/\ /g; + $entry{files}=~s/^\s+//g; + + $ret[@ret] = { + "description" => $entry{description}, + "user" => $entry{committer}, + "files" => $entry{files}, + "date" => $entry{timestamp}, + } + } + + return @ret; + } + + sub rcs_update () { #{{{ + # Not needed. + } #}}} + + 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 $olduser = `bzr whoami`; + chomp $olduser; + system("bzr","whoami",$user); # This will set the branch username; there doesn't seem to be a way to do it on a per-commit basis. + # Save the old one and restore after the commit. + my @cmdline = ("bzr", "commit", "-m", $message, $config{srcdir}."/".$file); + if (system(@cmdline) != 0) { + warn "'@cmdline' failed: $!"; + } + + $olduser=possibly_foolish_untaint($olduser); + system("bzr","whoami",$olduser); + + return undef; # success + } #}}} + + sub rcs_add ($) { # {{{ + my ($file) = @_; + + my @cmdline = ("bzr", "add", "--quiet", "$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", "--long", "--verbose", "--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->{description})) { + push @message, { line => $msgline }; + } + + foreach my $file (split / /,$info->{files}) { + my $diffurl = $config{'diffurl'}; + $diffurl =~ s/\[\[file\]\]/$file/go; + $diffurl =~ s/\[\[r2\]\]/$info->{changeset}/go; + + push @pages, { + page => pagename($file), + diffurl => $diffurl, + }; + } + + my $user = $info->{"user"}; + $user =~ s/\s*<.*>\s*$//; + $user =~ s/^\s*//; + + push @ret, { + rev => $info->{"changeset"}, + user => $user, + committype => "bzr", + when => time - str2time($info->{"date"}), + message => [@message], + pages => [@pages], + }; + } + + return @ret; + } #}}} + + sub rcs_notify () { #{{{ + # TODO + } #}}} + + sub rcs_getctime ($) { #{{{ + # TODO + } #}}} + + 1 + + +[[patch]] |