X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Fdiff_po.pl;h=857b96aae2652b6a63d670cd66e1cc19f1407619;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=a7967bc7143f4e0a7731f377b9f12538e4ef91b2;hpb=3201f7a96346dcb2357b4ee2a3056ee28f3681dd;p=lyx.git

diff --git a/po/diff_po.pl b/po/diff_po.pl
index a7967bc714..857b96aae2 100755
--- a/po/diff_po.pl
+++ b/po/diff_po.pl
@@ -3,6 +3,13 @@
 # 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
@@ -17,13 +24,16 @@
 # 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) 1010-2011 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
 
 use strict;
 use Term::ANSIColor qw(:constants);
+use File::Temp;
 
 my ($status, $foundline, $msgid, $msgstr, $fuzzy);
 
@@ -35,76 +45,152 @@ my $result = 0;                 # exit value
 my $printlines = 0;
 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);
+      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");
+else {
+  &diff_po(@ARGV);
 }
 
-if (@ARGV != 2) {
-  die('"', join('" "', @names, @ARGV) . "\" Expected exactly 2 parameters");
-}
-
-&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 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;
+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" 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 (@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" if ($printlines);
-  print GREEN "> fuzzy = " . $newMessages{$k}->{fuzzy} . "\n", RESET;
-  print GREEN "> msgid = \"$k\"\n", RESET;
-  print GREEN "> msgstr = \"" . $newMessages{$k}->{msgstr} . "\"\n", 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 (1) {
+    @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($$)
 {