##// END OF EJS Templates
fastexport: adjust output to be more canonical...
Joerg Sonnenberger -
r45345:edffab2c stable
parent child Browse files
Show More
@@ -53,7 +53,7 b' def convert_to_git_user(authormap, user,'
53 53
54 54 def convert_to_git_date(date):
55 55 timestamp, utcoff = date
56 tzsign = b"+" if utcoff < 0 else b"-"
56 tzsign = b"+" if utcoff <= 0 else b"-"
57 57 if utcoff % 60 != 0:
58 58 raise error.Abort(
59 59 _(b"UTC offset in %b is not an integer number of seconds") % (date,)
@@ -10,7 +10,7 b''
10 10 $ hg up -r 10
11 11 13 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 12 $ hg rm nf10
13 $ hg commit -u debugbuilddag --date 'Thu Jan 01 00:00:12 1970 +0000' -m r12
13 $ hg commit -u debugbuilddag --date 'Thu Jan 01 02:30:12 1970 +0230' -m r12
14 14 created new head
15 15 $ hg up -r 11
16 16 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -20,20 +20,20 b''
20 20 $ hg commit -m debugbuilddag --date 'Thu Jan 01 00:00:13 1970 +0000'
21 21
22 22 $ hg log -G
23 @ changeset: 13:e5c379648af4
23 @ changeset: 13:5544befcb7ce
24 24 |\ branch: both
25 25 | | tag: tip
26 26 | | parent: 11:2cbd52c10e88
27 | | parent: 12:4f31c9604af6
27 | | parent: 12:66d0c21243be
28 28 | | user: test
29 29 | | date: Thu Jan 01 00:00:13 1970 +0000
30 30 | | summary: debugbuilddag
31 31 | |
32 | o changeset: 12:4f31c9604af6
32 | o changeset: 12:66d0c21243be
33 33 | | branch: both
34 34 | | parent: 10:9220596cb068
35 35 | | user: debugbuilddag
36 | | date: Thu Jan 01 00:00:12 1970 +0000
36 | | date: Thu Jan 01 02:30:12 1970 +0230
37 37 | | summary: r12
38 38 | |
39 39 o | changeset: 11:2cbd52c10e88
@@ -150,7 +150,7 b''
150 150
151 151 commit refs/heads/default
152 152 mark :3
153 committer "debugbuilddag" <debugbuilddag> 0 -0000
153 committer "debugbuilddag" <debugbuilddag> 0 +0000
154 154 data 2
155 155 r0
156 156 M 644 :1 mf
@@ -197,7 +197,7 b''
197 197
198 198 commit refs/heads/default
199 199 mark :7
200 committer "debugbuilddag" <debugbuilddag> 1 -0000
200 committer "debugbuilddag" <debugbuilddag> 1 +0000
201 201 data 2
202 202 r1
203 203 from :3
@@ -245,7 +245,7 b''
245 245
246 246 commit refs/heads/name1
247 247 mark :11
248 committer "debugbuilddag" <debugbuilddag> 2 -0000
248 committer "debugbuilddag" <debugbuilddag> 2 +0000
249 249 data 2
250 250 r2
251 251 from :7
@@ -293,7 +293,7 b''
293 293
294 294 commit refs/heads/name1
295 295 mark :15
296 committer "debugbuilddag" <debugbuilddag> 3 -0000
296 committer "debugbuilddag" <debugbuilddag> 3 +0000
297 297 data 2
298 298 r3
299 299 from :11
@@ -341,7 +341,7 b''
341 341
342 342 commit refs/heads/name1
343 343 mark :19
344 committer "debugbuilddag" <debugbuilddag> 4 -0000
344 committer "debugbuilddag" <debugbuilddag> 4 +0000
345 345 data 2
346 346 r4
347 347 from :15
@@ -389,7 +389,7 b''
389 389
390 390 commit refs/heads/name2
391 391 mark :23
392 committer "debugbuilddag" <debugbuilddag> 5 -0000
392 committer "debugbuilddag" <debugbuilddag> 5 +0000
393 393 data 2
394 394 r5
395 395 from :7
@@ -437,7 +437,7 b''
437 437
438 438 commit refs/heads/name2
439 439 mark :27
440 committer "debugbuilddag" <debugbuilddag> 6 -0000
440 committer "debugbuilddag" <debugbuilddag> 6 +0000
441 441 data 2
442 442 r6
443 443 from :23
@@ -485,7 +485,7 b''
485 485
486 486 commit refs/heads/name2
487 487 mark :31
488 committer "debugbuilddag" <debugbuilddag> 7 -0000
488 committer "debugbuilddag" <debugbuilddag> 7 +0000
489 489 data 2
490 490 r7
491 491 from :27
@@ -533,7 +533,7 b''
533 533
534 534 commit refs/heads/name2
535 535 mark :35
536 committer "debugbuilddag" <debugbuilddag> 8 -0000
536 committer "debugbuilddag" <debugbuilddag> 8 +0000
537 537 data 2
538 538 r8
539 539 from :31
@@ -581,7 +581,7 b''
581 581
582 582 commit refs/heads/both
583 583 mark :39
584 committer "debugbuilddag" <debugbuilddag> 9 -0000
584 committer "debugbuilddag" <debugbuilddag> 9 +0000
585 585 data 2
586 586 r9
587 587 from :35
@@ -633,7 +633,7 b''
633 633
634 634 commit refs/heads/both
635 635 mark :43
636 committer "debugbuilddag" <debugbuilddag> 10 -0000
636 committer "debugbuilddag" <debugbuilddag> 10 +0000
637 637 data 3
638 638 r10
639 639 from :39
@@ -681,7 +681,7 b''
681 681
682 682 commit refs/heads/both
683 683 mark :47
684 committer "debugbuilddag" <debugbuilddag> 11 -0000
684 committer "debugbuilddag" <debugbuilddag> 11 +0000
685 685 data 3
686 686 r11
687 687 from :43
@@ -691,7 +691,7 b''
691 691
692 692 commit refs/heads/both
693 693 mark :48
694 committer "debugbuilddag" <debugbuilddag> 12 -0000
694 committer "debugbuilddag" <debugbuilddag> 12 +0230
695 695 data 3
696 696 r12
697 697 from :43
@@ -699,7 +699,7 b''
699 699
700 700 commit refs/heads/both
701 701 mark :49
702 committer "test" <test> 13 -0000
702 committer "test" <test> 13 +0000
703 703 data 13
704 704 debugbuilddag
705 705 from :47
@@ -754,8 +754,8 b''
754 754 33fbc651630ffa7ccbebfe4eb91320a873e7291c
755 755 868d828870663d075cdcff502d26cf8445ce068e
756 756 2cbd52c10e88ce604402dc83a869ec4f07765b3d
757 4f31c9604af676986343d775b05695f535e8db5e
758 e5c379648af4c9fa3b5546ab7ee6e61a36082830
757 66d0c21243be072f82ced64aa730ab0367252451
758 5544befcb7ce4a558ed9e19909e16af574a2a3c6
759 759
760 760 $ hg fastexport --export-marks fastexport.marks2 -r 0
761 761 blob
@@ -793,7 +793,7 b''
793 793
794 794 commit refs/heads/default
795 795 mark :3
796 committer "debugbuilddag" <debugbuilddag> 0 -0000
796 committer "debugbuilddag" <debugbuilddag> 0 +0000
797 797 data 2
798 798 r0
799 799 M 644 :1 mf
@@ -845,7 +845,7 b''
845 845
846 846 commit refs/heads/default
847 847 mark :7
848 committer "debugbuilddag" <debugbuilddag> 1 -0000
848 committer "debugbuilddag" <debugbuilddag> 1 +0000
849 849 data 2
850 850 r1
851 851 from :3
@@ -861,5 +861,5 b''
861 861 data 4
862 862 foo
863 863
864 abort: Unable to parse user into person and email for revision 4f71ca786403919cd16669d94ff7cd1c09437a44
864 abort: Unable to parse user into person and email for revision 65a3f69b9b519de73d755472c1ab05990ab8a7f7
865 865 [255]
General Comments 0
You need to be logged in to leave comments. Login now