Show More
@@ -95,7 +95,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
95 | if r: return r |
|
95 | if r: return r | |
96 | if default is not None: return default |
|
96 | if default is not None: return default | |
97 | if empty_ok: return r |
|
97 | if empty_ok: return r | |
98 | ui.warn('Please enter a valid value.\n') |
|
98 | ui.warn(_('Please enter a valid value.\n')) | |
99 |
|
99 | |||
100 | def confirm(s): |
|
100 | def confirm(s): | |
101 | if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'): |
|
101 | if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'): | |
@@ -107,7 +107,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
107 | if summary: |
|
107 | if summary: | |
108 | ui.write(summary, '\n') |
|
108 | ui.write(summary, '\n') | |
109 | ui.write(s, '\n') |
|
109 | ui.write(s, '\n') | |
110 | confirm('Does the diffstat above look okay') |
|
110 | confirm(_('Does the diffstat above look okay')) | |
111 | return s |
|
111 | return s | |
112 |
|
112 | |||
113 | def makepatch(patch, idx, total): |
|
113 | def makepatch(patch, idx, total): | |
@@ -167,13 +167,13 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
167 | jumbo = [] |
|
167 | jumbo = [] | |
168 | msgs = [] |
|
168 | msgs = [] | |
169 |
|
169 | |||
170 | ui.write('This patch series consists of %d patches.\n\n' % len(patches)) |
|
170 | ui.write(_('This patch series consists of %d patches.\n\n') % len(patches)) | |
171 |
|
171 | |||
172 | for p, i in zip(patches, range(len(patches))): |
|
172 | for p, i in zip(patches, range(len(patches))): | |
173 | jumbo.extend(p) |
|
173 | jumbo.extend(p) | |
174 | msgs.append(makepatch(p, i + 1, len(patches))) |
|
174 | msgs.append(makepatch(p, i + 1, len(patches))) | |
175 |
|
175 | |||
176 | ui.write('\nWrite the introductory message for the patch series.\n\n') |
|
176 | ui.write(_('\nWrite the introductory message for the patch series.\n\n')) | |
177 |
|
177 | |||
178 | sender = (opts['from'] or ui.config('patchbomb', 'from') or |
|
178 | sender = (opts['from'] or ui.config('patchbomb', 'from') or | |
179 | prompt('From', ui.username())) |
|
179 | prompt('From', ui.username())) | |
@@ -191,7 +191,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
191 | to = getaddrs('to', 'To') |
|
191 | to = getaddrs('to', 'To') | |
192 | cc = getaddrs('cc', 'Cc', '') |
|
192 | cc = getaddrs('cc', 'Cc', '') | |
193 |
|
193 | |||
194 | ui.write('Finish with ^D or a dot on a line by itself.\n\n') |
|
194 | ui.write(_('Finish with ^D or a dot on a line by itself.\n\n')) | |
195 |
|
195 | |||
196 | body = [] |
|
196 | body = [] | |
197 |
|
197 | |||
@@ -206,7 +206,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
206 | ui.write('\n') |
|
206 | ui.write('\n') | |
207 |
|
207 | |||
208 | if opts['diffstat']: |
|
208 | if opts['diffstat']: | |
209 | d = cdiffstat('Final summary:\n', jumbo) |
|
209 | d = cdiffstat(_('Final summary:\n'), jumbo) | |
210 | if d: msg.attach(MIMEText(d)) |
|
210 | if d: msg.attach(MIMEText(d)) | |
211 |
|
211 | |||
212 | msgs.insert(0, msg) |
|
212 | msgs.insert(0, msg) |
General Comments 0
You need to be logged in to leave comments.
Login now