##// END OF EJS Templates
export: show 'Date' header in a format that also is readable for humans...
Mads Kiilerich -
r18648:76b69ccc default
parent child Browse files
Show More
@@ -575,6 +575,7 b" def export(repo, revs, template='hg-%h.p"
575 write("# HG changeset patch\n")
575 write("# HG changeset patch\n")
576 write("# User %s\n" % ctx.user())
576 write("# User %s\n" % ctx.user())
577 write("# Date %d %d\n" % ctx.date())
577 write("# Date %d %d\n" % ctx.date())
578 write("# %s\n" % util.datestr(ctx.date()))
578 if branch and branch != 'default':
579 if branch and branch != 'default':
579 write("# Branch %s\n" % branch)
580 write("# Branch %s\n" % branch)
580 write("# Node ID %s\n" % hex(node))
581 write("# Node ID %s\n" % hex(node))
@@ -181,6 +181,7 b' path expanding'
181 # HG changeset patch
181 # HG changeset patch
182 # User test
182 # User test
183 # Date 0 0
183 # Date 0 0
184 # Thu Jan 01 00:00:00 1970 +0000
184 # Node ID e63c23eaa88ae77967edcf4ea194d31167c478b0
185 # Node ID e63c23eaa88ae77967edcf4ea194d31167c478b0
185 # Parent 0000000000000000000000000000000000000000
186 # Parent 0000000000000000000000000000000000000000
186 foo
187 foo
@@ -224,7 +225,7 b' simple shell aliases'
224 2
225 2
225
226
226 $ hg tglog
227 $ hg tglog
227 @ 1:7e7f92de180e: 'bar'
228 @ 1:042423737847: 'bar'
228 |
229 |
229 o 0:e63c23eaa88a: 'foo'
230 o 0:e63c23eaa88a: 'foo'
230
231
@@ -237,15 +238,15 b' shadowing'
237 idalias idaliaslong idaliasshell identify import incoming init
238 idalias idaliaslong idaliasshell identify import incoming init
238 [255]
239 [255]
239 $ hg id
240 $ hg id
240 7e7f92de180e tip
241 042423737847 tip
241 $ hg ida
242 $ hg ida
242 hg: command 'ida' is ambiguous:
243 hg: command 'ida' is ambiguous:
243 idalias idaliaslong idaliasshell
244 idalias idaliaslong idaliasshell
244 [255]
245 [255]
245 $ hg idalias
246 $ hg idalias
246 7e7f92de180e tip
247 042423737847 tip
247 $ hg idaliasl
248 $ hg idaliasl
248 7e7f92de180e tip
249 042423737847 tip
249 $ hg idaliass
250 $ hg idaliass
250 test
251 test
251 $ hg parentsshell
252 $ hg parentsshell
@@ -123,6 +123,7 b' Exporting revision -2 to a file:'
123 # HG changeset patch
123 # HG changeset patch
124 # User test
124 # User test
125 # Date 0 0
125 # Date 0 0
126 # Thu Jan 01 00:00:00 1970 +0000
126 # Node ID 5f17a83f5fbd9414006a5e563eab4c8a00729efd
127 # Node ID 5f17a83f5fbd9414006a5e563eab4c8a00729efd
127 # Parent 747d3c68f8ec44bb35816bfcd59aeb50b9654c2f
128 # Parent 747d3c68f8ec44bb35816bfcd59aeb50b9654c2f
128 foo-10
129 foo-10
@@ -169,6 +170,7 b' Check for color output'
169 # HG changeset patch
170 # HG changeset patch
170 # User test
171 # User test
171 # Date 0 0
172 # Date 0 0
173 # Thu Jan 01 00:00:00 1970 +0000
172 # Node ID * (glob)
174 # Node ID * (glob)
173 # Parent * (glob)
175 # Parent * (glob)
174 !"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
176 !"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
@@ -84,6 +84,7 b' Graft a rename:'
84 # HG changeset patch
84 # HG changeset patch
85 # User foo
85 # User foo
86 # Date 0 0
86 # Date 0 0
87 # Thu Jan 01 00:00:00 1970 +0000
87 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
88 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
88 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e
89 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e
89 2
90 2
@@ -324,6 +325,7 b' Resolve conflicted graft'
324 # HG changeset patch
325 # HG changeset patch
325 # User bar
326 # User bar
326 # Date 0 0
327 # Date 0 0
328 # Thu Jan 01 00:00:00 1970 +0000
327 # Node ID 64ecd9071ce83c6e62f538d8ce7709d53f32ebf7
329 # Node ID 64ecd9071ce83c6e62f538d8ce7709d53f32ebf7
328 # Parent 4bdb9a9d0b84ffee1d30f0dfc7744cade17aa19c
330 # Parent 4bdb9a9d0b84ffee1d30f0dfc7744cade17aa19c
329 1
331 1
@@ -351,6 +353,7 b' Resolve conflicted graft with rename'
351 # HG changeset patch
353 # HG changeset patch
352 # User test
354 # User test
353 # Date 0 0
355 # Date 0 0
356 # Thu Jan 01 00:00:00 1970 +0000
354 # Node ID 2e80e1351d6ed50302fe1e05f8bd1d4d412b6e11
357 # Node ID 2e80e1351d6ed50302fe1e05f8bd1d4d412b6e11
355 # Parent e5a51ae854a8bbaaf25cc5c6a57ff46042dadbb4
358 # Parent e5a51ae854a8bbaaf25cc5c6a57ff46042dadbb4
356 2
359 2
@@ -295,6 +295,7 b' dropped revision.'
295 # HG changeset patch
295 # HG changeset patch
296 # User test
296 # User test
297 # Date 0 0
297 # Date 0 0
298 # Thu Jan 01 00:00:00 1970 +0000
298 # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323
299 # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323
299 # Parent 0189ba417d34df9dda55f88b637dcae9917b5964
300 # Parent 0189ba417d34df9dda55f88b637dcae9917b5964
300 +4
301 +4
@@ -34,7 +34,7 b' import exported patch'
34 $ hg --cwd b import ../exported-tip.patch
34 $ hg --cwd b import ../exported-tip.patch
35 applying ../exported-tip.patch
35 applying ../exported-tip.patch
36
36
37 message and committer should be same
37 message and committer and date should be same
38
38
39 $ hg --cwd b tip
39 $ hg --cwd b tip
40 changeset: 1:1d4bd90af0e4
40 changeset: 1:1d4bd90af0e4
@@ -853,6 +853,7 b' in commit message'
853 # HG changeset patch
853 # HG changeset patch
854 # User User B
854 # User User B
855 # Date 0 0
855 # Date 0 0
856 # Thu Jan 01 00:00:00 1970 +0000
856 # Node ID eb56ab91903632294ac504838508cb370c0901d2
857 # Node ID eb56ab91903632294ac504838508cb370c0901d2
857 # Parent 0000000000000000000000000000000000000000
858 # Parent 0000000000000000000000000000000000000000
858 from: tricky!
859 from: tricky!
@@ -44,6 +44,7 b' http://mercurial.selenic.com/bts/issue11'
44 # HG changeset patch
44 # HG changeset patch
45 # User test
45 # User test
46 # Date 0 0
46 # Date 0 0
47 # Thu Jan 01 00:00:00 1970 +0000
47 # Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
48 # Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
48 # Parent 7fc86ba705e717a721dbc361bf8c9bc05a18ca2f
49 # Parent 7fc86ba705e717a721dbc361bf8c9bc05a18ca2f
49 5
50 5
@@ -528,6 +528,7 b' Keywords should not be expanded in patch'
528 # HG changeset patch
528 # HG changeset patch
529 # User User Name <user@example.com>
529 # User User Name <user@example.com>
530 # Date 1 0
530 # Date 1 0
531 # Thu Jan 01 00:00:01 1970 +0000
531 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
532 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
532 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9
533 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9
533 cndiff
534 cndiff
@@ -27,6 +27,7 b''
27 # HG changeset patch
27 # HG changeset patch
28 # User test
28 # User test
29 # Date 1 0
29 # Date 1 0
30 # Thu Jan 01 00:00:01 1970 +0000
30 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
31 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
31 # Parent 0000000000000000000000000000000000000000
32 # Parent 0000000000000000000000000000000000000000
32 a
33 a
@@ -98,6 +99,7 b''
98 # HG changeset patch
99 # HG changeset patch
99 # User test
100 # User test
100 # Date 1 0
101 # Date 1 0
102 # Thu Jan 01 00:00:01 1970 +0000
101 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
103 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
102 # Parent 0000000000000000000000000000000000000000
104 # Parent 0000000000000000000000000000000000000000
103 a
105 a
@@ -126,6 +128,7 b''
126 # HG changeset patch
128 # HG changeset patch
127 # User test
129 # User test
128 # Date 2 0
130 # Date 2 0
131 # Thu Jan 01 00:00:02 1970 +0000
129 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
132 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
130 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
133 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
131 b
134 b
@@ -258,6 +261,7 b' no mime encoding for email --test:'
258 # HG changeset patch
261 # HG changeset patch
259 # User test
262 # User test
260 # Date 4 0
263 # Date 4 0
264 # Thu Jan 01 00:00:04 1970 +0000
261 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
265 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
262 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
266 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
263 utf-8 content
267 utf-8 content
@@ -297,21 +301,23 b' mime encoded mbox (base64):'
297 To: foo
301 To: foo
298 Cc: bar
302 Cc: bar
299
303
300 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgOTA5
304 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojICAgICAgVGh1IEph
301 YTAwZTEzZTlkNzhiNTc1YWVlZTIzZGRkYmFkYTQ2ZDVhMTQzZgojIFBhcmVudCAgZmYyYzlmYTIw
305 biAwMSAwMDowMDowNCAxOTcwICswMDAwCiMgTm9kZSBJRCA5MDlhMDBlMTNlOWQ3OGI1NzVhZWVl
302 MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5Zgp1dGYtOCBjb250ZW50CgpkaWZmIC1yIGZm
306 MjNkZGRiYWRhNDZkNWExNDNmCiMgUGFyZW50ICBmZjJjOWZhMjAxOGIxNWZhNzRiMzMzNjNiZGE5
303 MmM5ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgZGVzY3JpcHRpb24KLS0tIC9kZXYvbnVsbAlUaHUg
307 NTI3MzIzZTJhOTlmCnV0Zi04IGNvbnRlbnQKCmRpZmYgLXIgZmYyYzlmYTIwMThiIC1yIDkwOWEw
304 SmFuIDAxIDAwOjAwOjAwIDE5NzAgKzAwMDAKKysrIGIvZGVzY3JpcHRpb24JVGh1IEphbiAwMSAw
308 MGUxM2U5ZCBkZXNjcmlwdGlvbgotLS0gL2Rldi9udWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3
305 MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMyBAQAorYSBtdWx0aWxpbmUKKworZGVzY3Jp
309 MCArMDAwMAorKysgYi9kZXNjcmlwdGlvbglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK
306 cHRpb24KZGlmZiAtciBmZjJjOWZhMjAxOGIgLXIgOTA5YTAwZTEzZTlkIHV0ZgotLS0gL2Rldi9u
310 QEAgLTAsMCArMSwzIEBACithIG11bHRpbGluZQorCitkZXNjcmlwdGlvbgpkaWZmIC1yIGZmMmM5
307 dWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCArMDAwMAorKysgYi91dGYJVGh1IEphbiAwMSAw
311 ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDow
308 MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMSBAQAoraMO2bW1hIQo=
312 MDowMCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAK
313 QEAgLTAsMCArMSwxIEBACitow7ZtbWEhCg==
309
314
310
315
311 $ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")'
316 $ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")'
312 # HG changeset patch
317 # HG changeset patch
313 # User test
318 # User test
314 # Date 4 0
319 # Date 4 0
320 # Thu Jan 01 00:00:04 1970 +0000
315 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
321 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
316 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
322 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
317 utf-8 content
323 utf-8 content
@@ -357,6 +363,7 b' no mime encoding for email --test:'
357 # HG changeset patch
363 # HG changeset patch
358 # User test
364 # User test
359 # Date 4 0
365 # Date 4 0
366 # Thu Jan 01 00:00:04 1970 +0000
360 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
367 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
361 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
368 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
362 long line
369 long line
@@ -407,6 +414,7 b' mime encoded mbox (quoted-printable):'
407 # HG changeset patch
414 # HG changeset patch
408 # User test
415 # User test
409 # Date 4 0
416 # Date 4 0
417 # Thu Jan 01 00:00:04 1970 +0000
410 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
418 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
411 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
419 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
412 long line
420 long line
@@ -465,6 +473,7 b' fake ascii mbox:'
465 # HG changeset patch
473 # HG changeset patch
466 # User test
474 # User test
467 # Date 5 0
475 # Date 5 0
476 # Thu Jan 01 00:00:05 1970 +0000
468 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
477 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
469 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
478 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
470 isolatin 8-bit encoding
479 isolatin 8-bit encoding
@@ -513,6 +522,7 b' test diffstat for single patch:'
513 # HG changeset patch
522 # HG changeset patch
514 # User test
523 # User test
515 # Date 3 0
524 # Date 3 0
525 # Thu Jan 01 00:00:03 1970 +0000
516 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
526 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
517 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
527 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
518 c
528 c
@@ -590,6 +600,7 b' test diffstat for multiple patches:'
590 # HG changeset patch
600 # HG changeset patch
591 # User test
601 # User test
592 # Date 1 0
602 # Date 1 0
603 # Thu Jan 01 00:00:01 1970 +0000
593 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
604 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
594 # Parent 0000000000000000000000000000000000000000
605 # Parent 0000000000000000000000000000000000000000
595 a
606 a
@@ -622,6 +633,7 b' test diffstat for multiple patches:'
622 # HG changeset patch
633 # HG changeset patch
623 # User test
634 # User test
624 # Date 2 0
635 # Date 2 0
636 # Thu Jan 01 00:00:02 1970 +0000
625 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
637 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
626 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
638 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
627 b
639 b
@@ -659,6 +671,7 b' test inline for single patch:'
659 # HG changeset patch
671 # HG changeset patch
660 # User test
672 # User test
661 # Date 3 0
673 # Date 3 0
674 # Thu Jan 01 00:00:03 1970 +0000
662 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
675 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
663 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
676 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
664 c
677 c
@@ -698,6 +711,7 b' test inline for single patch (quoted-pri'
698 # HG changeset patch
711 # HG changeset patch
699 # User test
712 # User test
700 # Date 4 0
713 # Date 4 0
714 # Thu Jan 01 00:00:04 1970 +0000
701 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
715 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
702 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
716 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
703 long line
717 long line
@@ -771,6 +785,7 b' test inline for multiple patches:'
771 # HG changeset patch
785 # HG changeset patch
772 # User test
786 # User test
773 # Date 1 0
787 # Date 1 0
788 # Thu Jan 01 00:00:01 1970 +0000
774 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
789 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
775 # Parent 0000000000000000000000000000000000000000
790 # Parent 0000000000000000000000000000000000000000
776 a
791 a
@@ -805,6 +820,7 b' test inline for multiple patches:'
805 # HG changeset patch
820 # HG changeset patch
806 # User test
821 # User test
807 # Date 2 0
822 # Date 2 0
823 # Thu Jan 01 00:00:02 1970 +0000
808 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
824 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
809 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
825 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
810 b
826 b
@@ -839,6 +855,7 b' test inline for multiple patches:'
839 # HG changeset patch
855 # HG changeset patch
840 # User test
856 # User test
841 # Date 4 0
857 # Date 4 0
858 # Thu Jan 01 00:00:04 1970 +0000
842 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
859 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
843 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
860 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
844 long line
861 long line
@@ -902,6 +919,7 b' test attach for single patch:'
902 # HG changeset patch
919 # HG changeset patch
903 # User test
920 # User test
904 # Date 3 0
921 # Date 3 0
922 # Thu Jan 01 00:00:03 1970 +0000
905 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
923 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
906 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
924 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
907 c
925 c
@@ -949,6 +967,7 b' test attach for single patch (quoted-pri'
949 # HG changeset patch
967 # HG changeset patch
950 # User test
968 # User test
951 # Date 4 0
969 # Date 4 0
970 # Thu Jan 01 00:00:04 1970 +0000
952 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
971 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
953 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
972 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
954 long line
973 long line
@@ -1002,6 +1021,7 b' test attach and body for single patch:'
1002 # HG changeset patch
1021 # HG changeset patch
1003 # User test
1022 # User test
1004 # Date 3 0
1023 # Date 3 0
1024 # Thu Jan 01 00:00:03 1970 +0000
1005 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1025 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1006 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1026 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1007 c
1027 c
@@ -1021,6 +1041,7 b' test attach and body for single patch:'
1021 # HG changeset patch
1041 # HG changeset patch
1022 # User test
1042 # User test
1023 # Date 3 0
1043 # Date 3 0
1044 # Thu Jan 01 00:00:03 1970 +0000
1024 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1045 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1025 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1046 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1026 c
1047 c
@@ -1087,6 +1108,7 b' test attach for multiple patches:'
1087 # HG changeset patch
1108 # HG changeset patch
1088 # User test
1109 # User test
1089 # Date 1 0
1110 # Date 1 0
1111 # Thu Jan 01 00:00:01 1970 +0000
1090 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1112 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1091 # Parent 0000000000000000000000000000000000000000
1113 # Parent 0000000000000000000000000000000000000000
1092 a
1114 a
@@ -1130,6 +1152,7 b' test attach for multiple patches:'
1130 # HG changeset patch
1152 # HG changeset patch
1131 # User test
1153 # User test
1132 # Date 2 0
1154 # Date 2 0
1155 # Thu Jan 01 00:00:02 1970 +0000
1133 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1156 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1134 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1157 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1135 b
1158 b
@@ -1173,6 +1196,7 b' test attach for multiple patches:'
1173 # HG changeset patch
1196 # HG changeset patch
1174 # User test
1197 # User test
1175 # Date 4 0
1198 # Date 4 0
1199 # Thu Jan 01 00:00:04 1970 +0000
1176 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1200 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1177 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
1201 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
1178 long line
1202 long line
@@ -1241,6 +1265,7 b' test intro for single patch:'
1241 # HG changeset patch
1265 # HG changeset patch
1242 # User test
1266 # User test
1243 # Date 3 0
1267 # Date 3 0
1268 # Thu Jan 01 00:00:03 1970 +0000
1244 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1269 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1245 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1270 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1246 c
1271 c
@@ -1291,6 +1316,7 b' test --desc without --intro for a single'
1291 # HG changeset patch
1316 # HG changeset patch
1292 # User test
1317 # User test
1293 # Date 3 0
1318 # Date 3 0
1319 # Thu Jan 01 00:00:03 1970 +0000
1294 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1320 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1295 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1321 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1296 c
1322 c
@@ -1342,6 +1368,7 b' test intro for multiple patches:'
1342 # HG changeset patch
1368 # HG changeset patch
1343 # User test
1369 # User test
1344 # Date 1 0
1370 # Date 1 0
1371 # Thu Jan 01 00:00:01 1970 +0000
1345 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1372 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1346 # Parent 0000000000000000000000000000000000000000
1373 # Parent 0000000000000000000000000000000000000000
1347 a
1374 a
@@ -1370,6 +1397,7 b' test intro for multiple patches:'
1370 # HG changeset patch
1397 # HG changeset patch
1371 # User test
1398 # User test
1372 # Date 2 0
1399 # Date 2 0
1400 # Thu Jan 01 00:00:02 1970 +0000
1373 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1401 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1374 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1402 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1375 b
1403 b
@@ -1404,6 +1432,7 b' test reply-to via config:'
1404 # HG changeset patch
1432 # HG changeset patch
1405 # User test
1433 # User test
1406 # Date 3 0
1434 # Date 3 0
1435 # Thu Jan 01 00:00:03 1970 +0000
1407 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1436 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1408 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1437 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1409 c
1438 c
@@ -1438,6 +1467,7 b' test reply-to via command line:'
1438 # HG changeset patch
1467 # HG changeset patch
1439 # User test
1468 # User test
1440 # Date 3 0
1469 # Date 3 0
1470 # Thu Jan 01 00:00:03 1970 +0000
1441 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1471 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1442 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1472 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1443 c
1473 c
@@ -1480,6 +1510,7 b' test inline for single named patch:'
1480 # HG changeset patch
1510 # HG changeset patch
1481 # User test
1511 # User test
1482 # Date 3 0
1512 # Date 3 0
1513 # Thu Jan 01 00:00:03 1970 +0000
1483 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1514 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1484 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1515 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1485 c
1516 c
@@ -1536,6 +1567,7 b' test inline for multiple named/unnamed p'
1536 # HG changeset patch
1567 # HG changeset patch
1537 # User test
1568 # User test
1538 # Date 1 0
1569 # Date 1 0
1570 # Thu Jan 01 00:00:01 1970 +0000
1539 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1571 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1540 # Parent 0000000000000000000000000000000000000000
1572 # Parent 0000000000000000000000000000000000000000
1541 a
1573 a
@@ -1570,6 +1602,7 b' test inline for multiple named/unnamed p'
1570 # HG changeset patch
1602 # HG changeset patch
1571 # User test
1603 # User test
1572 # Date 2 0
1604 # Date 2 0
1605 # Thu Jan 01 00:00:02 1970 +0000
1573 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1606 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1574 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1607 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1575 b
1608 b
@@ -1607,6 +1640,7 b' test inreplyto:'
1607 # HG changeset patch
1640 # HG changeset patch
1608 # User test
1641 # User test
1609 # Date 0 0
1642 # Date 0 0
1643 # Thu Jan 01 00:00:00 1970 +0000
1610 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed
1644 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed
1611 # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e
1645 # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e
1612 Added tag two, two.diff for changeset ff2c9fa2018b
1646 Added tag two, two.diff for changeset ff2c9fa2018b
@@ -1646,6 +1680,7 b' no intro message in non-interactive mode'
1646 # HG changeset patch
1680 # HG changeset patch
1647 # User test
1681 # User test
1648 # Date 1 0
1682 # Date 1 0
1683 # Thu Jan 01 00:00:01 1970 +0000
1649 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1684 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1650 # Parent 0000000000000000000000000000000000000000
1685 # Parent 0000000000000000000000000000000000000000
1651 a
1686 a
@@ -1674,6 +1709,7 b' no intro message in non-interactive mode'
1674 # HG changeset patch
1709 # HG changeset patch
1675 # User test
1710 # User test
1676 # Date 2 0
1711 # Date 2 0
1712 # Thu Jan 01 00:00:02 1970 +0000
1677 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1713 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1678 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1714 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1679 b
1715 b
@@ -1728,6 +1764,7 b' no intro message in non-interactive mode'
1728 # HG changeset patch
1764 # HG changeset patch
1729 # User test
1765 # User test
1730 # Date 1 0
1766 # Date 1 0
1767 # Thu Jan 01 00:00:01 1970 +0000
1731 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1768 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1732 # Parent 0000000000000000000000000000000000000000
1769 # Parent 0000000000000000000000000000000000000000
1733 a
1770 a
@@ -1756,6 +1793,7 b' no intro message in non-interactive mode'
1756 # HG changeset patch
1793 # HG changeset patch
1757 # User test
1794 # User test
1758 # Date 2 0
1795 # Date 2 0
1796 # Thu Jan 01 00:00:02 1970 +0000
1759 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1797 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1760 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1798 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1761 b
1799 b
@@ -1789,6 +1827,7 b' test single flag for single patch:'
1789 # HG changeset patch
1827 # HG changeset patch
1790 # User test
1828 # User test
1791 # Date 3 0
1829 # Date 3 0
1830 # Thu Jan 01 00:00:03 1970 +0000
1792 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1831 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1793 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1832 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1794 c
1833 c
@@ -1840,6 +1879,7 b' test single flag for multiple patches:'
1840 # HG changeset patch
1879 # HG changeset patch
1841 # User test
1880 # User test
1842 # Date 1 0
1881 # Date 1 0
1882 # Thu Jan 01 00:00:01 1970 +0000
1843 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1883 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1844 # Parent 0000000000000000000000000000000000000000
1884 # Parent 0000000000000000000000000000000000000000
1845 a
1885 a
@@ -1868,6 +1908,7 b' test single flag for multiple patches:'
1868 # HG changeset patch
1908 # HG changeset patch
1869 # User test
1909 # User test
1870 # Date 2 0
1910 # Date 2 0
1911 # Thu Jan 01 00:00:02 1970 +0000
1871 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1912 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1872 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1913 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1873 b
1914 b
@@ -1901,6 +1942,7 b' test multiple flags for single patch:'
1901 # HG changeset patch
1942 # HG changeset patch
1902 # User test
1943 # User test
1903 # Date 3 0
1944 # Date 3 0
1945 # Thu Jan 01 00:00:03 1970 +0000
1904 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1946 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1905 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1947 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1906 c
1948 c
@@ -1952,6 +1994,7 b' test multiple flags for multiple patches'
1952 # HG changeset patch
1994 # HG changeset patch
1953 # User test
1995 # User test
1954 # Date 1 0
1996 # Date 1 0
1997 # Thu Jan 01 00:00:01 1970 +0000
1955 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1998 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1956 # Parent 0000000000000000000000000000000000000000
1999 # Parent 0000000000000000000000000000000000000000
1957 a
2000 a
@@ -1980,6 +2023,7 b' test multiple flags for multiple patches'
1980 # HG changeset patch
2023 # HG changeset patch
1981 # User test
2024 # User test
1982 # Date 2 0
2025 # Date 2 0
2026 # Thu Jan 01 00:00:02 1970 +0000
1983 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2027 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1984 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
2028 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1985 b
2029 b
@@ -2017,6 +2061,7 b' test multi-address parsing:'
2017 # HG changeset patch
2061 # HG changeset patch
2018 # User test
2062 # User test
2019 # Date 1 0
2063 # Date 1 0
2064 # Thu Jan 01 00:00:01 1970 +0000
2020 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2065 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2021 # Parent 0000000000000000000000000000000000000000
2066 # Parent 0000000000000000000000000000000000000000
2022 a
2067 a
@@ -2056,6 +2101,7 b' test multi-byte domain parsing:'
2056 # HG changeset patch
2101 # HG changeset patch
2057 # User test
2102 # User test
2058 # Date 1 0
2103 # Date 1 0
2104 # Thu Jan 01 00:00:01 1970 +0000
2059 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2105 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2060 # Parent 0000000000000000000000000000000000000000
2106 # Parent 0000000000000000000000000000000000000000
2061 a
2107 a
@@ -2144,6 +2190,7 b' test outgoing:'
2144 # HG changeset patch
2190 # HG changeset patch
2145 # User test
2191 # User test
2146 # Date 3 0
2192 # Date 3 0
2193 # Thu Jan 01 00:00:03 1970 +0000
2147 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
2194 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
2148 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2195 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2149 c
2196 c
@@ -2171,6 +2218,7 b' test outgoing:'
2171 # HG changeset patch
2218 # HG changeset patch
2172 # User test
2219 # User test
2173 # Date 4 0
2220 # Date 4 0
2221 # Thu Jan 01 00:00:04 1970 +0000
2174 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
2222 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
2175 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
2223 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
2176 utf-8 content
2224 utf-8 content
@@ -2205,6 +2253,7 b' test outgoing:'
2205 # HG changeset patch
2253 # HG changeset patch
2206 # User test
2254 # User test
2207 # Date 4 0
2255 # Date 4 0
2256 # Thu Jan 01 00:00:04 1970 +0000
2208 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2257 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2209 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
2258 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
2210 long line
2259 long line
@@ -2248,6 +2297,7 b' test outgoing:'
2248 # HG changeset patch
2297 # HG changeset patch
2249 # User test
2298 # User test
2250 # Date 5 0
2299 # Date 5 0
2300 # Thu Jan 01 00:00:05 1970 +0000
2251 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2301 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2252 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2302 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2253 isolatin 8-bit encoding
2303 isolatin 8-bit encoding
@@ -2275,6 +2325,7 b' test outgoing:'
2275 # HG changeset patch
2325 # HG changeset patch
2276 # User test
2326 # User test
2277 # Date 0 0
2327 # Date 0 0
2328 # Thu Jan 01 00:00:00 1970 +0000
2278 # Node ID 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2329 # Node ID 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2279 # Parent 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2330 # Parent 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2280 Added tag zero, zero.foo for changeset 8580ff50825a
2331 Added tag zero, zero.foo for changeset 8580ff50825a
@@ -2303,6 +2354,7 b' test outgoing:'
2303 # HG changeset patch
2354 # HG changeset patch
2304 # User test
2355 # User test
2305 # Date 4 0
2356 # Date 4 0
2357 # Thu Jan 01 00:00:04 1970 +0000
2306 # Branch test
2358 # Branch test
2307 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2359 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2308 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2360 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
@@ -2338,6 +2390,7 b' dest#branch URIs:'
2338 # HG changeset patch
2390 # HG changeset patch
2339 # User test
2391 # User test
2340 # Date 4 0
2392 # Date 4 0
2393 # Thu Jan 01 00:00:04 1970 +0000
2341 # Branch test
2394 # Branch test
2342 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2395 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2343 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2396 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
@@ -569,6 +569,7 b' Interactions between collapse and keepbr'
569 # HG changeset patch
569 # HG changeset patch
570 # User user1
570 # User user1
571 # Date 0 0
571 # Date 0 0
572 # Thu Jan 01 00:00:00 1970 +0000
572 # Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213
573 # Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213
573 # Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09
574 # Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09
574 E
575 E
@@ -102,6 +102,7 b' Fix the 2nd conflict:'
102 # HG changeset patch
102 # HG changeset patch
103 # User test
103 # User test
104 # Date ?????????? ? (glob)
104 # Date ?????????? ? (glob)
105 # * (glob)
105 # Node ID ???????????????????????????????????????? (glob)
106 # Node ID ???????????????????????????????????????? (glob)
106 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0
107 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0
107 P0
108 P0
@@ -124,6 +125,7 b' Update to qtip:'
124 # HG changeset patch
125 # HG changeset patch
125 # User test
126 # User test
126 # Date ?????????? ? (glob)
127 # Date ?????????? ? (glob)
128 # * (glob)
127 # Node ID ???????????????????????????????????????? (glob)
129 # Node ID ???????????????????????????????????????? (glob)
128 # Parent ???????????????????????????????????????? (glob)
130 # Parent ???????????????????????????????????????? (glob)
129 P1
131 P1
@@ -209,6 +211,7 b' Rebase the applied mq patches:'
209 # HG changeset patch
211 # HG changeset patch
210 # User test
212 # User test
211 # Date ?????????? ? (glob)
213 # Date ?????????? ? (glob)
214 # * (glob)
212 # Node ID ???????????????????????????????????????? (glob)
215 # Node ID ???????????????????????????????????????? (glob)
213 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0
216 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0
214 P0 (git)
217 P0 (git)
@@ -224,6 +227,7 b' Rebase the applied mq patches:'
224 # HG changeset patch
227 # HG changeset patch
225 # User test
228 # User test
226 # Date ?????????? ? (glob)
229 # Date ?????????? ? (glob)
230 # * (glob)
227 # Node ID ???????????????????????????????????????? (glob)
231 # Node ID ???????????????????????????????????????? (glob)
228 # Parent ???????????????????????????????????????? (glob)
232 # Parent ???????????????????????????????????????? (glob)
229 P1
233 P1
General Comments 0
You need to be logged in to leave comments. Login now