Show More
@@ -156,8 +156,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||
|
156 | 156 | if line.startswith('# Node ID'): |
|
157 | 157 | node = line.split()[-1] |
|
158 | 158 | continue |
|
159 |
if |
|
|
160 | or line.startswith('diff --git')): | |
|
159 | if line.startswith('diff -r') or line.startswith('diff --git'): | |
|
161 | 160 | break |
|
162 | 161 | desc.append(line) |
|
163 | 162 | if not node: |
@@ -189,7 +188,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||
|
189 | 188 | patchname = patchname[0] |
|
190 | 189 | elif total > 1: |
|
191 | 190 | patchname = cmdutil.make_filename(repo, '%b-%n.patch', |
|
192 |
|
|
|
191 | binnode, idx, total) | |
|
193 | 192 | else: |
|
194 | 193 | patchname = cmdutil.make_filename(repo, '%b.patch', binnode) |
|
195 | 194 | p['Content-Disposition'] = 'inline; filename=' + patchname |
@@ -316,11 +315,10 b' def patchbomb(ui, repo, *revs, **opts):' | |||
|
316 | 315 | tlen = len(str(len(patches))) |
|
317 | 316 | |
|
318 | 317 | subj = '[PATCH %0*d of %d] %s' % ( |
|
319 | tlen, 0, | |
|
320 | len(patches), | |
|
318 | tlen, 0, len(patches), | |
|
321 | 319 | opts['subject'] or |
|
322 |
prompt('Subject:', |
|
|
323 | len(patches)))) | |
|
320 | prompt('Subject:', | |
|
321 | rest=' [PATCH %0*d of %d] ' % (tlen, 0, len(patches)))) | |
|
324 | 322 | |
|
325 | 323 | body = '' |
|
326 | 324 | if opts['diffstat']: |
General Comments 0
You need to be logged in to leave comments.
Login now