tests/test-evolve-obshistory-fold.t
branchmercurial-4.7
changeset 5162 a7fb433faab6
parent 5125 ce8479d1a6f9
child 5163 1752a2e7a226
child 5367 cb5983c0287f
equal deleted inserted replaced
5161:58b225aa4298 5162:a7fb433faab6
    48   |  summary:     C0
    48   |  summary:     C0
    49   |
    49   |
    50   | x  changeset:   2:0dec01379d3b
    50   | x  changeset:   2:0dec01379d3b
    51   | |  user:        test
    51   | |  user:        test
    52   | |  date:        Thu Jan 01 00:00:00 1970 +0000
    52   | |  date:        Thu Jan 01 00:00:00 1970 +0000
    53   | |  obsolete:    folded using fold as 3:eb5a0daa2192
    53   | |  obsolete:    rewritten using fold as 3:eb5a0daa2192
    54   | |  summary:     B0
    54   | |  summary:     B0
    55   | |
    55   | |
    56   | x  changeset:   1:471f378eab4c
    56   | x  changeset:   1:471f378eab4c
    57   |/   user:        test
    57   |/   user:        test
    58   |    date:        Thu Jan 01 00:00:00 1970 +0000
    58   |    date:        Thu Jan 01 00:00:00 1970 +0000
    59   |    obsolete:    folded using fold as 3:eb5a0daa2192
    59   |    obsolete:    rewritten using fold as 3:eb5a0daa2192
    60   |    summary:     A0
    60   |    summary:     A0
    61   |
    61   |
    62   o  changeset:   0:ea207398892e
    62   o  changeset:   0:ea207398892e
    63      user:        test
    63      user:        test
    64      date:        Thu Jan 01 00:00:00 1970 +0000
    64      date:        Thu Jan 01 00:00:00 1970 +0000
    71 
    71 
    72 Check that debugobshistory on the first folded revision show only
    72 Check that debugobshistory on the first folded revision show only
    73 the revision with the target
    73 the revision with the target
    74   $ hg obslog --hidden 471f378eab4c --patch
    74   $ hg obslog --hidden 471f378eab4c --patch
    75   x  471f378eab4c (1) A0
    75   x  471f378eab4c (1) A0
    76        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    76        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    77          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
    77          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
    78          --- a/changeset-description
    78          --- a/changeset-description
    79          +++ b/changeset-description
    79          +++ b/changeset-description
    80          @@ -1,1 +1,1 @@
    80          @@ -1,1 +1,1 @@
    81          -A0
    81          -A0
    91 Check that with all option, all changesets are shown
    91 Check that with all option, all changesets are shown
    92   $ hg obslog --hidden --all 471f378eab4c --patch
    92   $ hg obslog --hidden --all 471f378eab4c --patch
    93   @    eb5a0daa2192 (3) C0
    93   @    eb5a0daa2192 (3) C0
    94   |\
    94   |\
    95   x |  0dec01379d3b (2) B0
    95   x |  0dec01379d3b (2) B0
    96    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    96    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
    97   |        (No patch available, changesets rebased)
    97   |        (No patch available, changesets rebased)
    98   |
    98   |
    99   x  471f378eab4c (1) A0
    99   x  471f378eab4c (1) A0
   100        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   100        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   101          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   101          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   102          --- a/changeset-description
   102          --- a/changeset-description
   103          +++ b/changeset-description
   103          +++ b/changeset-description
   104          @@ -1,1 +1,1 @@
   104          @@ -1,1 +1,1 @@
   105          -A0
   105          -A0
   114   
   114   
   115 Check that debugobshistory on the second folded revision show only
   115 Check that debugobshistory on the second folded revision show only
   116 the revision with the target
   116 the revision with the target
   117   $ hg obslog --hidden 0dec01379d3b --patch
   117   $ hg obslog --hidden 0dec01379d3b --patch
   118   x  0dec01379d3b (2) B0
   118   x  0dec01379d3b (2) B0
   119        folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   119        rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   120          (No patch available, changesets rebased)
   120          (No patch available, changesets rebased)
   121   
   121   
   122 Check that with all option, all changesets are shown
   122 Check that with all option, all changesets are shown
   123   $ hg obslog --hidden --all 0dec01379d3b --patch
   123   $ hg obslog --hidden --all 0dec01379d3b --patch
   124   @    eb5a0daa2192 (3) C0
   124   @    eb5a0daa2192 (3) C0
   125   |\
   125   |\
   126   x |  0dec01379d3b (2) B0
   126   x |  0dec01379d3b (2) B0
   127    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   127    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   128   |        (No patch available, changesets rebased)
   128   |        (No patch available, changesets rebased)
   129   |
   129   |
   130   x  471f378eab4c (1) A0
   130   x  471f378eab4c (1) A0
   131        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   131        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   132          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   132          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   133          --- a/changeset-description
   133          --- a/changeset-description
   134          +++ b/changeset-description
   134          +++ b/changeset-description
   135          @@ -1,1 +1,1 @@
   135          @@ -1,1 +1,1 @@
   136          -A0
   136          -A0
   147 graph
   147 graph
   148   $ hg obslog eb5a0daa2192 --patch
   148   $ hg obslog eb5a0daa2192 --patch
   149   @    eb5a0daa2192 (3) C0
   149   @    eb5a0daa2192 (3) C0
   150   |\
   150   |\
   151   x |  0dec01379d3b (2) B0
   151   x |  0dec01379d3b (2) B0
   152    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   152    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   153   |        (No patch available, changesets rebased)
   153   |        (No patch available, changesets rebased)
   154   |
   154   |
   155   x  471f378eab4c (1) A0
   155   x  471f378eab4c (1) A0
   156        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   156        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   157          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   157          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   158          --- a/changeset-description
   158          --- a/changeset-description
   159          +++ b/changeset-description
   159          +++ b/changeset-description
   160          @@ -1,1 +1,1 @@
   160          @@ -1,1 +1,1 @@
   161          -A0
   161          -A0
   189                   "operation": "fold",
   189                   "operation": "fold",
   190                   "succnodes": [
   190                   "succnodes": [
   191                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
   191                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
   192                   ],
   192                   ],
   193                   "user": "test",
   193                   "user": "test",
   194                   "verb": "folded"
   194                   "verb": "rewritten"
   195               }
   195               }
   196           ],
   196           ],
   197           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   197           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
   198           "shortdescription": "A0"
   198           "shortdescription": "A0"
   199       },
   199       },
   212                   "operation": "fold",
   212                   "operation": "fold",
   213                   "succnodes": [
   213                   "succnodes": [
   214                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
   214                       "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
   215                   ],
   215                   ],
   216                   "user": "test",
   216                   "user": "test",
   217                   "verb": "folded"
   217                   "verb": "rewritten"
   218               }
   218               }
   219           ],
   219           ],
   220           "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
   220           "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
   221           "shortdescription": "B0"
   221           "shortdescription": "B0"
   222       }
   222       }
   247 
   247 
   248   $ hg obslog -R $TESTTMP/server --patch tip --all
   248   $ hg obslog -R $TESTTMP/server --patch tip --all
   249   o    eb5a0daa2192 (2) C0
   249   o    eb5a0daa2192 (2) C0
   250   |\
   250   |\
   251   x |  0dec01379d3b
   251   x |  0dec01379d3b
   252    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   252    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   253   |        (No patch available, context is not local)
   253   |        (No patch available, context is not local)
   254   |
   254   |
   255   x  471f378eab4c (1) A0
   255   x  471f378eab4c (1) A0
   256        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   256        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   257          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   257          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   258          --- a/changeset-description
   258          --- a/changeset-description
   259          +++ b/changeset-description
   259          +++ b/changeset-description
   260          @@ -1,1 +1,1 @@
   260          @@ -1,1 +1,1 @@
   261          -A0
   261          -A0
   270   
   270   
   271   $ hg obslog -R $TESTTMP/server -f --all --patch tip
   271   $ hg obslog -R $TESTTMP/server -f --all --patch tip
   272   o  eb5a0daa2192 (2) C0
   272   o  eb5a0daa2192 (2) C0
   273   |
   273   |
   274   x  471f378eab4c (1) A0
   274   x  471f378eab4c (1) A0
   275        folded(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
   275        rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
   276          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   276          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   277          --- a/changeset-description
   277          --- a/changeset-description
   278          +++ b/changeset-description
   278          +++ b/changeset-description
   279          @@ -1,1 +1,1 @@
   279          @@ -1,1 +1,1 @@
   280          -A0
   280          -A0
   290 
   290 
   291   $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden
   291   $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden
   292   o    eb5a0daa2192 (2) C0
   292   o    eb5a0daa2192 (2) C0
   293   |\
   293   |\
   294   x |  0dec01379d3b
   294   x |  0dec01379d3b
   295    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   295    /     rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   296   |        (No patch available, context is not local)
   296   |        (No patch available, context is not local)
   297   |
   297   |
   298   x  471f378eab4c (1) A0
   298   x  471f378eab4c (1) A0
   299        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   299        rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   300          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   300          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   301          --- a/changeset-description
   301          --- a/changeset-description
   302          +++ b/changeset-description
   302          +++ b/changeset-description
   303          @@ -1,1 +1,1 @@
   303          @@ -1,1 +1,1 @@
   304          -A0
   304          -A0
   313   
   313   
   314   $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --hidden
   314   $ hg obslog -R $TESTTMP/server -f --all --patch 471f378eab4c --hidden
   315   o  eb5a0daa2192 (2) C0
   315   o  eb5a0daa2192 (2) C0
   316   |
   316   |
   317   x  471f378eab4c (1) A0
   317   x  471f378eab4c (1) A0
   318        folded(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
   318        rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
   319          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   319          diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   320          --- a/changeset-description
   320          --- a/changeset-description
   321          +++ b/changeset-description
   321          +++ b/changeset-description
   322          @@ -1,1 +1,1 @@
   322          @@ -1,1 +1,1 @@
   323          -A0
   323          -A0
   324          +C0
   324          +C0
   325   
   325   
   326          diff -r 471f378eab4c -r eb5a0daa2192 B0
   326          diff -r 471f378eab4c -r eb5a0daa2192 B0
   327          --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   327          --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   328          +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
   328          +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
   329          @@ -0,0 +1,1 @@
   329          @@ -0,0 +1,1 @@
   330          +B0
   330          +B0
   331   
   331   
   332   
   332