X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Fdiff_po.pl;h=f47fbb6e5fbd100886718f80ec626fffa48ff20d;hb=19a5965153825e54776ae1669f6ef58d7cdbc2a8;hp=7f4fba0c20e700ebbefcb52aa17fd8d5a87c6c4e;hpb=292577ad69a4883c0f7081f35fc605c1b4a45a4d;p=lyx.git diff --git a/po/diff_po.pl b/po/diff_po.pl index 7f4fba0c20..f47fbb6e5f 100755 --- a/po/diff_po.pl +++ b/po/diff_po.pl @@ -8,8 +8,9 @@ # ./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 -rHEAD~100 cs.po #fetch git revision and compare # ./diff_po.pl -r39229 cs.po #fetch svn revision and compare +# ./diff_po.pl -r-1 cs.po #fetch the previous change of cs.po and compare # # This file is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public @@ -30,6 +31,36 @@ # TODO: # 1.) Search for good correlations of deleted <==> inserted string # using Text::Levenshtein or Algorithm::Diff +# +# val: '0' | '1' ; +# +# fuzzyopt: '--display-fuzzy=' val ; +# +# untranslatedopt: '--display-untranslated=' val ; +# +# option: fuzzyopt +# | untranslatedopt +# ; +# options: | options option +# ; +# +# revspec: revision-tag # e.g. 46c00bab7 +# | 'HEAD' relative-rev # e.g. HEAD~3, HEAD-3 +# | '-' number # -1 == previous commit of the following po-file +# ; +# +# revision: '-r' revspec ; +# +# filespecold: revision | filespec ; +# +# filespec: # path to existing po-file +# +# filespecnew: filespec ; +# +# files: filespecold filespecnew ; +# +# diff: 'diff_po.pl' ' ' options files +# BEGIN { use File::Spec; @@ -38,6 +69,18 @@ BEGIN { unshift(@INC, "$p"); } +# Prototypes +sub get_env_name($ ); +sub buildParentDir($$); +sub searchRepo($); +sub diff_po(@); +sub check_po_file_readable($$); +sub printDiff($$$$); +sub printIfDiff($$$); +sub printExtraMessages($$$); +sub getrev($$$); +######### + use strict; use parsePoLine; use Term::ANSIColor qw(:constants); @@ -60,10 +103,37 @@ my %options = ( # Check for options my ($opt, $val); + +sub get_env_name($) +{ + my ($e) = @_; + return undef if ($e !~ s/^\-\-//); + $e = uc($e); + $e =~ s/\-/_/g; + return "DIFF_PO_" . $e; +} + +# Set option-defaults from environment +# git: not needed, diff is not recursive here +# svn: needed to pass options through --diff-cmd parameter +# hg: needed to pass options through extdiff parameter +for my $opt (keys %options) { + my $e = get_env_name($opt); + if (defined($e)) { + if (defined($ENV{$e})) { + $options{$opt} = $ENV{$e}; + } + } +} + while (($opt=$ARGV[0]) =~ s/=(\d+)$//) { $val = $1; if (defined($options{$opt})) { $options{$opt} = $val; + my $e = get_env_name($opt); + if (defined($e)) { + $ENV{$e} = $val; + } shift(@ARGV); } else { @@ -95,7 +165,7 @@ if ($ARGV[0] =~ /^-r(.*)/) { $filedir = "."; } $filedir = getcwd(); - my ($repo, $level) = &searchRepo($filedir); + my ($repo, $level) = searchRepo($filedir); my $relargf = $baseargf; # argf relative to the top-most repo directory my $topdir; if (defined($level)) { @@ -115,11 +185,11 @@ if ($ARGV[0] =~ /^-r(.*)/) { exit(-1); } #check po-file - &check_po_file_readable($baseargf, $relargf); + check_po_file_readable($baseargf, $relargf); if ($repo eq ".git") { my @args = (); my $tmpfile = File::Temp->new(); - $rev = &getrev($repo, $rev); + $rev = getrev($repo, $rev, $argf); push(@args, "-L", $argf . " (" . $rev . ")"); push(@args, "-L", $argf . " (local copy)"); print "git show $rev:$relargf\n"; @@ -132,11 +202,11 @@ if ($ARGV[0] =~ /^-r(.*)/) { $tmpfile->seek( 0, SEEK_END ); # Flush() push(@args, $tmpfile->filename, $argf); print "===================================================================\n"; - &diff_po(@args); + diff_po(@args); } elsif ($repo eq ".svn") { # program svnversion needed here - $rev = &getrev($repo, $rev); + $rev = getrev($repo, $rev, $argf); # call it again indirectly my @cmd = ("svn", "diff", "-r$rev", "--diff-cmd", $0, $relargf); print "cmd = " . join(' ', @cmd) . "\n"; @@ -148,7 +218,7 @@ if ($ARGV[0] =~ /^-r(.*)/) { # [extensions] # hgext.extdiff = # - $rev = &getrev($repo, $rev); + $rev = getrev($repo, $rev, $argf); my @cmd = ("hg", "extdiff", "-r", "$rev", "-p", $0, $relargf); print "cmd = " . join(' ', @cmd) . "\n"; system(@cmd); @@ -156,20 +226,20 @@ if ($ARGV[0] =~ /^-r(.*)/) { } } else { - &diff_po(@ARGV); + diff_po(@ARGV); } exit($result); ######################################################### # This routine builds n-th parent-path -# E.g. &buildParentDir("abc", 1) --> "abc/.." -# &buildParentDir("abc", 4) --> "abc/../../../.." +# E.g. buildParentDir("abc", 1) --> "abc/.." +# buildParentDir("abc", 4) --> "abc/../../../.." sub buildParentDir($$) { my ($dir, $par) = @_; if ($par > 0) { - return &buildParentDir("$dir/..", $par-1); + return buildParentDir("$dir/..", $par-1); } else { return $dir; @@ -182,7 +252,7 @@ sub searchRepo($) { my ($dir) = @_; for my $parent ( 0 .. 10 ) { - my $f = &buildParentDir($dir, $parent); + my $f = buildParentDir($dir, $parent); for my $s (".git", ".svn", ".hg") { if (-d "$f/$s") { #print "Found repo on level $parent\n"; @@ -193,7 +263,7 @@ sub searchRepo($) return(""); # not found } -sub diff_po($$) +sub diff_po(@) { my @args = @_; %Messages = (); @@ -201,6 +271,7 @@ sub diff_po($$) %Untranslated = (); %Fuzzy = (); @names = (); + my $switchargs = 0; while(defined($args[0])) { last if ($args[0] !~ /^\-/); my $param = shift(@args); @@ -208,6 +279,9 @@ sub diff_po($$) my $name = shift(@args); push(@names, $name); } + else { + # ignore other options + } } if (! defined($names[0])) { push(@names, "original"); @@ -220,13 +294,13 @@ sub diff_po($$) die("names = \"", join('" "', @names) . "\"... args = \"" . join('" "', @args) . "\" Expected exactly 2 parameters"); } - &check_po_file_readable($names[0], $args[0]); - &check_po_file_readable($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); + parse_po_file($args[0], %Messages); + parse_po_file($args[1], %newMessages); - my @MsgKeys = &getLineSortedKeys(\%newMessages); + my @MsgKeys = getLineSortedKeys(%newMessages); print RED "<<< \"$names[0]\"\n", RESET; print GREEN ">>> \"$names[1]\"\n", RESET; @@ -243,7 +317,7 @@ sub diff_po($$) } } if (exists($Messages{$k})) { - &printIfDiff($k, $Messages{$k}, $newMessages{$k}); + printIfDiff($k, $Messages{$k}, $newMessages{$k}); delete($Messages{$k}); delete($newMessages{$k}); } @@ -271,7 +345,7 @@ sub diff_po($$) } } else { - @MsgKeys = &getLineSortedKeys(\%Messages); + @MsgKeys = getLineSortedKeys(%Messages); for my $k (@MsgKeys) { $result |= 8; print "deleted message\n"; @@ -281,7 +355,7 @@ sub diff_po($$) print RED "< msgstr = \"" . $Messages{$k}->{msgstr} . "\"\n", RESET; } - @MsgKeys = &getLineSortedKeys(\%newMessages); + @MsgKeys = getLineSortedKeys(%newMessages); for my $k (@MsgKeys) { $result |= 16; print "new message\n"; @@ -292,10 +366,10 @@ sub diff_po($$) } } if ($options{"--display-fuzzy"}) { - &printExtraMessages("fuzzy", \%Fuzzy, \@names); + printExtraMessages("fuzzy", \%Fuzzy, \@names); } if ($options{"--display-untranslated"}) { - &printExtraMessages("untranslated", \%Untranslated, \@names); + printExtraMessages("untranslated", \%Untranslated, \@names); } } @@ -321,19 +395,19 @@ sub printDiff($$$$) print "diffline = " . $rM->{line} . "," . $rnM->{line} . "\n" if ($printlines); print " msgid = \"$k\"\n"; if ($rM->{fuzzy} eq $rnM->{fuzzy}) { - print " fuzzy = " . $rM->{fuzzy} . "\n" if ($printlines); + print " fuzzy = \"" . $rM->{fuzzy} . "\"\n" if ($printlines); } else { - print RED "< fuzzy = " . $rM->{fuzzy} . "\n", RESET; + print RED "< fuzzy = \"" . $rM->{fuzzy} . "\"\n", RESET; } - print RED "< msgstr = " . $rM->{msgstr} . "\n", RESET; + print RED "< msgstr = \"" . $rM->{msgstr} . "\"\n", RESET; if ($k ne $nk) { print GREEN "> msgid = \"$nk\"\n", RESET; } if ($rM->{fuzzy} ne $rnM->{fuzzy}) { - print GREEN "> fuzzy = " . $rnM->{fuzzy} . "\n", RESET; + print GREEN "> fuzzy = \"" . $rnM->{fuzzy} . "\"\n", RESET; } - print GREEN "> msgstr = " . $rnM->{msgstr} . "\n", RESET; + print GREEN "> msgstr = \"" . $rnM->{msgstr} . "\"\n", RESET; print "\n"; } @@ -345,7 +419,7 @@ sub printIfDiff($$$) $doprint = 1 if ($rM->{msgstr} ne $rnM->{msgstr}); if ($doprint) { $result |= 4; - &printDiff($k, $k, $rM, $rnM); + printDiff($k, $k, $rM, $rnM); } } @@ -356,7 +430,7 @@ sub printExtraMessages($$$) my @sortedExtraKeys = sort { $a <=> $b;} keys %{$rExtra}; if (@sortedExtraKeys > 0) { - print "Still " . 0 + @sortedExtraKeys . " $type messages found in $rNames->[0]\n"; + print "Still " . 0 + @sortedExtraKeys . " $type messages found in $rNames->[1]\n"; for my $l (@sortedExtraKeys) { print "> line $l: \"" . $rExtra->{$l} . "\"\n"; } @@ -365,9 +439,9 @@ sub printExtraMessages($$$) # # get repository dependent revision representation -sub getrev($$) +sub getrev($$$) { - my ($repo, $rev) = @_; + my ($repo, $rev, $argf) = @_; my $revnum; if ($rev eq "HEAD") { @@ -378,22 +452,68 @@ sub getrev($$) $revnum = $2; } if ($repo eq ".hg") { - return "-$revnum"; + # try to get the revision of n-th previous change of the po-file + if (open(FIR, "hg log '$argf'|")) { + my $count = $revnum; + my $res = "-$revnum"; + while (my $l = ) { + chomp($l); + if ($l =~ /:\s+(\d+):([^\s]+)$/) { + $res = $2; + last if ($count-- <= 0); + } + } + close(FIR); + return($res); + } + else { + return "-$revnum"; + } } elsif ($repo eq ".git") { - return("HEAD~$revnum"); + # try to get the revision of n-th previous change of the po-file + if (open(FIR, "git log --skip=$revnum -1 '$argf'|")) { + my $res = "HEAD~$revnum"; + while (my $l = ) { + chomp($l); + if ($l =~ /^commit\s+([^\s]+)$/) { + $res = $1; + last; + } + } + close(FIR); + return($res); + } + else { + return("HEAD~$revnum"); + } } elsif ($repo eq ".svn") { - if (open(VI, "svnversion |")) { - while (my $r1 = ) { - chomp($r1); - if ($r1 =~ /^((\d+):)?(\d+)M?$/) { - $rev = $3-$revnum; + if (open(FIR, "svn log '$argf'|")) { + my $count = $revnum; + my $res = $rev; + while (my $l = ) { + chomp($l); + if ($l =~ /^r(\d+)\s+\|/) { + $res = $1; + last if ($count-- <= 0); + } + } + close(FIR); + return $res; + } + else { + if (open(VI, "svnversion |")) { + while (my $r1 = ) { + chomp($r1); + if ($r1 =~ /^((\d+):)?(\d+)M?$/) { + $rev = $3-$revnum; + } } + close(VI); } - close(VI); + return $rev; } - return $rev; } return $rev; }