Commit | Line | Data |
a619eb9e |
1 | #!/usr/bin/perl -w |
2 | |
3 | |
4 | # p4genpatch - Generate a perl patch from the repository |
5 | |
6 | # Usage: $0 -h |
7 | |
8 | # andreas.koenig@anima.de |
9 | |
10 | use strict; |
11 | use File::Temp qw(tempdir); |
12 | use File::Compare; |
13 | use Time::Local; |
667f40ee |
14 | use Getopt::Long; |
15 | use Cwd qw(cwd); |
a619eb9e |
16 | |
17 | sub correctmtime ($$$); |
18 | sub Usage (); |
19 | |
667f40ee |
20 | $0 =~ s|^.*[\\/]||; |
21 | my $VERSION = '0.05'; |
22 | my $TOPDIR = cwd(); |
23 | my @P4opt; |
24 | our %OPT = ( "d" => "u", b => "//depot/perl", "D" => "diff" ); |
a619eb9e |
25 | Getopt::Long::Configure("no_ignore_case"); |
2d6becbd |
26 | GetOptions(\%OPT, "b=s", "p=s", "d=s", "D=s", "h", "v", "V") or die Usage; |
a619eb9e |
27 | print Usage and exit if $OPT{h}; |
28 | print "$VERSION\n" and exit if $OPT{V}; |
fc867767 |
29 | die Usage unless @ARGV == 1 && $ARGV[0] =~ /^\d+$/; |
30 | my $CHANGE = shift; |
a619eb9e |
31 | |
32 | for my $p4opt (qw(p)) { |
33 | push @P4opt, "-$p4opt $OPT{$p4opt}" if $OPT{$p4opt}; |
34 | } |
35 | |
fc867767 |
36 | my $system = "p4 @P4opt describe -s $CHANGE |"; |
a619eb9e |
37 | open my $p4, $system or die "Could not run $system"; |
38 | my @action; |
39 | while (<$p4>) { |
40 | print; |
ca8a8491 |
41 | next unless m|($OPT{b})|; |
42 | my($prefix) = $1; |
43 | $prefix =~ s|/[^/]+$||; # up to the last "/" in the match is to be stripped |
a619eb9e |
44 | if (my($file,$action) = m|^\.\.\. (//depot.*)\s(\w+)$|) { |
45 | next if $action eq "delete"; |
ca8a8491 |
46 | push @action, [$action, $file, $prefix]; |
a619eb9e |
47 | } |
48 | } |
49 | close $p4; |
50 | |
51 | my $tempdir; |
52 | print "Differences ...\n"; |
53 | for my $a (@action) { |
8d7ecf55 |
54 | $tempdir ||= tempdir( "tmp-XXXX", CLEANUP => 1, TMPDIR => 1 ); |
ca8a8491 |
55 | my($action,$file,$prefix) = @$a; |
56 | my($path,$basename,$number) = $file =~ m|\Q$prefix\E/(.+/)?([^/]+)#(\d+)|; |
fc867767 |
57 | my($depotfile) = $file =~ m|^(.+)#\d+\z|; |
ca8a8491 |
58 | die "Panic: Could not parse file[$file]" unless $number; |
a619eb9e |
59 | $path = "" unless defined $path; |
cbdeeddd |
60 | my($d1,$d2,$prev,$prevchange,$prevfile,$doadd); |
a619eb9e |
61 | $prev = $number-1; |
fc867767 |
62 | $prevchange = $CHANGE-1; |
63 | # can't assume previous rev == $number-1 due to obliterated revisions |
64 | $prevfile = "$depotfile\@$prevchange"; |
65 | if ($number == 1 or $action =~ /^(add|branch)$/) { |
a619eb9e |
66 | $d1 = "/dev/null"; |
cbdeeddd |
67 | ++$doadd; |
a619eb9e |
68 | } elsif ($action =~ /^(edit|integrate)$/) { |
fc867767 |
69 | $d1 = "$path$basename-$prevchange"; |
a619eb9e |
70 | warn "==> $d1 <==\n" if $OPT{v}; |
fc867767 |
71 | my $system = qq[p4 @P4opt print -o "$tempdir/$d1" "$prevfile"]; |
a619eb9e |
72 | my $status = `$system`; |
73 | if ($?) { |
74 | warn "$0: system[$system] failed, status[$?]\n"; |
75 | next; |
76 | } |
667f40ee |
77 | chmod 0644, "$tempdir/$d1"; |
fc867767 |
78 | if ($status =~ /\#(\d+) \s - \s \w+ \s change \s (\d+) \s /x) { |
79 | ($prev,$prevchange) = ($1,$2); |
80 | $prevfile = "$depotfile#$prev"; |
a619eb9e |
81 | my $oldd1 = $d1; |
fc867767 |
82 | $d1 =~ s/-\d+$/#$prev~$prevchange~/; |
a619eb9e |
83 | rename "$tempdir/$oldd1", "$tempdir/$d1"; |
84 | } |
85 | } else { |
86 | die "Unknown action[$action]"; |
87 | } |
88 | $d2 = "$path$basename"; |
89 | warn "==> $d2#$number <==\n" if $OPT{v}; |
fc867767 |
90 | my $system = qq[p4 @P4opt print -o "$tempdir/$d2" "$file"]; |
a619eb9e |
91 | # warn "system[$system]"; |
92 | my $type = `$system`; |
93 | if ($?) { |
94 | warn "$0: `$system` failed, status[$?]\n"; |
95 | next; |
96 | } |
667f40ee |
97 | chmod 0644, "$tempdir/$d2"; |
a619eb9e |
98 | $type =~ m|^//.*\((.+)\)$| or next; |
99 | $type = $1; |
cbdeeddd |
100 | if ($doadd or File::Compare::compare("$tempdir/$d1", "$tempdir/$d2")) { |
667f40ee |
101 | print "\n==== $file ($type) ====\n"; |
a619eb9e |
102 | unless ($type =~ /text/) { |
103 | next; |
104 | } |
667f40ee |
105 | print "Index: $path$basename\n"; |
cbdeeddd |
106 | correctmtime($prevfile,$prev,"$tempdir/$d1") unless $doadd; |
fc867767 |
107 | correctmtime($file,$number,"$tempdir/$d2"); |
667f40ee |
108 | chdir $tempdir or warn "Could not chdir '$tempdir': $!"; |
109 | $system = qq[$OPT{D} -$OPT{d} "$d1" "$d2"]; |
a619eb9e |
110 | system($system); # no return check because diff doesn't always return 0 |
667f40ee |
111 | chdir $TOPDIR or warn "Could not chdir '$TOPDIR': $!"; |
a619eb9e |
112 | } |
113 | for ("$tempdir/$d1","$tempdir/$d2") { |
114 | unlink or warn "Could not unlink $_: $!" if -f; |
115 | } |
116 | } |
117 | print "End of Patch.\n"; |
118 | |
119 | sub correctmtime ($$$) { |
fc867767 |
120 | my($depotfile,$nr,$localfile) = @_; |
cbdeeddd |
121 | my %fstat = map { /^\.\.\. (\w+) (.*)$/ } `p4 @P4opt fstat -s "$depotfile"`; |
122 | return unless exists($fstat{headRev}) and $fstat{headRev} == $nr; |
fc867767 |
123 | utime $fstat{headTime}, $fstat{headTime}, $localfile; |
a619eb9e |
124 | } |
125 | |
126 | sub Usage () { |
127 | qq{Usage: $0 [OPTIONS] patchnumber |
128 | |
ca8a8491 |
129 | -p host:port p4 port (e.g. myhost:1666) |
130 | -d diffopt option to pass to diff(1) |
131 | -D diff diff(1) to use |
132 | -b branch(es) which branches to include (regex); everything up |
133 | to the last slash of matched portion of path is |
134 | stripped on local copy (default: //depot/perl) |
135 | -v verbose |
136 | -h print this help and exit |
137 | -V print version number and exit |
a619eb9e |
138 | |
139 | Fetches all required files from the repository, puts them into a |
140 | temporary directory with sensible names and sensible modification |
141 | times and composes a patch to STDOUT using external diff command. |
142 | Requires repository access. |
143 | |
144 | Examples: |
145 | perl $0 12345 | gzip -c > 12345.gz |
146 | perl $0 -dc 12345 > change-12345.patch |
ca8a8491 |
147 | perl $0 -b //depot/maint-5.6/perl -v 8571 > 8571 |
a619eb9e |
148 | }; |
149 | } |