# file diff_po.pl
# script to compare changes between translation files before merging them
#
+# Examples of usage:
+# ./diff_po.pl cs.po.old cs.po
+# svn diff -r38367 --diff-cmd ./diff_po.pl cs.po
+# git difftool --extcmd=./diff_po.pl sk.po
+# ./diff_po.pl -r HEAD~100 cs.po #fetch git revision and compare
+# ./diff_po.pl -r39229 cs.po #fetch svn revision and compare
+#
# This file is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public
# License as published by the Free Software Foundation; either
# License along with this software; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# author: Kornel Benko, kornel@lyx.org
+# Copyright (c) 2010-2013 Kornel Benko, kornel@lyx.org
#
-# TODO: Search for good correlations of deleted and inserted string
-# using Text::Levenshtein or Algorithm::Diff
+# TODO:
+# 1.) Check for ".git" or ".svn" to decide about revisioning
+# 2.) Search for good correlations of deleted <==> inserted string
+# using Text::Levenshtein or Algorithm::Diff
+
+BEGIN {
+ use File::Spec;
+ my $p = File::Spec->rel2abs( __FILE__ );
+ $p =~ s/[\/\\]?diff_po\.pl$//;
+ unshift(@INC, "$p");
+}
use strict;
-use Term::ANSIColor;
+use parsePoLine;
+use Term::ANSIColor qw(:constants);
+use File::Temp;
my ($status, $foundline, $msgid, $msgstr, $fuzzy);
my %Untranslated = (); # inside new po-file
my %Fuzzy = (); # inside new po-file
my $result = 0; # exit value
+my $printlines = 1;
my @names = ();
-#
-while(defined($ARGV[0])) {
- last if ($ARGV[0] !~ /^\-/);
- my $param = shift(@ARGV);
- if ($param eq "-L") {
- my $name = shift(@ARGV);
- push(@names, $name);
+# Check first, if called as standalone program for git
+if ($ARGV[0] =~ /^-r(.*)/) {
+ my $rev = $1;
+ shift(@ARGV);
+ if ($rev eq "") {
+ $rev = shift(@ARGV);
+ }
+ for my $argf (@ARGV) {
+ my $baseargf;
+ my $filedir;
+ if ($argf =~ /^(.*)\/([^\/]+)$/) {
+ $baseargf = $2;
+ $filedir = $1;
+ }
+ else {
+ $baseargf = $argf;
+ $filedir = ".";
+ }
+ if (-d "$filedir/../.git") {
+ my @args = ();
+ my $tmpfile = File::Temp->new();
+ push(@args, "-L", $argf . " (" . $rev . ")");
+ push(@args, "-L", $argf . " (local copy)");
+ open(FI, "git show $rev:po/$baseargf|");
+ $tmpfile->unlink_on_destroy( 1 );
+ while(my $l = <FI>) {
+ print $tmpfile $l;
+ }
+ close(FI);
+ $tmpfile->seek( 0, SEEK_END ); # Flush()
+ push(@args, $tmpfile->filename, $argf);
+ print "===================================================================\n";
+ &diff_po(@args);
+ }
+ elsif (-d "$filedir/.svn") {
+ # call it again indirectly
+ my @cmd = ("svn", "diff", "-r$rev", "--diff-cmd", $0, $argf);
+ print "cmd = " . join(' ', @cmd) . "\n";
+ system(@cmd);
+ }
}
}
-if (! defined($names[0])) {
- push(@names, "original");
-}
-if (! defined($names[1])) {
- push(@names, "new");
-}
-
-if (@ARGV != 2) {
- die('"', join('" "', @names, @ARGV) . "\" Expected exactly 2 parameters");
+else {
+ &diff_po(@ARGV);
}
-&check($names[0], $ARGV[0]);
-&check($names[1], $ARGV[1]);
-
-&parse_po_file($ARGV[0], \%Messages);
-&parse_po_file($ARGV[1], \%newMessages);
-
-my @MsgKeys = &getLineSortedKeys(\%newMessages);
+exit($result);
+#########################################################
-print "<<< \"$names[0]\"\n";
-print ">>> \"$names[1]\"\n";
-for my $k (@MsgKeys) {
- if ($newMessages{$k}->{msgstr} eq "") {
- # this is still untranslated string
- $Untranslated{$newMessages{$k}->{line}} = $k;
+sub diff_po($$)
+{
+ my @args = @_;
+ %Messages = ();
+ %newMessages = ();
+ %Untranslated = ();
+ %Fuzzy = ();
+ @names = ();
+ while(defined($args[0])) {
+ last if ($args[0] !~ /^\-/);
+ my $param = shift(@args);
+ if ($param eq "-L") {
+ my $name = shift(@args);
+ push(@names, $name);
+ }
}
- elsif ($newMessages{$k}->{fuzzy}) {
- #fuzzy string
- $Fuzzy{$newMessages{$k}->{line}} = $k;
+ if (! defined($names[0])) {
+ push(@names, "original");
}
- if (exists($Messages{$k})) {
- &printIfDiff($k, $Messages{$k}, $newMessages{$k});
- delete($Messages{$k});
- delete($newMessages{$k});
+ if (! defined($names[1])) {
+ push(@names, "new");
}
-}
-@MsgKeys = &getLineSortedKeys(\%Messages);
-for my $k (@MsgKeys) {
- $result |= 8;
- print "deleted message\n";
- print "< line = " . $Messages{$k}->{line} . "\n";
- print color 'red';
- print "< fuzzy = " . $Messages{$k}->{fuzzy} . "\n";
- print "< msgid = \"$k\"\n";
- print "< msgstr = \"" . $Messages{$k}->{msgstr} . "\"\n";
- print color 'reset';
-}
+ if (@args != 2) {
+ die("names = \"", join('" "', @names) . "\"... args = \"" . join('" "', @args) . "\" Expected exactly 2 parameters");
+ }
-@MsgKeys = &getLineSortedKeys(\%newMessages);
-for my $k (@MsgKeys) {
- $result |= 16;
- print "new message\n";
- print "> line = " . $newMessages{$k}->{line} . "\n";
- print color 'green';
- print "> fuzzy = " . $newMessages{$k}->{fuzzy} . "\n";
- print "> msgid = \"$k\"\n";
- print "> msgstr = \"" . $newMessages{$k}->{msgstr} . "\"\n";
- print color 'reset';
-}
+ &check($names[0], $args[0]);
+ &check($names[1], $args[1]);
-&printExtraMessages("fuzzy", \%Fuzzy);
-&printExtraMessages("untranslated", \%Untranslated);
+ &parse_po_file($args[0], \%Messages);
+ &parse_po_file($args[1], \%newMessages);
-exit($result);
+ my @MsgKeys = &getLineSortedKeys(\%newMessages);
+
+ print RED "<<< \"$names[0]\"\n", RESET;
+ print GREEN ">>> \"$names[1]\"\n", RESET;
+ for my $k (@MsgKeys) {
+ if ($newMessages{$k}->{msgstr} eq "") {
+ # this is still untranslated string
+ $Untranslated{$newMessages{$k}->{line}} = $k;
+ }
+ elsif ($newMessages{$k}->{fuzzy}) {
+ #fuzzy string
+ $Fuzzy{$newMessages{$k}->{line}} = $k;
+ }
+ if (exists($Messages{$k})) {
+ &printIfDiff($k, $Messages{$k}, $newMessages{$k});
+ delete($Messages{$k});
+ delete($newMessages{$k});
+ }
+ }
+
+ if (0) {
+ @MsgKeys = sort keys %Messages, keys %newMessages;
+ for my $k (@MsgKeys) {
+ if (defined($Messages{$k})) {
+ $result |= 8;
+ print "deleted message\n";
+ print "< line = " . $Messages{$k}->{line} . "\n" if ($printlines);
+ print RED "< fuzzy = " . $Messages{$k}->{fuzzy} . "\n", RESET;
+ print RED "< msgid = \"$k\"\n", RESET;
+ print RED "< msgstr = \"" . $Messages{$k}->{msgstr} . "\"\n", RESET;
+ }
+ if (defined($newMessages{$k})) {
+ $result |= 16;
+ print "new message\n";
+ print "> line = " . $newMessages{$k}->{line} . "\n" if ($printlines);
+ print GREEN "> fuzzy = " . $newMessages{$k}->{fuzzy} . "\n", RESET;
+ print GREEN "> msgid = \"$k\"\n", RESET;
+ print GREEN "> msgstr = \"" . $newMessages{$k}->{msgstr} . "\"\n", RESET;
+ }
+ }
+ }
+ else {
+ @MsgKeys = &getLineSortedKeys(\%Messages);
+ for my $k (@MsgKeys) {
+ $result |= 8;
+ print "deleted message\n";
+ print "< line = " . $Messages{$k}->{line} . "\n" if ($printlines);
+ print RED "< fuzzy = " . $Messages{$k}->{fuzzy} . "\n", RESET;
+ print RED "< msgid = \"$k\"\n", RESET;
+ print RED "< msgstr = \"" . $Messages{$k}->{msgstr} . "\"\n", RESET;
+ }
+
+ @MsgKeys = &getLineSortedKeys(\%newMessages);
+ for my $k (@MsgKeys) {
+ $result |= 16;
+ print "new message\n";
+ print "> line = " . $newMessages{$k}->{line} . "\n" if ($printlines);
+ print GREEN "> fuzzy = " . $newMessages{$k}->{fuzzy} . "\n", RESET;
+ print GREEN "> msgid = \"$k\"\n", RESET;
+ print GREEN "> msgstr = \"" . $newMessages{$k}->{msgstr} . "\"\n", RESET;
+ }
+ }
+ &printExtraMessages("fuzzy", \%Fuzzy);
+ &printExtraMessages("untranslated", \%Untranslated);
+}
sub check($$)
{
sub printDiff($$$$)
{
my ($k, $nk, $rM, $rnM) = @_;
- print "diffline = " . $rM->{line} . "," . $rnM->{line} . "\n";
- print " msgid = \"$k\"\n";
+ print "diffline = " . $rM->{line} . "," . $rnM->{line} . "\n" if ($printlines);
+ print " msgid = \"$k\"\n";
if ($rM->{fuzzy} eq $rnM->{fuzzy}) {
- print " fuzzy = " . $rM->{fuzzy} . "\n";
+ print " fuzzy = " . $rM->{fuzzy} . "\n" if ($printlines);
}
else {
- print color 'red';
- print "< fuzzy = " . $rM->{fuzzy} . "\n";
- print color 'reset';
+ print RED "< fuzzy = " . $rM->{fuzzy} . "\n", RESET;
}
- print color 'red';
- print "< msgstr = " . $rM->{msgstr} . "\n";
- print color 'green';
+ print RED "< msgstr = " . $rM->{msgstr} . "\n", RESET;
if ($k ne $nk) {
- print "> msgid = \"$nk\"\n";
+ print GREEN "> msgid = \"$nk\"\n", RESET;
}
if ($rM->{fuzzy} ne $rnM->{fuzzy}) {
- print "> fuzzy = " . $rnM->{fuzzy} . "\n";
+ print GREEN "> fuzzy = " . $rnM->{fuzzy} . "\n", RESET;
}
- print "> msgstr = " . $rnM->{msgstr} . "\n";
+ print GREEN "> msgstr = " . $rnM->{msgstr} . "\n", RESET;
print "\n";
- print color 'reset';
}
sub printIfDiff($$$)
}
}
-sub parse_po_file($$)
-{
- my ($file, $rMessages) = @_;
- if (open(FI, '<', $file)) {
- $status = "normal";
- $fuzzy = 0;
- my $lineno = 0;
- while (my $line = <FI>) {
- $lineno++;
- &parse_po_line($line, $lineno, $rMessages);
- }
- &parse_po_line("", $lineno + 1, $rMessages);
- close(FI);
- }
-}
-
-sub parse_po_line($$$)
-{
- my ($line, $lineno, $rMessages) = @_;
- chomp($line);
-
- if ($status eq "normal") {
- if ($line =~ /^#, fuzzy/) {
- $fuzzy = 1;
- }
- elsif ($line =~ s/^msgid\s+//) {
- $foundline = $lineno;
- $status = "msgid";
- $msgid = "";
- &parse_po_line($line);
- }
- }
- elsif ($status eq "msgid") {
- if ($line =~ /^\s*"(.*)"\s*/) {
- $msgid .= $1;
- }
- elsif ($line =~ s/^msgstr\s+//) {
- $status = "msgstr";
- $msgstr = "";
- &parse_po_line($line);
- }
- }
- elsif ($status eq "msgstr") {
- if ($line =~ /^\s*"(.*)"\s*/) {
- $msgstr .= $1;
- }
- else {
- if ($msgid ne "") {
- $rMessages->{$msgid}->{line} = $foundline;
- $rMessages->{$msgid}->{fuzzy} = $fuzzy;
- $rMessages->{$msgid}->{msgstr} = $msgstr;
- }
- $fuzzy = 0;
- $status = "normal";
- }
- }
- else {
- die("invalid status");
- }
-}
-
-sub getLineSortedKeys($)
-{
- my ($rMessages) = @_;
-
- return sort {$rMessages->{$a}->{line} <=> $rMessages->{$b}->{line};} keys %{$rMessages};
-}
-
sub printExtraMessages($$)
{
my ($type, $rExtra) = @_;
projects / lyx.git / blobdiff