From Code to Community: Sponsoring The Perl and Raku Conference 2025 Learn more

PERLANCAR / App-DiffDocText-0.004 / script / diff-doc-text-between-conflicted-git-versions 

            

              
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
—
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151

              
#!perl
use 5.010001;
use strict;
use warnings;
use Log::ger;
#use Log::ger::Screen;
use CLI::MetaUtil::Getopt::Long qw(GetOptionsCLIWrapper);
use File::Temp qw(tempdir);
use IPC::System::Options 'system', -log=>1, -die=>1;
our $AUTHORITY = 'cpan:PERLANCAR'; # AUTHORITY
our $DATE = '2022-09-08'; # DATE
our $DIST = 'App-DiffDocText'; # DIST
our $VERSION = '0.004'; # VERSION
my $tempdir;
my $filename;
my $prog = "diff-doc-text-between-conflicted-git-versions";
my ($path_ours, $path_theirs);
GetOptionsCLIWrapper(
    cli => 'diff',
    add_opts => {
        '<>' => sub {
            die "Please specify only one filename" if defined $filename;
            $filename = $_[0];
            (my $basename = $filename) =~ s!.+/!!;
            my ($content_ours, $content_theirs);
            system(
                {capture_stdout => \$content_ours},
                "git", "show", ":2:$filename",
            );
            system(
                {capture_stdout => \$content_theirs},
                "git", "show", ":3:$filename",
            );
            $tempdir = File::Temp::tempdir(CLEANUP => !$ENV{DEBUG});
            $path_ours = "$tempdir/ours.$basename";
            open my $fh_ours  , ">", $path_ours
                or die "$prog: Can't write ours: $!";
            print $fh_ours $content_ours;
            close $fh_ours
                or die "$prog: Can't write ours: $!";
            $path_theirs = "$tempdir/theirs.$basename";
            open my $fh_theirs, ">", $path_theirs
                or die "$prog: Can't write theirs: $!";
            print $fh_theirs $content_theirs;
            close $fh_theirs
                or die "$prog: Can't write theirs: $!";
        },
    },
);
die "Please specify file" unless defined $path_ours;
system(
    "diff-doc-text", @ARGV, $path_ours, $path_theirs,
);
# ABSTRACT: Diff the text of Office word-processor document (.doc, .docx, .odt, etc) between conflicted git versions
# PODNAME: diff-doc-text-between-conflicted-git-versions
__END__
=pod
=encoding UTF-8
=head1 NAME
diff-doc-text-between-conflicted-git-versions - Diff the text of Office word-processor document (.doc, .docx, .odt, etc) between conflicted git versions
=head1 VERSION
This document describes version 0.004 of diff-doc-text-between-conflicted-git-versions (from Perl distribution App-DiffDocText), released on 2022-09-08.
=head1 SYNOPSIS
 % diff-doc-text-between-conflicted-git-versions [options] <FILE>
=head1 DESCRIPTION
This is a wrapper for L<diff-doc-text> to compare two versions ("ours" and
"theirs") when there is a git merge conflict.
=head1 OPTIONS
See L<diff-doc-text>.
=head1 ENVIRONMENT
=head2 DEBUG
If set to true, do not cleanup temporary directories.
=head1 HOMEPAGE
Please visit the project's homepage at L<https://metacpan.org/release/App-DiffDocText>.
=head1 SOURCE
Source repository is at L<https://github.com/perlancar/perl-App-DiffDocText>.
=head1 SEE ALSO
L<diff-doc-text>
Unix command L<diff>.
=head1 AUTHOR
perlancar <perlancar@cpan.org>
=head1 CONTRIBUTING
To contribute, you can send patches by email/via RT, or send pull requests on
GitHub.
Most of the time, you don't need to build the distribution yourself. You can
simply modify the code, then test via:
 % prove -l
If you want to build the distribution (e.g. to try to install it locally on your
system), you can install L<Dist::Zilla>,
L<Dist::Zilla::PluginBundle::Author::PERLANCAR>,
L<Pod::Weaver::PluginBundle::Author::PERLANCAR>, and sometimes one or two other
Dist::Zilla- and/or Pod::Weaver plugins. Any additional steps required beyond
that are considered a bug and can be reported to me.
=head1 COPYRIGHT AND LICENSE
This software is copyright (c) 2022, 2020 by perlancar <perlancar@cpan.org>.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
=head1 BUGS
Please report any bugs or feature requests on the bugtracker website L<https://rt.cpan.org/Public/Dist/Display.html?Name=App-DiffDocText>
When submitting a bug or request, please include a test-file or a
patch to an existing test-file that illustrates the bug or desired
feature.
=cut