Show More
@@ -12,8 +12,8 b'' | |||||
12 | # |
|
12 | # | |
13 | # The remainder of the changeset description. |
|
13 | # The remainder of the changeset description. | |
14 | # |
|
14 | # | |
15 |
# If the diffstat program is installed, the result of |
|
15 | # [Optional] If the diffstat program is installed, the result of | |
16 | # diffstat on the patch. |
|
16 | # running diffstat on the patch. | |
17 | # |
|
17 | # | |
18 | # The patch itself, as generated by "hg export". |
|
18 | # The patch itself, as generated by "hg export". | |
19 | # |
|
19 | # | |
@@ -26,8 +26,8 b'' | |||||
26 | # changes. |
|
26 | # changes. | |
27 | # |
|
27 | # | |
28 | # It is best to run this script with the "-n" (test only) flag before |
|
28 | # It is best to run this script with the "-n" (test only) flag before | |
29 |
# firing it up "for real", in which case it will |
|
29 | # firing it up "for real", in which case it will use your pager to | |
30 | # messages that it would send. |
|
30 | # display each of the messages that it would send. | |
31 | # |
|
31 | # | |
32 | # To configure a default mail host, add a section like this to your |
|
32 | # To configure a default mail host, add a section like this to your | |
33 | # hgrc file: |
|
33 | # hgrc file: | |
@@ -35,6 +35,14 b'' | |||||
35 | # [smtp] |
|
35 | # [smtp] | |
36 | # host = my_mail_host |
|
36 | # host = my_mail_host | |
37 | # port = 1025 |
|
37 | # port = 1025 | |
|
38 | # | |||
|
39 | # To configure other defaults, add a section like this to your hgrc | |||
|
40 | # file: | |||
|
41 | # | |||
|
42 | # [patchbomb] | |||
|
43 | # from = My Name <my@email> | |||
|
44 | # to = recipient1, recipient2, ... | |||
|
45 | # cc = cc1, cc2, ... | |||
38 |
|
46 | |||
39 | from email.MIMEMultipart import MIMEMultipart |
|
47 | from email.MIMEMultipart import MIMEMultipart | |
40 | from email.MIMEText import MIMEText |
|
48 | from email.MIMEText import MIMEText | |
@@ -81,7 +89,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
81 | if r: return r |
|
89 | if r: return r | |
82 | if default is not None: return default |
|
90 | if default is not None: return default | |
83 | if empty_ok: return r |
|
91 | if empty_ok: return r | |
84 |
|
|
92 | ui.warn('Please enter a valid value.\n') | |
85 |
|
93 | |||
86 | def confirm(s): |
|
94 | def confirm(s): | |
87 | if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'): |
|
95 | if not prompt(s, default = 'y', rest = '? ').lower().startswith('y'): | |
@@ -108,7 +116,9 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
108 | if not node: raise ValueError |
|
116 | if not node: raise ValueError | |
109 | body = ('\n'.join(desc[1:]).strip() or |
|
117 | body = ('\n'.join(desc[1:]).strip() or | |
110 | 'Patch subject is complete summary.') |
|
118 | 'Patch subject is complete summary.') | |
111 | body += '\n\n\n' + cdiffstat('\n'.join(desc), patch) + '\n\n' |
|
119 | body += '\n\n\n' | |
|
120 | if opts['diffstat']: | |||
|
121 | body += cdiffstat('\n'.join(desc), patch) + '\n\n' | |||
112 | body += '\n'.join(patch) |
|
122 | body += '\n'.join(patch) | |
113 | msg = MIMEText(body) |
|
123 | msg = MIMEText(body) | |
114 | subj = '[PATCH %d of %d] %s' % (idx, total, desc[0].strip()) |
|
124 | subj = '[PATCH %d of %d] %s' % (idx, total, desc[0].strip()) | |
@@ -150,14 +160,18 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
150 |
|
160 | |||
151 | ui.write('\nWrite the introductory message for the patch series.\n\n') |
|
161 | ui.write('\nWrite the introductory message for the patch series.\n\n') | |
152 |
|
162 | |||
153 | sender = opts['sender'] or prompt('From', ui.username()) |
|
163 | sender = (opts['from'] or ui.config('patchbomb', 'from') or | |
|
164 | prompt('From', ui.username())) | |||
154 |
|
165 | |||
155 | msg = MIMEMultipart() |
|
166 | msg = MIMEMultipart() | |
156 | msg['Subject'] = '[PATCH 0 of %d] %s' % ( |
|
167 | msg['Subject'] = '[PATCH 0 of %d] %s' % ( | |
157 | len(patches), |
|
168 | len(patches), | |
|
169 | opts['subject'] or | |||
158 | prompt('Subject:', rest = ' [PATCH 0 of %d] ' % len(patches))) |
|
170 | prompt('Subject:', rest = ' [PATCH 0 of %d] ' % len(patches))) | |
159 | to = opts['to'] or [s.strip() for s in prompt('To').split(',')] |
|
171 | to = (opts['to'] or ui.config('patchbomb', 'to') or | |
160 |
|
|
172 | [s.strip() for s in prompt('To').split(',')]) | |
|
173 | cc = (opts['cc'] or ui.config('patchbomb', 'cc') or | |||
|
174 | [s.strip() for s in prompt('Cc', default = '').split(',')]) | |||
161 |
|
175 | |||
162 | ui.write('Finish with ^D or a dot on a line by itself.\n\n') |
|
176 | ui.write('Finish with ^D or a dot on a line by itself.\n\n') | |
163 |
|
177 | |||
@@ -194,7 +208,7 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
194 | m['In-Reply-To'] = parent |
|
208 | m['In-Reply-To'] = parent | |
195 | else: |
|
209 | else: | |
196 | parent = m['Message-Id'] |
|
210 | parent = m['Message-Id'] | |
197 |
m['Date'] = time.strftime('%a, % |
|
211 | m['Date'] = time.strftime('%a, %e %b %Y %T ', time.localtime(start_time)) + tz | |
198 | start_time += 1 |
|
212 | start_time += 1 | |
199 | m['From'] = sender |
|
213 | m['From'] = sender | |
200 | m['To'] = ', '.join(to) |
|
214 | m['To'] = ', '.join(to) | |
@@ -212,8 +226,10 b' def patchbomb(ui, repo, *revs, **opts):' | |||||
212 |
|
226 | |||
213 | if __name__ == '__main__': |
|
227 | if __name__ == '__main__': | |
214 | optspec = [('c', 'cc', [], 'email addresses of copy recipients'), |
|
228 | optspec = [('c', 'cc', [], 'email addresses of copy recipients'), | |
|
229 | ('d', 'diffstat', None, 'add diffstat output to messages'), | |||
|
230 | ('f', 'from', '', 'email address of sender'), | |||
215 | ('n', 'test', None, 'print messages that would be sent'), |
|
231 | ('n', 'test', None, 'print messages that would be sent'), | |
216 |
('s', 's |
|
232 | ('s', 'subject', '', 'subject of introductory message'), | |
217 | ('t', 'to', [], 'email addresses of recipients')] |
|
233 | ('t', 'to', [], 'email addresses of recipients')] | |
218 | options = {} |
|
234 | options = {} | |
219 | try: |
|
235 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now