]>
Commit | Line | Data |
---|---|---|
0acfc972 JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano | |
4 | # | |
5 | ||
66f04f38 AE |
6 | USAGE='[-n | -k] [-o <dir> | --stdout] [--signoff] [--check] [--diff-options] <his> [<mine>]' |
7 | LONG_USAGE='Prepare each commit with its patch since <mine> head forked from | |
8 | <his> head, one file per patch formatted to resemble UNIX mailbox | |
9 | format, for e-mail submission or use with git-am. | |
10 | ||
11 | Each output file is numbered sequentially from 1, and uses the | |
12 | first line of the commit message (massaged for pathname safety) | |
13 | as the filename. | |
14 | ||
15 | When -o is specified, output files are created in <dir>; otherwise | |
16 | they are created in the current working directory. This option | |
17 | is ignored if --stdout is specified. | |
18 | ||
19 | When -n is specified, instead of "[PATCH] Subject", the first | |
20 | line is formatted as "[PATCH N/M] Subject", unless you have only | |
21 | one patch.' | |
22 | ||
806f36d4 FK |
23 | . git-sh-setup |
24 | ||
25 | # Force diff to run in C locale. | |
26 | LANG=C LC_ALL=C | |
27 | export LANG LC_ALL | |
0acfc972 JH |
28 | |
29 | diff_opts= | |
0acfc972 JH |
30 | LF=' |
31 | ' | |
0acfc972 | 32 | |
5c2c972f | 33 | outdir=./ |
0acfc972 JH |
34 | while case "$#" in 0) break;; esac |
35 | do | |
36 | case "$1" in | |
5c2c972f JH |
37 | -c|--c|--ch|--che|--chec|--check) |
38 | check=t ;; | |
36383a3d JH |
39 | -a|--a|--au|--aut|--auth|--autho|--author|\ |
40 | -d|--d|--da|--dat|--date|\ | |
41 | -m|--m|--mb|--mbo|--mbox) # now noop | |
42 | ;; | |
af5260ee JH |
43 | -k|--k|--ke|--kee|--keep|--keep-|--keep-s|--keep-su|--keep-sub|\ |
44 | --keep-subj|--keep-subje|--keep-subjec|--keep-subject) | |
45 | keep_subject=t ;; | |
0acfc972 JH |
46 | -n|--n|--nu|--num|--numb|--numbe|--number|--numbere|--numbered) |
47 | numbered=t ;; | |
d9ac9df4 | 48 | -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) |
b097584b | 49 | signoff=t ;; |
655c7470 | 50 | --st|--std|--stdo|--stdou|--stdout) |
66f04f38 | 51 | stdout=t ;; |
0acfc972 JH |
52 | -o=*|--o=*|--ou=*|--out=*|--outp=*|--outpu=*|--output=*|--output-=*|\ |
53 | --output-d=*|--output-di=*|--output-dir=*|--output-dire=*|\ | |
54 | --output-direc=*|--output-direct=*|--output-directo=*|\ | |
55 | --output-director=*|--output-directory=*) | |
56 | outdir=`expr "$1" : '-[^=]*=\(.*\)'` ;; | |
57 | -o|--o|--ou|--out|--outp|--outpu|--output|--output-|--output-d|\ | |
58 | --output-di|--output-dir|--output-dire|--output-direc|--output-direct|\ | |
59 | --output-directo|--output-director|--output-directory) | |
60 | case "$#" in 1) usage ;; esac; shift | |
61 | outdir="$1" ;; | |
93d69d86 JL |
62 | -h|--h|--he|--hel|--help) |
63 | usage | |
64 | ;; | |
4a5b63e3 JH |
65 | -*' '* | -*"$LF"* | -*' '*) |
66 | # Ignore diff option that has whitespace for now. | |
67 | ;; | |
68 | -*) diff_opts="$diff_opts$1 " ;; | |
0acfc972 JH |
69 | *) break ;; |
70 | esac | |
71 | shift | |
72 | done | |
73 | ||
af5260ee JH |
74 | case "$keep_subject$numbered" in |
75 | tt) | |
76 | die '--keep-subject and --numbered are incompatible.' ;; | |
77 | esac | |
78 | ||
603d8745 JH |
79 | tmp=.tmp-series$$ |
80 | trap 'rm -f $tmp-*' 0 1 2 3 15 | |
81 | ||
82 | series=$tmp-series | |
83 | commsg=$tmp-commsg | |
84 | filelist=$tmp-files | |
85 | ||
86 | # Backward compatible argument parsing hack. | |
87 | # | |
88 | # Historically, we supported: | |
89 | # 1. "rev1" is equivalent to "rev1..HEAD" | |
90 | # 2. "rev1..rev2" | |
91 | # 3. "rev1" "rev2 is equivalent to "rev1..rev2" | |
92 | # | |
93 | # We want to take a sequence of "rev1..rev2" in general. | |
bd7c8aab JH |
94 | # Also, "rev1.." should mean "rev1..HEAD"; git-diff users are |
95 | # familiar with that syntax. | |
603d8745 | 96 | |
88b5a748 | 97 | case "$#,$1$2" in |
603d8745 JH |
98 | 1,?*..?*) |
99 | # single "rev1..rev2" | |
100 | ;; | |
bd7c8aab JH |
101 | 1,?*..) |
102 | # single "rev1.." should mean "rev1..HEAD" | |
b748421a | 103 | set x "$1"HEAD |
bd7c8aab JH |
104 | shift |
105 | ;; | |
603d8745 JH |
106 | 1,*) |
107 | # single rev1 | |
108 | set x "$1..HEAD" | |
109 | shift | |
110 | ;; | |
111 | 2,?*..?*) | |
112 | # not traditional "rev1" "rev2" | |
4a5b63e3 | 113 | ;; |
603d8745 JH |
114 | 2,*) |
115 | set x "$1..$2" | |
116 | shift | |
4a5b63e3 | 117 | ;; |
0acfc972 JH |
118 | esac |
119 | ||
603d8745 JH |
120 | # Now we have what we want in $@ |
121 | for revpair | |
122 | do | |
123 | case "$revpair" in | |
124 | ?*..?*) | |
125 | rev1=`expr "$revpair" : '\(.*\)\.\.'` | |
126 | rev2=`expr "$revpair" : '.*\.\.\(.*\)'` | |
127 | ;; | |
128 | *) | |
88b5a748 JH |
129 | rev1="$revpair^" |
130 | rev2="$revpair" | |
603d8745 JH |
131 | ;; |
132 | esac | |
133 | git-rev-parse --verify "$rev1^0" >/dev/null 2>&1 || | |
134 | die "Not a valid rev $rev1 ($revpair)" | |
135 | git-rev-parse --verify "$rev2^0" >/dev/null 2>&1 || | |
136 | die "Not a valid rev $rev2 ($revpair)" | |
137 | git-cherry -v "$rev1" "$rev2" | | |
138 | while read sign rev comment | |
139 | do | |
140 | case "$sign" in | |
141 | '-') | |
142 | echo >&2 "Merged already: $comment" | |
143 | ;; | |
144 | *) | |
145 | echo $rev | |
146 | ;; | |
147 | esac | |
148 | done | |
149 | done >$series | |
150 | ||
44d2eb51 JH |
151 | me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'` |
152 | ||
0acfc972 JH |
153 | case "$outdir" in |
154 | */) ;; | |
155 | *) outdir="$outdir/" ;; | |
156 | esac | |
157 | test -d "$outdir" || mkdir -p "$outdir" || exit | |
158 | ||
0acfc972 | 159 | titleScript=' |
1855c044 JH |
160 | /./d |
161 | /^$/n | |
162 | s/^\[PATCH[^]]*\] *// | |
0acfc972 JH |
163 | s/[^-a-z.A-Z_0-9]/-/g |
164 | s/\.\.\.*/\./g | |
165 | s/\.*$// | |
166 | s/--*/-/g | |
167 | s/^-// | |
168 | s/-$// | |
169 | s/$/./ | |
1855c044 | 170 | p |
0acfc972 JH |
171 | q |
172 | ' | |
173 | ||
655c7470 | 174 | process_one () { |
36383a3d JH |
175 | perl -w -e ' |
176 | my ($keep_subject, $num, $signoff, $commsg) = @ARGV; | |
f891cb3f | 177 | my ($signoff_pattern, $done_header, $done_subject, $done_separator, $signoff_seen, |
36383a3d | 178 | $last_was_signoff); |
655c7470 | 179 | |
36383a3d | 180 | if ($signoff) { |
fc5be4fd | 181 | $signoff = "Signed-off-by: " . `git-var GIT_COMMITTER_IDENT`; |
36383a3d JH |
182 | $signoff =~ s/>.*/>/; |
183 | $signoff_pattern = quotemeta($signoff); | |
184 | } | |
44d2eb51 | 185 | |
36383a3d JH |
186 | my @weekday_names = qw(Sun Mon Tue Wed Thu Fri Sat); |
187 | my @month_names = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); | |
a5c21d6e | 188 | |
36383a3d JH |
189 | sub show_date { |
190 | my ($time, $tz) = @_; | |
191 | my $minutes = abs($tz); | |
fab5de79 | 192 | $minutes = int($minutes / 100) * 60 + ($minutes % 100); |
36383a3d JH |
193 | if ($tz < 0) { |
194 | $minutes = -$minutes; | |
195 | } | |
196 | my $t = $time + $minutes * 60; | |
197 | my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime($t); | |
198 | return sprintf("%s %s %d %02d:%02d:%02d %d %+05d", | |
199 | $weekday_names[$wday], | |
200 | $month_names[$mon], | |
201 | $mday, $hour, $min, $sec, | |
202 | $year+1900, $tz); | |
203 | } | |
0acfc972 | 204 | |
36383a3d JH |
205 | print "From nobody Mon Sep 17 00:00:00 2001\n"; |
206 | open FH, "git stripspace <$commsg |" or die "open $commsg pipe"; | |
207 | while (<FH>) { | |
208 | unless ($done_header) { | |
209 | if (/^$/) { | |
210 | $done_header = 1; | |
211 | } | |
212 | elsif (/^author (.*>) (.*)$/) { | |
213 | my ($author_ident, $author_date) = ($1, $2); | |
214 | my ($utc, $off) = ($author_date =~ /^(\d+) ([-+]?\d+)$/); | |
215 | $author_date = show_date($utc, $off); | |
b097584b | 216 | |
36383a3d JH |
217 | print "From: $author_ident\n"; |
218 | print "Date: $author_date\n"; | |
b097584b | 219 | } |
36383a3d JH |
220 | next; |
221 | } | |
222 | unless ($done_subject) { | |
223 | unless ($keep_subject) { | |
224 | s/^\[PATCH[^]]*\]\s*//; | |
225 | s/^/[PATCH$num] /; | |
226 | } | |
227 | print "Subject: $_"; | |
228 | $done_subject = 1; | |
229 | next; | |
230 | } | |
f891cb3f AJ |
231 | unless ($done_separator) { |
232 | print "\n"; | |
233 | $done_separator = 1; | |
234 | next if (/^$/); | |
235 | } | |
36383a3d JH |
236 | |
237 | $last_was_signoff = 0; | |
238 | if (/Signed-off-by:/i) { | |
239 | if ($signoff ne "" && /Signed-off-by:\s*$signoff_pattern$/i) { | |
240 | $signoff_seen = 1; | |
241 | } | |
242 | } | |
243 | print $_; | |
244 | } | |
245 | if (!$signoff_seen && $signoff ne "") { | |
246 | if (!$last_was_signoff) { | |
247 | print "\n"; | |
248 | } | |
249 | print "$signoff\n"; | |
250 | } | |
251 | print "\n---\n\n"; | |
252 | close FH or die "close $commsg pipe"; | |
253 | ' "$keep_subject" "$num" "$signoff" $commsg | |
254 | ||
0acfc972 JH |
255 | git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary |
256 | echo | |
b10c1a74 | 257 | git-diff-tree -p $diff_opts "$commit" |
a004d3f7 | 258 | echo "-- " |
3ff8cbed | 259 | echo "@@GIT_VERSION@@" |
5c2c972f | 260 | |
36383a3d | 261 | echo |
655c7470 JH |
262 | } |
263 | ||
264 | total=`wc -l <$series | tr -dc "[0-9]"` | |
7564577a JH |
265 | case "$total,$numbered" in |
266 | 1,*) | |
267 | numfmt='' ;; | |
268 | *,t) | |
269 | numfmt=`echo "$total" | wc -c` | |
270 | numfmt=$(($numfmt-1)) | |
271 | numfmt=" %0${numfmt}d/$total" | |
272 | esac | |
273 | ||
655c7470 JH |
274 | i=1 |
275 | while read commit | |
276 | do | |
277 | git-cat-file commit "$commit" | git-stripspace >$commsg | |
278 | title=`sed -ne "$titleScript" <$commsg` | |
279 | case "$numbered" in | |
280 | '') num= ;; | |
281 | *) | |
7564577a | 282 | num=`printf "$numfmt" $i` ;; |
5c2c972f | 283 | esac |
655c7470 JH |
284 | |
285 | file=`printf '%04d-%stxt' $i "$title"` | |
286 | if test '' = "$stdout" | |
287 | then | |
51b3c00e | 288 | echo "$file" |
655c7470 JH |
289 | process_one >"$outdir$file" |
290 | if test t = "$check" | |
291 | then | |
292 | # This is slightly modified from Andrew Morton's Perfect Patch. | |
293 | # Lines you introduce should not have trailing whitespace. | |
294 | # Also check for an indentation that has SP before a TAB. | |
295 | grep -n '^+\([ ]* .*\|.*[ ]\)$' "$outdir$file" | |
296 | : | |
297 | fi | |
298 | else | |
51b3c00e | 299 | echo >&2 "$file" |
655c7470 JH |
300 | process_one |
301 | fi | |
302 | i=`expr "$i" + 1` | |
0acfc972 | 303 | done <$series |