tests/test-glog.t
changeset 14042 9966c95b8c4f
parent 13631 29c800ee54cf
child 14043 1c1e1232abdc
equal deleted inserted replaced
14041:bcc6ed0f6c3b 14042:9966c95b8c4f
   461   | | |  parent:      31:621d83e11f67
   461   | | |  parent:      31:621d83e11f67
   462   | | |  user:        test
   462   | | |  user:        test
   463   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   463   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   464   | | |  summary:     (32) expand
   464   | | |  summary:     (32) expand
   465   | | |
   465   | | |
   466   | o |  changeset:   31:621d83e11f67
   466   | o |    changeset:   31:621d83e11f67
   467   | | |  parent:      21:d42a756af44d
   467   | |\ \   parent:      21:d42a756af44d
   468   | | |  parent:      30:6e11cd4b648f
   468   | | | |  parent:      30:6e11cd4b648f
   469   | | |  user:        test
       
   470   | | |  date:        Thu Jan 01 00:00:31 1970 +0000
       
   471   | | |  summary:     (31) expand
       
   472   | | |
       
   473   | o |    changeset:   30:6e11cd4b648f
       
   474   | |\ \   parent:      28:44ecd0b9ae99
       
   475   | | | |  parent:      29:cd9bb2be7593
       
   476   | | | |  user:        test
   469   | | | |  user:        test
   477   | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   470   | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
   478   | | | |  summary:     (30) expand
   471   | | | |  summary:     (31) expand
   479   | | | |
   472   | | | |
   480   | | o |  changeset:   29:cd9bb2be7593
   473   | | o |    changeset:   30:6e11cd4b648f
   481   | | | |  parent:      0:e6eb3150255d
   474   | | |\ \   parent:      28:44ecd0b9ae99
   482   | | | |  user:        test
   475   | | | | |  parent:      29:cd9bb2be7593
   483   | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   476   | | | | |  user:        test
   484   | | | |  summary:     (29) regular commit
   477   | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   485   | | | |
   478   | | | | |  summary:     (30) expand
   486   | o | |  changeset:   28:44ecd0b9ae99
   479   | | | | |
   487   | | | |  parent:      1:6db2ef61d156
   480   | | | o |  changeset:   29:cd9bb2be7593
   488   | | | |  parent:      26:7f25b6c2f0b9
   481   | | | | |  parent:      0:e6eb3150255d
   489   | | | |  user:        test
   482   | | | | |  user:        test
   490   | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   483   | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   491   | | | |  summary:     (28) merge zero known
   484   | | | | |  summary:     (29) regular commit
   492   | | | |
   485   | | | | |
   493   o | | |  changeset:   27:886ed638191b
   486   | | o | |    changeset:   28:44ecd0b9ae99
   494   | | | |  parent:      21:d42a756af44d
   487   | | |\ \ \   parent:      1:6db2ef61d156
   495   | | | |  user:        test
   488   | | | | | |  parent:      26:7f25b6c2f0b9
   496   | | | |  date:        Thu Jan 01 00:00:27 1970 +0000
   489   | | | | | |  user:        test
   497   | | | |  summary:     (27) collapse
   490   | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   498   | | | |
   491   | | | | | |  summary:     (28) merge zero known
   499   | o | |  changeset:   26:7f25b6c2f0b9
   492   | | | | | |
   500   | | | |  parent:      18:1aa84d96232a
   493   o | | | | |  changeset:   27:886ed638191b
   501   | | | |  parent:      25:91da8ed57247
   494   |/ / / / /   parent:      21:d42a756af44d
   502   | | | |  user:        test
   495   | | | | |    user:        test
   503   | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   496   | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
   504   | | | |  summary:     (26) merge one known; far right
   497   | | | | |    summary:     (27) collapse
   505   | | | |
   498   | | | | |
   506   | o | |  changeset:   25:91da8ed57247
   499   | | o---+  changeset:   26:7f25b6c2f0b9
   507   | | | |  parent:      21:d42a756af44d
   500   | | | | |  parent:      18:1aa84d96232a
   508   | | | |  parent:      24:a9c19a3d96b7
   501   | | | | |  parent:      25:91da8ed57247
   509   | | | |  user:        test
   502   | | | | |  user:        test
   510   | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   503   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   511   | | | |  summary:     (25) merge one known; far left
   504   | | | | |  summary:     (26) merge one known; far right
   512   | | | |
   505   | | | | |
   513   | o | |  changeset:   24:a9c19a3d96b7
   506   +---o | |  changeset:   25:91da8ed57247
   514   | | | |  parent:      0:e6eb3150255d
   507   | | | | |  parent:      21:d42a756af44d
   515   | | | |  parent:      23:a01cddf0766d
   508   | | | | |  parent:      24:a9c19a3d96b7
   516   | | | |  user:        test
   509   | | | | |  user:        test
   517   | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   510   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   518   | | | |  summary:     (24) merge one known; immediate right
   511   | | | | |  summary:     (25) merge one known; far left
   519   | | | |
   512   | | | | |
   520   | o | |  changeset:   23:a01cddf0766d
   513   | | o | |  changeset:   24:a9c19a3d96b7
   521   | | | |  parent:      1:6db2ef61d156
   514   | | |\| |  parent:      0:e6eb3150255d
   522   | | | |  parent:      22:e0d9cccacb5d
   515   | | | | |  parent:      23:a01cddf0766d
   523   | | | |  user:        test
   516   | | | | |  user:        test
   524   | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   517   | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   525   | | | |  summary:     (23) merge one known; immediate left
   518   | | | | |  summary:     (24) merge one known; immediate right
   526   | | | |
   519   | | | | |
   527   | o | |  changeset:   22:e0d9cccacb5d
   520   | | o | |  changeset:   23:a01cddf0766d
   528   |/ / /   parent:      18:1aa84d96232a
   521   | |/| | |  parent:      1:6db2ef61d156
   529   | | |    parent:      21:d42a756af44d
   522   | | | | |  parent:      22:e0d9cccacb5d
   530   | | |    user:        test
   523   | | | | |  user:        test
   531   | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   524   | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   532   | | |    summary:     (22) merge two known; one far left, one far right
   525   | | | | |  summary:     (23) merge one known; immediate left
   533   | | |
   526   | | | | |
   534   o | |    changeset:   21:d42a756af44d
   527   +---o---+  changeset:   22:e0d9cccacb5d
   535   |\ \ \   parent:      19:31ddc2c1573b
   528   | |   | |  parent:      18:1aa84d96232a
   536   | | | |  parent:      20:d30ed6450e32
   529   | |  / /   parent:      21:d42a756af44d
   537   | | | |  user:        test
   530   | | | |    user:        test
   538   | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   531   | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   539   | | | |  summary:     (21) expand
   532   | | | |    summary:     (22) merge two known; one far left, one far right
   540   | | | |
   533   | | | |
   541   | o---+  changeset:   20:d30ed6450e32
   534   o | | |    changeset:   21:d42a756af44d
   542   |   | |  parent:      0:e6eb3150255d
   535   |\ \ \ \   parent:      19:31ddc2c1573b
   543   |  / /   parent:      18:1aa84d96232a
   536   | | | | |  parent:      20:d30ed6450e32
   544   | | |    user:        test
   537   | | | | |  user:        test
   545   | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   538   | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   546   | | |    summary:     (20) merge two known; two far right
   539   | | | | |  summary:     (21) expand
   547   | | |
   540   | | | | |
   548   o | |    changeset:   19:31ddc2c1573b
   541   | o---+-+  changeset:   20:d30ed6450e32
   549   |\ \ \   parent:      15:1dda3f72782d
   542   |   | | |  parent:      0:e6eb3150255d
   550   | | | |  parent:      17:44765d7c06e0
   543   |  / / /   parent:      18:1aa84d96232a
   551   | | | |  user:        test
   544   | | | |    user:        test
   552   | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   545   | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   553   | | | |  summary:     (19) expand
   546   | | | |    summary:     (20) merge two known; two far right
   554   | | | |
   547   | | | |
   555   +-----o  changeset:   18:1aa84d96232a
   548   o | | |    changeset:   19:31ddc2c1573b
   556   | | |    parent:      1:6db2ef61d156
   549   |\ \ \ \   parent:      15:1dda3f72782d
   557   | | |    parent:      15:1dda3f72782d
   550   | | | | |  parent:      17:44765d7c06e0
   558   | | |    user:        test
   551   | | | | |  user:        test
   559   | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   552   | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   560   | | |    summary:     (18) merge two known; two far left
   553   | | | | |  summary:     (19) expand
   561   | | |
   554   | | | | |
   562   | o |    changeset:   17:44765d7c06e0
   555   +---+---o  changeset:   18:1aa84d96232a
   563   | |\ \   parent:      12:86b91144a6e9
   556   | | | |    parent:      1:6db2ef61d156
   564   | | | |  parent:      16:3677d192927d
   557   | | | |    parent:      15:1dda3f72782d
   565   | | | |  user:        test
   558   | | | |    user:        test
   566   | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   559   | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   567   | | | |  summary:     (17) expand
   560   | | | |    summary:     (18) merge two known; two far left
   568   | | | |
   561   | | | |
   569   | | o |  changeset:   16:3677d192927d
   562   | o | |    changeset:   17:44765d7c06e0
   570   | | | |  parent:      0:e6eb3150255d
   563   | |\ \ \   parent:      12:86b91144a6e9
   571   | | | |  parent:      1:6db2ef61d156
   564   | | | | |  parent:      16:3677d192927d
   572   | | | |  user:        test
   565   | | | | |  user:        test
   573   | | | |  date:        Thu Jan 01 00:00:16 1970 +0000
   566   | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   574   | | | |  summary:     (16) merge two known; one immediate right, one near right
   567   | | | | |  summary:     (17) expand
       
   568   | | | | |
       
   569   | | o---+  changeset:   16:3677d192927d
       
   570   | | | | |  parent:      0:e6eb3150255d
       
   571   | | |/ /   parent:      1:6db2ef61d156
       
   572   | | | |    user:        test
       
   573   | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
       
   574   | | | |    summary:     (16) merge two known; one immediate right, one near right
   575   | | | |
   575   | | | |
   576   o | | |    changeset:   15:1dda3f72782d
   576   o | | |    changeset:   15:1dda3f72782d
   577   |\ \ \ \   parent:      13:22d8966a97e3
   577   |\ \ \ \   parent:      13:22d8966a97e3
   578   | | | | |  parent:      14:8eac370358ef
   578   | | | | |  parent:      14:8eac370358ef
   579   | | | | |  user:        test
   579   | | | | |  user:        test
   580   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   580   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   581   | | | | |  summary:     (15) expand
   581   | | | | |  summary:     (15) expand
   582   | | | | |
   582   | | | | |
   583   | o | | |  changeset:   14:8eac370358ef
   583   | o-----+  changeset:   14:8eac370358ef
   584   | |/ / /   parent:      0:e6eb3150255d
   584   | | | | |  parent:      0:e6eb3150255d
   585   | | | |    parent:      12:86b91144a6e9
   585   | |/ / /   parent:      12:86b91144a6e9
   586   | | | |    user:        test
   586   | | | |    user:        test
   587   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   587   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   588   | | | |    summary:     (14) merge two known; one immediate right, one far right
   588   | | | |    summary:     (14) merge two known; one immediate right, one far right
   589   | | | |
   589   | | | |
   590   o | | |    changeset:   13:22d8966a97e3
   590   o | | |    changeset:   13:22d8966a97e3
   593   | | | | |  user:        test
   593   | | | | |  user:        test
   594   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   594   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   595   | | | | |  summary:     (13) expand
   595   | | | | |  summary:     (13) expand
   596   | | | | |
   596   | | | | |
   597   +---o | |  changeset:   12:86b91144a6e9
   597   +---o | |  changeset:   12:86b91144a6e9
   598   | |  / /   parent:      1:6db2ef61d156
   598   | | |/ /   parent:      1:6db2ef61d156
   599   | | | |    parent:      9:7010c0af0a35
   599   | | | |    parent:      9:7010c0af0a35
   600   | | | |    user:        test
   600   | | | |    user:        test
   601   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   601   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   602   | | | |    summary:     (12) merge two known; one immediate right, one far left
   602   | | | |    summary:     (12) merge two known; one immediate right, one far left
   603   | | | |
   603   | | | |
   604   | o | |  changeset:   11:832d76e6bdf2
   604   | o | |    changeset:   11:832d76e6bdf2
   605   | | | |  parent:      6:b105a072e251
   605   | |\ \ \   parent:      6:b105a072e251
   606   | | | |  parent:      10:74c64d036d72
   606   | | | | |  parent:      10:74c64d036d72
   607   | | | |  user:        test
   607   | | | | |  user:        test
   608   | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   608   | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   609   | | | |  summary:     (11) expand
   609   | | | | |  summary:     (11) expand
   610   | | | |
   610   | | | | |
   611   | o | |  changeset:   10:74c64d036d72
   611   | | o---+  changeset:   10:74c64d036d72
   612   | | | |  parent:      0:e6eb3150255d
   612   | | | | |  parent:      0:e6eb3150255d
   613   | | | |  parent:      6:b105a072e251
   613   | |/ / /   parent:      6:b105a072e251
   614   | | | |  user:        test
   614   | | | |    user:        test
   615   | | | |  date:        Thu Jan 01 00:00:10 1970 +0000
   615   | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   616   | | | |  summary:     (10) merge two known; one immediate left, one near right
   616   | | | |    summary:     (10) merge two known; one immediate left, one near right
   617   | | | |
   617   | | | |
   618   o | | |  changeset:   9:7010c0af0a35
   618   o | | |    changeset:   9:7010c0af0a35
   619   | | | |  parent:      7:b632bb1b1224
   619   |\ \ \ \   parent:      7:b632bb1b1224
   620   | | | |  parent:      8:7a0b11f71937
   620   | | | | |  parent:      8:7a0b11f71937
   621   | | | |  user:        test
   621   | | | | |  user:        test
   622   | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   622   | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   623   | | | |  summary:     (9) expand
   623   | | | | |  summary:     (9) expand
   624   | | | |
   624   | | | | |
   625   o | | |  changeset:   8:7a0b11f71937
   625   | o-----+  changeset:   8:7a0b11f71937
   626   | | | |  parent:      0:e6eb3150255d
   626   | | | | |  parent:      0:e6eb3150255d
   627   | | | |  parent:      7:b632bb1b1224
   627   |/ / / /   parent:      7:b632bb1b1224
   628   | | | |  user:        test
   628   | | | |    user:        test
   629   | | | |  date:        Thu Jan 01 00:00:08 1970 +0000
   629   | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   630   | | | |  summary:     (8) merge two known; one immediate left, one far right
   630   | | | |    summary:     (8) merge two known; one immediate left, one far right
   631   | | | |
   631   | | | |
   632   o | | |  changeset:   7:b632bb1b1224
   632   o | | |    changeset:   7:b632bb1b1224
   633   | | | |  parent:      2:3d9a33b8d1e1
   633   |\ \ \ \   parent:      2:3d9a33b8d1e1
   634   | | | |  parent:      5:4409d547b708
   634   | | | | |  parent:      5:4409d547b708
   635   | | | |  user:        test
   635   | | | | |  user:        test
   636   | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   636   | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   637   | | | |  summary:     (7) expand
   637   | | | | |  summary:     (7) expand
   638   | | | |
   638   | | | | |
   639   | o | |  changeset:   6:b105a072e251
   639   +---o | |  changeset:   6:b105a072e251
   640   |/ / /   parent:      2:3d9a33b8d1e1
   640   | |/ / /   parent:      2:3d9a33b8d1e1
   641   | | |    parent:      5:4409d547b708
   641   | | | |    parent:      5:4409d547b708
   642   | | |    user:        test
   642   | | | |    user:        test
   643   | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   643   | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   644   | | |    summary:     (6) merge two known; one immediate left, one far left
   644   | | | |    summary:     (6) merge two known; one immediate left, one far left
   645   | | |
   645   | | | |
   646   o | |  changeset:   5:4409d547b708
   646   | o | |    changeset:   5:4409d547b708
   647   | | |  parent:      3:27eef8ed80b4
   647   | |\ \ \   parent:      3:27eef8ed80b4
   648   | | |  parent:      4:26a8bac39d9f
   648   | | | | |  parent:      4:26a8bac39d9f
   649   | | |  user:        test
   649   | | | | |  user:        test
   650   | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   650   | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   651   | | |  summary:     (5) expand
   651   | | | | |  summary:     (5) expand
   652   | | |
   652   | | | | |
   653   o | |  changeset:   4:26a8bac39d9f
   653   | | o | |  changeset:   4:26a8bac39d9f
   654   | | |  parent:      1:6db2ef61d156
   654   | |/|/ /   parent:      1:6db2ef61d156
   655   | | |  parent:      3:27eef8ed80b4
   655   | | | |    parent:      3:27eef8ed80b4
   656   | | |  user:        test
   656   | | | |    user:        test
   657   | | |  date:        Thu Jan 01 00:00:04 1970 +0000
   657   | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   658   | | |  summary:     (4) merge two known; one immediate left, one immediate right
   658   | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   659   | | |
   659   | | | |
   660   o | |  changeset:   3:27eef8ed80b4
   660   | o | |  changeset:   3:27eef8ed80b4
   661   | | |  user:        test
   661   |/ / /   user:        test
   662   | | |  date:        Thu Jan 01 00:00:03 1970 +0000
   662   | | |    date:        Thu Jan 01 00:00:03 1970 +0000
   663   | | |  summary:     (3) collapse
   663   | | |    summary:     (3) collapse
   664   | | |
   664   | | |
   665   o | |  changeset:   2:3d9a33b8d1e1
   665   o | |  changeset:   2:3d9a33b8d1e1
   666   |/ /   user:        test
   666   |/ /   user:        test
   667   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   667   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   668   | |    summary:     (2) collapse
   668   | |    summary:     (2) collapse
   731   |  user:        test
   731   |  user:        test
   732   |  date:        Thu Jan 01 00:00:00 1970 +0000
   732   |  date:        Thu Jan 01 00:00:00 1970 +0000
   733   |  summary:     more
   733   |  summary:     more
   734   |
   734   |
   735   o  changeset:   1:5ac72c0599bf
   735   o  changeset:   1:5ac72c0599bf
   736      user:        test
   736   |  user:        test
   737      date:        Thu Jan 01 00:00:00 1970 +0000
   737   |  date:        Thu Jan 01 00:00:00 1970 +0000
   738      summary:     two
   738   |  summary:     two
   739   
   739   |
   740 
   740 
   741 Issue1896: File log with explicit style
   741 Issue1896: File log with explicit style
   742   $ hg glog --style=default one
   742   $ hg glog --style=default one
   743   o  changeset:   0:3d578b4a1f53
   743   o  changeset:   0:3d578b4a1f53
   744      user:        test
   744      user:        test