Show More
@@ -103,6 +103,10 b' notify.maxdiff' | |||||
103 | Maximum number of diff lines to include in notification email. Set to 0 |
|
103 | Maximum number of diff lines to include in notification email. Set to 0 | |
104 | to disable the diff, or -1 to include all of it. Default: 300. |
|
104 | to disable the diff, or -1 to include all of it. Default: 300. | |
105 |
|
105 | |||
|
106 | notify.maxdiffstat | |||
|
107 | Maximum number of diffstat lines to include in notification email. Set to -1 | |||
|
108 | to include all of it. Default: -1. | |||
|
109 | ||||
106 | notify.maxsubject |
|
110 | notify.maxsubject | |
107 | Maximum number of characters in email's subject line. Default: 67. |
|
111 | Maximum number of characters in email's subject line. Default: 67. | |
108 |
|
112 | |||
@@ -184,6 +188,9 b" configitem('notify', 'incoming'," | |||||
184 | configitem('notify', 'maxdiff', |
|
188 | configitem('notify', 'maxdiff', | |
185 | default=300, |
|
189 | default=300, | |
186 | ) |
|
190 | ) | |
|
191 | configitem('notify', 'maxdiffstat', | |||
|
192 | default=-1, | |||
|
193 | ) | |||
187 | configitem('notify', 'maxsubject', |
|
194 | configitem('notify', 'maxsubject', | |
188 | default=67, |
|
195 | default=67, | |
189 | ) |
|
196 | ) | |
@@ -418,10 +425,17 b' class notifier(object):' | |||||
418 | difflines = ''.join(chunks).splitlines() |
|
425 | difflines = ''.join(chunks).splitlines() | |
419 |
|
426 | |||
420 | if self.ui.configbool('notify', 'diffstat'): |
|
427 | if self.ui.configbool('notify', 'diffstat'): | |
|
428 | maxdiffstat = int(self.ui.config('notify', 'maxdiffstat')) | |||
421 | s = patch.diffstat(difflines) |
|
429 | s = patch.diffstat(difflines) | |
422 | # s may be nil, don't include the header if it is |
|
430 | # s may be nil, don't include the header if it is | |
423 | if s: |
|
431 | if s: | |
424 | self.ui.write(_('\ndiffstat:\n\n%s') % s) |
|
432 | if maxdiffstat >= 0 and s.count("\n") > maxdiffstat + 1: | |
|
433 | s = s.split("\n") | |||
|
434 | msg = _('\ndiffstat (truncated from %d to %d lines):\n\n') | |||
|
435 | self.ui.write(msg % (len(s) - 2, maxdiffstat)) | |||
|
436 | self.ui.write("\n".join(s[:maxdiffstat] + s[-2:])) | |||
|
437 | else: | |||
|
438 | self.ui.write(_('\ndiffstat:\n\n%s') % s) | |||
425 |
|
439 | |||
426 | if maxdiff == 0: |
|
440 | if maxdiff == 0: | |
427 | return |
|
441 | return |
@@ -121,6 +121,10 b'' | |||||
121 | Maximum number of diff lines to include in notification email. Set to 0 to |
|
121 | Maximum number of diff lines to include in notification email. Set to 0 to | |
122 | disable the diff, or -1 to include all of it. Default: 300. |
|
122 | disable the diff, or -1 to include all of it. Default: 300. | |
123 |
|
123 | |||
|
124 | notify.maxdiffstat | |||
|
125 | Maximum number of diffstat lines to include in notification email. Set to -1 | |||
|
126 | to include all of it. Default: -1. | |||
|
127 | ||||
124 | notify.maxsubject |
|
128 | notify.maxsubject | |
125 | Maximum number of characters in email's subject line. Default: 67. |
|
129 | Maximum number of characters in email's subject line. Default: 67. | |
126 |
|
130 | |||
@@ -152,19 +156,21 b'' | |||||
152 | no commands defined |
|
156 | no commands defined | |
153 | $ hg init a |
|
157 | $ hg init a | |
154 | $ echo a > a/a |
|
158 | $ echo a > a/a | |
|
159 | $ echo b > a/b | |||
155 |
|
160 | |||
156 | commit |
|
161 | commit | |
157 |
|
162 | |||
158 | $ hg --cwd a commit -Ama -d '0 0' |
|
163 | $ hg --cwd a commit -Ama -d '0 0' | |
159 | adding a |
|
164 | adding a | |
160 |
|
165 | adding b | ||
161 |
|
166 | |||
162 | clone |
|
167 | clone | |
163 |
|
168 | |||
164 | $ hg --traceback clone a b |
|
169 | $ hg --traceback clone a b | |
165 | updating to branch default |
|
170 | updating to branch default | |
166 |
|
|
171 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
167 | $ echo a >> a/a |
|
172 | $ echo a >> a/a | |
|
173 | $ echo b >> a/b | |||
168 |
|
174 | |||
169 | commit |
|
175 | commit | |
170 |
|
176 | |||
@@ -187,29 +193,34 b' pull (minimal config)' | |||||
187 | adding changesets |
|
193 | adding changesets | |
188 | adding manifests |
|
194 | adding manifests | |
189 | adding file changes |
|
195 | adding file changes | |
190 |
added 1 changesets with |
|
196 | added 1 changesets with 2 changes to 2 files | |
191 |
new changesets 0 |
|
197 | new changesets 00a13f371396 | |
192 | MIME-Version: 1.0 |
|
198 | MIME-Version: 1.0 | |
193 | Content-Type: text/plain; charset="us-ascii" |
|
199 | Content-Type: text/plain; charset="us-ascii" | |
194 | Content-Transfer-Encoding: 7bit |
|
200 | Content-Transfer-Encoding: 7bit | |
195 | Date: * (glob) |
|
201 | Date: * (glob) | |
196 | Subject: changeset in $TESTTMP/b: b |
|
202 | Subject: changeset in $TESTTMP/b: b | |
197 | From: test |
|
203 | From: test | |
198 |
X-Hg-Notification: changeset 0 |
|
204 | X-Hg-Notification: changeset 00a13f371396 | |
199 | Message-Id: <*> (glob) |
|
205 | Message-Id: <*> (glob) | |
200 | To: baz, foo@bar |
|
206 | To: baz, foo@bar | |
201 |
|
207 | |||
202 |
changeset 0 |
|
208 | changeset 00a13f371396 in $TESTTMP/b | |
203 |
details: $TESTTMP/b?cmd=changeset;node=0 |
|
209 | details: $TESTTMP/b?cmd=changeset;node=00a13f371396 | |
204 | description: b |
|
210 | description: b | |
205 |
|
211 | |||
206 |
diffs ( |
|
212 | diffs (12 lines): | |
207 |
|
213 | |||
208 | diff -r cb9a9f314b8b -r 0647d048b600 a |
|
214 | diff -r 0cd96de13884 -r 00a13f371396 a | |
209 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
215 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
210 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
216 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
211 | @@ -1,1 +1,2 @@ a |
|
217 | @@ -1,1 +1,2 @@ a | |
212 | +a |
|
218 | +a | |
|
219 | diff -r 0cd96de13884 -r 00a13f371396 b | |||
|
220 | --- a/b Thu Jan 01 00:00:00 1970 +0000 | |||
|
221 | +++ b/b Thu Jan 01 00:00:01 1970 +0000 | |||
|
222 | @@ -1,1 +1,2 @@ b | |||
|
223 | +b | |||
213 | (run 'hg update' to get a working copy) |
|
224 | (run 'hg update' to get a working copy) | |
214 |
|
225 | |||
215 | $ cat <<EOF >> $HGRCPATH |
|
226 | $ cat <<EOF >> $HGRCPATH | |
@@ -241,8 +252,8 b' pull' | |||||
241 | adding changesets |
|
252 | adding changesets | |
242 | adding manifests |
|
253 | adding manifests | |
243 | adding file changes |
|
254 | adding file changes | |
244 |
added 1 changesets with |
|
255 | added 1 changesets with 2 changes to 2 files | |
245 |
new changesets 0 |
|
256 | new changesets 00a13f371396 | |
246 | MIME-Version: 1.0 |
|
257 | MIME-Version: 1.0 | |
247 | Content-Type: text/plain; charset="us-ascii" |
|
258 | Content-Type: text/plain; charset="us-ascii" | |
248 | Content-Transfer-Encoding: 7bit |
|
259 | Content-Transfer-Encoding: 7bit | |
@@ -250,19 +261,24 b' pull' | |||||
250 | Date: * (glob) |
|
261 | Date: * (glob) | |
251 | Subject: b |
|
262 | Subject: b | |
252 | From: test@test.com |
|
263 | From: test@test.com | |
253 |
X-Hg-Notification: changeset 0 |
|
264 | X-Hg-Notification: changeset 00a13f371396 | |
254 | Message-Id: <*> (glob) |
|
265 | Message-Id: <*> (glob) | |
255 | To: baz@test.com, foo@bar |
|
266 | To: baz@test.com, foo@bar | |
256 |
|
267 | |||
257 |
changeset 0 |
|
268 | changeset 00a13f371396 in b | |
258 | description: b |
|
269 | description: b | |
259 |
diffs ( |
|
270 | diffs (12 lines): | |
260 |
|
271 | |||
261 | diff -r cb9a9f314b8b -r 0647d048b600 a |
|
272 | diff -r 0cd96de13884 -r 00a13f371396 a | |
262 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
273 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
263 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
274 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
264 | @@ -1,1 +1,2 @@ a |
|
275 | @@ -1,1 +1,2 @@ a | |
265 | +a |
|
276 | +a | |
|
277 | diff -r 0cd96de13884 -r 00a13f371396 b | |||
|
278 | --- a/b Thu Jan 01 00:00:00 1970 +0000 | |||
|
279 | +++ b/b Thu Jan 01 00:00:01 1970 +0000 | |||
|
280 | @@ -1,1 +1,2 @@ b | |||
|
281 | +b | |||
266 | (run 'hg update' to get a working copy) |
|
282 | (run 'hg update' to get a working copy) | |
267 |
|
283 | |||
268 | $ cat << EOF >> $HGRCPATH |
|
284 | $ cat << EOF >> $HGRCPATH | |
@@ -278,14 +294,14 b' pull' | |||||
278 |
|
294 | |||
279 | $ hg --cwd b rollback |
|
295 | $ hg --cwd b rollback | |
280 | repository tip rolled back to revision 0 (undo pull) |
|
296 | repository tip rolled back to revision 0 (undo pull) | |
281 | $ hg --traceback --cwd b pull ../a | $PYTHON $TESTTMP/filter.py |
|
297 | $ hg --traceback --config notify.maxdiffstat=1 --cwd b pull ../a | $PYTHON $TESTTMP/filter.py | |
282 | pulling from ../a |
|
298 | pulling from ../a | |
283 | searching for changes |
|
299 | searching for changes | |
284 | adding changesets |
|
300 | adding changesets | |
285 | adding manifests |
|
301 | adding manifests | |
286 | adding file changes |
|
302 | adding file changes | |
287 |
added 1 changesets with |
|
303 | added 1 changesets with 2 changes to 2 files | |
288 |
new changesets 0 |
|
304 | new changesets 00a13f371396 | |
289 | MIME-Version: 1.0 |
|
305 | MIME-Version: 1.0 | |
290 | Content-Type: text/plain; charset="us-ascii" |
|
306 | Content-Type: text/plain; charset="us-ascii" | |
291 | Content-Transfer-Encoding: 7bit |
|
307 | Content-Transfer-Encoding: 7bit | |
@@ -293,34 +309,39 b' pull' | |||||
293 | Date: * (glob) |
|
309 | Date: * (glob) | |
294 | Subject: b |
|
310 | Subject: b | |
295 | From: test@test.com |
|
311 | From: test@test.com | |
296 |
X-Hg-Notification: changeset 0 |
|
312 | X-Hg-Notification: changeset 00a13f371396 | |
297 | Message-Id: <*> (glob) |
|
313 | Message-Id: <*> (glob) | |
298 | To: baz@test.com, foo@bar |
|
314 | To: baz@test.com, foo@bar | |
299 |
|
315 | |||
300 |
changeset 0 |
|
316 | changeset 00a13f371396 in b | |
301 | description: b |
|
317 | description: b | |
302 | diffstat: |
|
318 | diffstat (truncated from 2 to 1 lines): | |
303 |
a | 1 + |
|
319 | a | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) | |
304 |
|
320 | |||
305 |
diffs ( |
|
321 | diffs (12 lines): | |
306 |
|
322 | |||
307 | diff -r cb9a9f314b8b -r 0647d048b600 a |
|
323 | diff -r 0cd96de13884 -r 00a13f371396 a | |
308 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
324 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
309 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
325 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
310 | @@ -1,1 +1,2 @@ a |
|
326 | @@ -1,1 +1,2 @@ a | |
311 | +a |
|
327 | +a | |
|
328 | diff -r 0cd96de13884 -r 00a13f371396 b | |||
|
329 | --- a/b Thu Jan 01 00:00:00 1970 +0000 | |||
|
330 | +++ b/b Thu Jan 01 00:00:01 1970 +0000 | |||
|
331 | @@ -1,1 +1,2 @@ b | |||
|
332 | +b | |||
312 | (run 'hg update' to get a working copy) |
|
333 | (run 'hg update' to get a working copy) | |
313 |
|
334 | |||
314 | test merge |
|
335 | test merge | |
315 |
|
336 | |||
316 | $ cd a |
|
337 | $ cd a | |
317 | $ hg up -C 0 |
|
338 | $ hg up -C 0 | |
318 |
|
|
339 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
319 | $ echo a >> a |
|
340 | $ echo a >> a | |
320 | $ hg ci -Am adda2 -d '2 0' |
|
341 | $ hg ci -Am adda2 -d '2 0' | |
321 | created new head |
|
342 | created new head | |
322 | $ hg merge |
|
343 | $ hg merge | |
323 |
|
|
344 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
324 | (branch merge, don't forget to commit) |
|
345 | (branch merge, don't forget to commit) | |
325 | $ hg ci -m merge -d '3 0' |
|
346 | $ hg ci -m merge -d '3 0' | |
326 | $ cd .. |
|
347 | $ cd .. | |
@@ -331,7 +352,7 b' test merge' | |||||
331 | adding manifests |
|
352 | adding manifests | |
332 | adding file changes |
|
353 | adding file changes | |
333 | added 2 changesets with 0 changes to 0 files |
|
354 | added 2 changesets with 0 changes to 0 files | |
334 | new changesets 0a184ce6067f:6a0cf76b2701 |
|
355 | new changesets 3332653e1f3c:fccf66cd0c35 | |
335 | MIME-Version: 1.0 |
|
356 | MIME-Version: 1.0 | |
336 | Content-Type: text/plain; charset="us-ascii" |
|
357 | Content-Type: text/plain; charset="us-ascii" | |
337 | Content-Transfer-Encoding: 7bit |
|
358 | Content-Transfer-Encoding: 7bit | |
@@ -339,18 +360,18 b' test merge' | |||||
339 | Date: * (glob) |
|
360 | Date: * (glob) | |
340 | Subject: adda2 |
|
361 | Subject: adda2 | |
341 | From: test@test.com |
|
362 | From: test@test.com | |
342 |
X-Hg-Notification: changeset |
|
363 | X-Hg-Notification: changeset 3332653e1f3c | |
343 | Message-Id: <*> (glob) |
|
364 | Message-Id: <*> (glob) | |
344 | To: baz@test.com, foo@bar |
|
365 | To: baz@test.com, foo@bar | |
345 |
|
366 | |||
346 |
changeset |
|
367 | changeset 3332653e1f3c in b | |
347 | description: adda2 |
|
368 | description: adda2 | |
348 | diffstat: |
|
369 | diffstat: | |
349 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) |
|
370 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | |
350 |
|
371 | |||
351 | diffs (6 lines): |
|
372 | diffs (6 lines): | |
352 |
|
373 | |||
353 | diff -r cb9a9f314b8b -r 0a184ce6067f a |
|
374 | diff -r 0cd96de13884 -r 3332653e1f3c a | |
354 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
375 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
355 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
|
376 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 | |
356 | @@ -1,1 +1,2 @@ a |
|
377 | @@ -1,1 +1,2 @@ a | |
@@ -362,12 +383,22 b' test merge' | |||||
362 | Date: * (glob) |
|
383 | Date: * (glob) | |
363 | Subject: merge |
|
384 | Subject: merge | |
364 | From: test@test.com |
|
385 | From: test@test.com | |
365 |
X-Hg-Notification: changeset |
|
386 | X-Hg-Notification: changeset fccf66cd0c35 | |
366 | Message-Id: <*> (glob) |
|
387 | Message-Id: <*> (glob) | |
367 | To: baz@test.com, foo@bar |
|
388 | To: baz@test.com, foo@bar | |
368 |
|
389 | |||
369 |
changeset |
|
390 | changeset fccf66cd0c35 in b | |
370 | description: merge |
|
391 | description: merge | |
|
392 | diffstat: | |||
|
393 | b | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | |||
|
394 | ||||
|
395 | diffs (6 lines): | |||
|
396 | ||||
|
397 | diff -r 3332653e1f3c -r fccf66cd0c35 b | |||
|
398 | --- a/b Thu Jan 01 00:00:02 1970 +0000 | |||
|
399 | +++ b/b Thu Jan 01 00:00:03 1970 +0000 | |||
|
400 | @@ -1,1 +1,2 @@ b | |||
|
401 | +b | |||
371 | (run 'hg update' to get a working copy) |
|
402 | (run 'hg update' to get a working copy) | |
372 |
|
403 | |||
373 | non-ascii content and truncation of multi-byte subject |
|
404 | non-ascii content and truncation of multi-byte subject | |
@@ -387,7 +418,7 b' non-ascii content and truncation of mult' | |||||
387 | adding manifests |
|
418 | adding manifests | |
388 | adding file changes |
|
419 | adding file changes | |
389 | added 1 changesets with 1 changes to 1 files |
|
420 | added 1 changesets with 1 changes to 1 files | |
390 |
new changesets |
|
421 | new changesets 0f25f9c22b4c | |
391 | MIME-Version: 1.0 |
|
422 | MIME-Version: 1.0 | |
392 | Content-Type: text/plain; charset="us-ascii" |
|
423 | Content-Type: text/plain; charset="us-ascii" | |
393 | Content-Transfer-Encoding: 8bit |
|
424 | Content-Transfer-Encoding: 8bit | |
@@ -395,18 +426,18 b' non-ascii content and truncation of mult' | |||||
395 | Date: * (glob) |
|
426 | Date: * (glob) | |
396 | Subject: \xc3\xa0... (esc) |
|
427 | Subject: \xc3\xa0... (esc) | |
397 | From: test@test.com |
|
428 | From: test@test.com | |
398 |
X-Hg-Notification: changeset |
|
429 | X-Hg-Notification: changeset 0f25f9c22b4c | |
399 | Message-Id: <*> (glob) |
|
430 | Message-Id: <*> (glob) | |
400 | To: baz@test.com, foo@bar |
|
431 | To: baz@test.com, foo@bar | |
401 |
|
432 | |||
402 |
changeset |
|
433 | changeset 0f25f9c22b4c in b | |
403 | description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) |
|
434 | description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) | |
404 | diffstat: |
|
435 | diffstat: | |
405 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) |
|
436 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | |
406 |
|
437 | |||
407 | diffs (7 lines): |
|
438 | diffs (7 lines): | |
408 |
|
439 | |||
409 | diff -r 6a0cf76b2701 -r 7ea05ad269dc a |
|
440 | diff -r fccf66cd0c35 -r 0f25f9c22b4c a | |
410 | --- a/a Thu Jan 01 00:00:03 1970 +0000 |
|
441 | --- a/a Thu Jan 01 00:00:03 1970 +0000 | |
411 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
442 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
412 | @@ -1,2 +1,3 @@ a a |
|
443 | @@ -1,2 +1,3 @@ a a | |
@@ -430,7 +461,7 b' long lines' | |||||
430 | adding manifests |
|
461 | adding manifests | |
431 | adding file changes |
|
462 | adding file changes | |
432 | added 1 changesets with 1 changes to 1 files |
|
463 | added 1 changesets with 1 changes to 1 files | |
433 |
new changesets a |
|
464 | new changesets a846b5f6ebb7 | |
434 | notify: sending 2 subscribers 1 changes |
|
465 | notify: sending 2 subscribers 1 changes | |
435 | (run 'hg update' to get a working copy) |
|
466 | (run 'hg update' to get a working copy) | |
436 | $ $PYTHON $TESTTMP/filter.py < b/mbox |
|
467 | $ $PYTHON $TESTTMP/filter.py < b/mbox | |
@@ -442,18 +473,18 b' long lines' | |||||
442 | Date: * (glob) |
|
473 | Date: * (glob) | |
443 | Subject: long line |
|
474 | Subject: long line | |
444 | From: test@test.com |
|
475 | From: test@test.com | |
445 |
X-Hg-Notification: changeset a |
|
476 | X-Hg-Notification: changeset a846b5f6ebb7 | |
446 |
Message-Id: <hg.a |
|
477 | Message-Id: <hg.a846b5f6ebb7.*.*@*> (glob) | |
447 | To: baz@test.com, foo@bar |
|
478 | To: baz@test.com, foo@bar | |
448 |
|
479 | |||
449 |
changeset a |
|
480 | changeset a846b5f6ebb7 in b | |
450 | description: long line |
|
481 | description: long line | |
451 | diffstat: |
|
482 | diffstat: | |
452 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) |
|
483 | a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) | |
453 |
|
484 | |||
454 | diffs (8 lines): |
|
485 | diffs (8 lines): | |
455 |
|
486 | |||
456 |
diff -r |
|
487 | diff -r 0f25f9c22b4c -r a846b5f6ebb7 a | |
457 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
488 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
458 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
489 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
459 | @@ -1,3 +1,4 @@ a a a |
|
490 | @@ -1,3 +1,4 @@ a a a | |
@@ -500,7 +531,7 b' long lines' | |||||
500 | adding manifests |
|
531 | adding manifests | |
501 | adding file changes |
|
532 | adding file changes | |
502 | added 1 changesets with 1 changes to 1 files |
|
533 | added 1 changesets with 1 changes to 1 files | |
503 |
new changesets |
|
534 | new changesets f7e5aaed4080 | |
504 | MIME-Version: 1.0 |
|
535 | MIME-Version: 1.0 | |
505 | Content-Type: text/plain; charset="us-ascii" |
|
536 | Content-Type: text/plain; charset="us-ascii" | |
506 | Content-Transfer-Encoding: 7bit |
|
537 | Content-Transfer-Encoding: 7bit | |
@@ -508,11 +539,11 b' long lines' | |||||
508 | Date: * (glob) |
|
539 | Date: * (glob) | |
509 | Subject: test |
|
540 | Subject: test | |
510 | From: test@test.com |
|
541 | From: test@test.com | |
511 |
X-Hg-Notification: changeset |
|
542 | X-Hg-Notification: changeset f7e5aaed4080 | |
512 |
Message-Id: <hg. |
|
543 | Message-Id: <hg.f7e5aaed4080.*.*@*> (glob) | |
513 | To: baz@test.com, foo@bar, notify@example.com |
|
544 | To: baz@test.com, foo@bar, notify@example.com | |
514 |
|
545 | |||
515 |
changeset |
|
546 | changeset f7e5aaed4080 in b | |
516 | description: test |
|
547 | description: test | |
517 | (run 'hg update' to get a working copy) |
|
548 | (run 'hg update' to get a working copy) | |
518 |
|
549 | |||
@@ -530,7 +561,7 b' from different branch' | |||||
530 | adding manifests |
|
561 | adding manifests | |
531 | adding file changes |
|
562 | adding file changes | |
532 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
563 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
533 |
new changesets |
|
564 | new changesets 645eb6690ecf | |
534 | MIME-Version: 1.0 |
|
565 | MIME-Version: 1.0 | |
535 | Content-Type: text/plain; charset="us-ascii" |
|
566 | Content-Type: text/plain; charset="us-ascii" | |
536 | Content-Transfer-Encoding: 7bit |
|
567 | Content-Transfer-Encoding: 7bit | |
@@ -538,11 +569,11 b' from different branch' | |||||
538 | Date: * (glob) |
|
569 | Date: * (glob) | |
539 | Subject: test |
|
570 | Subject: test | |
540 | From: test@test.com |
|
571 | From: test@test.com | |
541 |
X-Hg-Notification: changeset |
|
572 | X-Hg-Notification: changeset 645eb6690ecf | |
542 |
Message-Id: <hg. |
|
573 | Message-Id: <hg.645eb6690ecf.*.*@*> (glob) | |
543 | To: baz@test.com, foo@bar |
|
574 | To: baz@test.com, foo@bar | |
544 |
|
575 | |||
545 |
changeset |
|
576 | changeset 645eb6690ecf in b | |
546 | description: test |
|
577 | description: test | |
547 | (run 'hg heads' to see heads) |
|
578 | (run 'hg heads' to see heads) | |
548 |
|
579 | |||
@@ -559,12 +590,12 b' default template:' | |||||
559 | Date: * (glob) |
|
590 | Date: * (glob) | |
560 | Subject: changeset in b: default template |
|
591 | Subject: changeset in b: default template | |
561 | From: test@test.com |
|
592 | From: test@test.com | |
562 |
X-Hg-Notification: changeset |
|
593 | X-Hg-Notification: changeset 5cd4346eed47 | |
563 |
Message-Id: <hg. |
|
594 | Message-Id: <hg.5cd4346eed47.*.*@*> (glob) | |
564 | To: baz@test.com, foo@bar |
|
595 | To: baz@test.com, foo@bar | |
565 |
|
596 | |||
566 |
changeset |
|
597 | changeset 5cd4346eed47 in $TESTTMP/b | |
567 |
details: http://test/b?cmd=changeset;node= |
|
598 | details: http://test/b?cmd=changeset;node=5cd4346eed47 | |
568 | description: default template |
|
599 | description: default template | |
569 |
|
600 | |||
570 | with style: |
|
601 | with style: | |
@@ -588,11 +619,11 b' with style:' | |||||
588 | Date: * (glob) |
|
619 | Date: * (glob) | |
589 | Subject: with style |
|
620 | Subject: with style | |
590 | From: test@test.com |
|
621 | From: test@test.com | |
591 |
X-Hg-Notification: changeset |
|
622 | X-Hg-Notification: changeset ec8d9d852f56 | |
592 |
Message-Id: <hg. |
|
623 | Message-Id: <hg.ec8d9d852f56.*.*@*> (glob) | |
593 | To: baz@test.com, foo@bar |
|
624 | To: baz@test.com, foo@bar | |
594 |
|
625 | |||
595 | changeset 9e2c3a8e9c43 |
|
626 | changeset ec8d9d852f56 | |
596 |
|
627 | |||
597 | with template (overrides style): |
|
628 | with template (overrides style): | |
598 |
|
629 | |||
@@ -609,10 +640,10 b' with template (overrides style):' | |||||
609 |
Content-Type: text/plain; |
|
640 | Content-Type: text/plain; charset="us-ascii" | |
610 | Content-Transfer-Encoding: 7bit |
|
641 | Content-Transfer-Encoding: 7bit | |
611 | Date: * (glob) |
|
642 | Date: * (glob) | |
612 |
Subject: |
|
643 | Subject: 14721b538ae3: with template | |
613 | From: test@test.com |
|
644 | From: test@test.com | |
614 |
X-Hg-Notification: changeset |
|
645 | X-Hg-Notification: changeset 14721b538ae3 | |
615 |
Message-Id: <hg. |
|
646 | Message-Id: <hg.14721b538ae3.*.*@*> (glob) | |
616 | To: baz@test.com, foo@bar |
|
647 | To: baz@test.com, foo@bar | |
617 |
|
648 | |||
618 | with template |
|
649 | with template |
General Comments 0
You need to be logged in to leave comments.
Login now