maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

made the diff output nicer: full items shown, separated by lines 

git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@108 15ad00c4-1369-45f4-8270-35d70d36bdcd
This commit is contained in:
Patrick Ohly 2006-05-27 15:57:00 +00:00
parent 8af8e8a91a
commit d0fc457548
2 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README
View File

@ -130,7 +130,7 @@ preserved for each synchronization run. Details about that is found
in the "Automatic Backups and Logging" section below. Immediately
before quitting SyncEvolution will show all errors or warnings
encountered and print a summary of how the databases were modified.
This is done with the "normalize_vcard" utility script described
This is done with the "synccompare" utility script described
in the "Exchanging Data" section.
In case of an error the synchronization run is aborted prematurely and
@ -356,22 +356,20 @@ This copies all contacts into the server and from there into the new
address book. Now one can either compare the address books in
Evolution or do that automatically:
- save the complete address books: mark all entries, save as vCard
- normalize the files with the provided Perl script:
synccompare list1.vcf >list1.normal.vcf
synccompare list2.vcf >list2.normal.vcf
- compare the normalized lists, e.g.:
diff -c list1.normal.vcf list2.normal.vcf
Alternatively, one can invoke synccompare with two file names
as arguments and it will normalize and compare them automatically
with diff in the side-by-side mode:
synccompare list1.vcf list2.vcf
- invoke synccompare with two file names as arguments and it will
normalize and compare them automatically
Normalizing is necessary because the order of cards and their
properties as well as other minor formatting aspects may be
different. The automatic unit testing (see HACKING) also contains
a "testItems" test which verifies the copying of special
entries.
different. The output comes from a "diff --side-by-side", but
is augmented by the script so that the context of each change
is always the complete item that was modified. Lines or items
following a ">" on the right side were added, those on the
left side followed by a "<" were removed, and those with
a "!" between text on the left and right side were modified.
The automatic unit testing (see HACKING) contains a "testItems"
test which verifies the copying of special entries.
Modifying either address book and synchronizing back and forth
can be used to verify that SyncEvolution works as expected. If

47
src/normalize_vcard.pl
View File

@ -80,7 +80,7 @@ sub Normalize {
$i++;
}
my $thiswidth = $width - length($spaces);
my $thiswidth = $width + 1 - length($spaces);
$thiswidth = 1 if $thiswidth <= 0;
s/(.{$thiswidth})(?!$)/$1\n /g;
s/^(.*)$/$spaces$1/mg;
@ -152,31 +152,34 @@ if($#ARGV > 1) {
$_ = `diff --expand-tabs --side-by-side --width $columns "$normal1" "$normal2"`;
my $res = $?;
# fix confusing output like:
# BEGIN:VCARD BEGIN:VCARD
# > N:new;entry
# > FN:new
# > END:VCARD
# >
# > BEGIN:VCARD
# and replace it with:
# > BEGIN:VCARD
# > N:new;entry
# > FN:new
# > END:VCARD
#
# BEGIN:VCARD BEGIN:VCARD
if ($res) {
# fix confusing output like:
# BEGIN:VCARD BEGIN:VCARD
# > N:new;entry
# > FN:new
# > END:VCARD
# >
# > BEGIN:VCARD
# and replace it with:
# > BEGIN:VCARD
# > N:new;entry
# > FN:new
# > END:VCARD
#
# BEGIN:VCARD BEGIN:VCARD
s/(BEGIN:(VCARD|VCALENDAR) +BEGIN:\2\n)((?: {$singlewidth} > .*\n)+)( {$singlewidth}) >\n {$singlewidth} > BEGIN:\2\n/$4 > BEGIN:$2\n$3\n$1/mg;
s/(BEGIN:(VCARD|VCALENDAR) +BEGIN:\2\n)((?: {$singlewidth} > .*\n)+)( {$singlewidth}) >\n {$singlewidth} > BEGIN:\2\n/$4 > BEGIN:$2\n$3\n$1/mg;
# same for the other way around, note that we must insert variable padding
s/(BEGIN:(VCARD|VCALENDAR) +BEGIN:\2\n)((?:.{$singlewidth} <\n)+)( {$singlewidth}) <\nBEGIN:\2 *<\n/"BEGIN:$2" . (" " x ($singlewidth - length("BEGIN:$2"))) . " <\n$3\n$1"/mge;
# same for the other way around, note that we must insert variable padding
s/(BEGIN:(VCARD|VCALENDAR) +BEGIN:\2)\n((?:.{$singlewidth} <\n)+)( {$singlewidth}) <\nBEGIN:\2 *<\n/"BEGIN:$2" . (" " x ($singlewidth - length("BEGIN:$2"))) . " <\n$3\n$1"/mge;
# assume that blank lines separate chunks
my @chunks = split /\n\n/, $_;
# assume that blank lines separate chunks
my @chunks = split /\n\n/, $_;
# only print chunks which contain diffs
print join( "\n\n", grep(/^.{$singlewidth} [<>|]/m, @chunks));
# only print chunks which contain diffs
print join( ( "-" x $columns ) . "\n", "",
grep( /^.{$singlewidth} [<>|]/m && (s/\n*$/\n/s || 1), @chunks), "");
}
unlink($normal1);
unlink($normal2);