#! /usr/bin/env perl
-
+# -*- mode: perl; -*-
+#
# file diff_po.pl
# script to compare changes between translation files before merging them
#
# License along with this software; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Copyright (c) 1010-2011 Kornel Benko, kornel@lyx.org
+# Copyright (c) 2010-2013 Kornel Benko, kornel@lyx.org
#
# TODO:
-# 1.) Check for ".git" or ".svn" to decide about revisioning
-# 2.) Search for good correlations of deleted <==> inserted string
+# 1.) 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/[\/\\]?[^\/\\]+$//;
+ unshift(@INC, "$p");
+}
+
use strict;
+use parsePoLine;
use Term::ANSIColor qw(:constants);
+use File::Temp;
+use Cwd;
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 = 0;
+my $printlines = 1;
my @names = ();
-my $tmpfile = "/tmp/blax";
# Check first, if called as standalone program for git
if ($ARGV[0] =~ /^-r(.*)/) {
if ($argf =~ /^(.*)\/([^\/]+)$/) {
$baseargf = $2;
$filedir = $1;
+ chdir($filedir); # set working directory for the repo-command
}
else {
$baseargf = $argf;
$filedir = ".";
}
- if (-d "$filedir/../.git") {
+ $filedir = getcwd();
+ my ($repo, $level) = &searchRepo($filedir);
+ my $relargf = $baseargf; # argf relative to the top-most repo directory
+ my $topdir;
+ if (defined($level)) {
+ my $abspathpo = $filedir; # directory of the po-file
+ $topdir = $abspathpo;
+ #print "Level = $level, abs path = $abspathpo\n";
+ while ($level > 0) {
+ $topdir =~ s/\/([^\/]+)$//;
+ $relargf = "$1/$relargf";
+ $level--;
+ #print "Level = $level, topdir = $topdir, rel path = $relargf\n";
+ }
+ chdir($topdir);
+ }
+ else {
+ print "Could not find the repo-type\n";
+ exit(-1);
+ }
+ #check po-file
+ &check_po_file_readable($baseargf, $relargf);
+ if ($repo eq ".git") {
my @args = ();
+ my $tmpfile = File::Temp->new();
+ $rev = &getrev($repo, $rev);
push(@args, "-L", $argf . " (" . $rev . ")");
push(@args, "-L", $argf . " (local copy)");
- open(FI, "git show $rev:po/$baseargf|");
- open(FO, '>', $tmpfile);
+ print "git show $rev:$relargf\n";
+ open(FI, "git show $rev:$relargf|");
+ $tmpfile->unlink_on_destroy( 1 );
while(my $l = <FI>) {
- print FO $l;
+ print $tmpfile $l;
}
close(FI);
- close(FO);
- push(@args, $tmpfile, $argf);
+ $tmpfile->seek( 0, SEEK_END ); # Flush()
+ push(@args, $tmpfile->filename, $argf);
print "===================================================================\n";
&diff_po(@args);
}
- elsif (-d "$filedir/.svn") {
+ elsif ($repo eq ".svn") {
+ # program svnversion needed here
+ $rev = &getrev($repo, $rev);
# call it again indirectly
- my @cmd = ("svn", "diff", "-r$rev", "--diff-cmd", $0, $argf);
+ my @cmd = ("svn", "diff", "-r$rev", "--diff-cmd", $0, $relargf);
+ print "cmd = " . join(' ', @cmd) . "\n";
+ system(@cmd);
+ }
+ elsif ($repo eq ".hg") {
+ # for this to work, one has to edit ~/.hgrc
+ # Insert there
+ # [extensions]
+ # hgext.extdiff =
+ #
+ $rev = &getrev($repo, $rev);
+ my @cmd = ("hg", "extdiff", "-r", "$rev", "-p", $0, $relargf);
print "cmd = " . join(' ', @cmd) . "\n";
system(@cmd);
}
exit($result);
#########################################################
+# This routine builds n-th parent-path
+# E.g. &buildParentDir("abc", 1) --> "abc/.."
+# &buildParentDir("abc", 4) --> "abc/../../../.."
+sub buildParentDir($$)
+{
+ my ($dir, $par) = @_;
+ if ($par > 0) {
+ return &buildParentDir("$dir/..", $par-1);
+ }
+ else {
+ return $dir;
+ }
+}
+
+# Tries up to 10 parent levels to find the repo-type
+# Returns the repo-type
+sub searchRepo($)
+{
+ my ($dir) = @_;
+ for my $parent ( 0 .. 10 ) {
+ my $f = &buildParentDir($dir, $parent);
+ for my $s (".git", ".svn", ".hg") {
+ if (-d "$f/$s") {
+ #print "Found repo on level $parent\n";
+ return ($s, $parent);
+ }
+ }
+ }
+ return(""); # not found
+}
+
sub diff_po($$)
{
my @args = @_;
die("names = \"", join('" "', @names) . "\"... args = \"" . join('" "', @args) . "\" Expected exactly 2 parameters");
}
- &check($names[0], $args[0]);
- &check($names[1], $args[1]);
+ &check_po_file_readable($names[0], $args[0]);
+ &check_po_file_readable($names[1], $args[1]);
&parse_po_file($args[0], \%Messages);
&parse_po_file($args[1], \%newMessages);
}
}
- @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 (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;
+ @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);
+ &printExtraMessages("fuzzy", \%Fuzzy, \@names);
+ &printExtraMessages("untranslated", \%Untranslated, \@names);
}
-sub check($$)
+sub check_po_file_readable($$)
{
my ($spec, $filename) = @_;
}
}
+# Diff of one corresponding entry
sub printDiff($$$$)
{
my ($k, $nk, $rM, $rnM) = @_;
}
}
-sub parse_po_file($$)
+sub printExtraMessages($$$)
{
- 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);
+ my ($type, $rExtra, $rNames) = @_;
+ #print "file1 = $rNames->[0], file2 = $rNames->[1]\n";
+ my @UntranslatedKeys = sort { $a <=> $b;} keys %{$rExtra};
+
+ if (@UntranslatedKeys > 0) {
+ print "Still " . 0 + @UntranslatedKeys . " $type messages found in $rNames->[0]\n";
+ for my $l (@UntranslatedKeys) {
+ print "> line $l: \"" . $rExtra->{$l} . "\"\n";
}
- &parse_po_line("", $lineno + 1, $rMessages);
- close(FI);
}
}
-sub parse_po_line($$$)
+#
+# get repository dependent revision representation
+sub getrev($$)
{
- my ($line, $lineno, $rMessages) = @_;
- chomp($line);
+ my ($repo, $rev) = @_;
+ my $revnum;
- if ($status eq "normal") {
- if ($line =~ /^#, fuzzy/) {
- $fuzzy = 1;
- }
- elsif ($line =~ s/^msgid\s+//) {
- $foundline = $lineno;
- $status = "msgid";
- $msgid = "";
- &parse_po_line($line);
- }
+ if ($rev eq "HEAD") {
+ $revnum = 0;
}
- elsif ($status eq "msgid") {
- if ($line =~ /^\s*"(.*)"\s*/) {
- $msgid .= $1;
- }
- elsif ($line =~ s/^msgstr\s+//) {
- $status = "msgstr";
- $msgstr = "";
- &parse_po_line($line);
- }
+ else {
+ return $rev if ($rev !~ /^(-|HEAD[-~])(\d+)$/);
+ $revnum = $2;
}
- 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";
- }
+ if ($repo eq ".hg") {
+ return "-$revnum";
}
- else {
- die("invalid status");
+ elsif ($repo eq ".git") {
+ return("HEAD~$revnum");
}
-}
-
-sub getLineSortedKeys($)
-{
- my ($rMessages) = @_;
-
- return sort {$rMessages->{$a}->{line} <=> $rMessages->{$b}->{line};} keys %{$rMessages};
-}
-
-sub printExtraMessages($$)
-{
- my ($type, $rExtra) = @_;
- my @UntranslatedKeys = sort { $a <=> $b;} keys %{$rExtra};
-
- if (@UntranslatedKeys > 0) {
- print "Still " . 0 + @UntranslatedKeys . " $type messages found in $ARGV[1]\n";
- for my $l (@UntranslatedKeys) {
- print "> line $l: \"" . $rExtra->{$l} . "\"\n";
+ elsif ($repo eq ".svn") {
+ if (open(VI, "svnversion |")) {
+ while (my $r1 = <VI>) {
+ chomp($r1);
+ if ($r1 =~ /^((\d+):)?(\d+)M?$/) {
+ $rev = $3-$revnum;
+ }
+ }
+ close(VI);
}
+ return $rev;
}
+ return $rev;
}
projects / lyx.git / blobdiff