anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapted for use with svn also

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39234 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2011-07-02 19:05:11 +00:00
parent 70e0641e3a
commit 36c1f7e3ab
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
po/diff_po.pl
View File

@ -8,6 +8,7 @@
# 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
@ -23,10 +24,12 @@
# 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);
@ -51,19 +54,36 @@ if ($ARGV[0] =~ /^-r(.*)/) {
}
for my $argf (@ARGV) {
my $baseargf;
($baseargf = $argf) =~ s/^.*\///;
my @args = ();
push(@args, "-L", $argf . " (" . $rev . ")");
push(@args, "-L", $argf . " (local copy)");
open(FI, "git show $rev:po/$baseargf|");
open(FO, '>', $tmpfile);
while(my $l = <FI>) {
print FO $l;
my $filedir;
if ($argf =~ /^(.*)\/([^\/]+)$/) {
$baseargf = $2;
$filedir = $1;
}
else {
$baseargf = $argf;
$filedir = ".";
}
if (-d "$filedir/../.git") {
my @args = ();
push(@args, "-L", $argf . " (" . $rev . ")");
push(@args, "-L", $argf . " (local copy)");
open(FI, "git show $rev:po/$baseargf|");
open(FO, '>', $tmpfile);
while(my $l = <FI>) {
print FO $l;
}
close(FI);
close(FO);
push(@args, $tmpfile, $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);
}
close(FI);
close(FO);
push(@args, $tmpfile, $argf);
&diff_po(@args);
}
}
else {
@ -81,7 +101,6 @@ sub diff_po($$)
%Untranslated = ();
%Fuzzy = ();
@names = ();
print "========================================================\n";
while(defined($args[0])) {
last if ($args[0] !~ /^\-/);
my $param = shift(@args);