Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-obshistory-amend.t
branchmercurial-4.6
changeset 5368 844b1ad5b34b
parent 5367 cb5983c0287f
parent 5163 1752a2e7a226
equal deleted inserted replaced
5284:0471b9ddd0b2 5368:844b1ad5b34b 
     1 This test file test the various messages when accessing obsolete
 
     1 Testing obslog and other commands accessing obsolete revisions.
 
     2 revisions.
 
       
     3 
     2 
     4 Global setup
 
     3 Global setup
 
     5 ============
 
     4 ============
 
     6 
     5 
     7   $ . $TESTDIR/testlib/obshistory_setup.sh
 
     6   $ . $TESTDIR/testlib/obshistory_setup.sh
 
     8 
       
     9 
     7 
    10 Test output on amended commit
 
     8 Test output on amended commit
 
    11 =============================
 
     9 =============================
 
    12 
    10 
    13 Test setup
 
    11 Test setup
 
    45   
    43   
    46 Check output on the client side
 
    44 Check output on the client side
 
    47 -------------------------------
 
    45 -------------------------------
 
    48   $ hg obslog --patch 4ae3a4151de9
 
    46   $ hg obslog --patch 4ae3a4151de9
 
    49   @  4ae3a4151de9 (2) A1
 
    47   @  4ae3a4151de9 (2) A1
 
       
    48   |    rewritten(description, content) from 471f378eab4c using amend by test (*) (glob)
 
       
    49   |      diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
       
    50   |      --- a/changeset-description
 
       
    51   |      +++ b/changeset-description
 
       
    52   |      @@ -1,1 +1,3 @@
 
       
    53   |      -A0
 
       
    54   |      +A1
 
       
    55   |      +
 
       
    56   |      +Better commit message
 
       
    57   |
 
       
    58   |      diff -r 471f378eab4c -r 4ae3a4151de9 A0
 
       
    59   |      --- a/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
    60   |      +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
    61   |      @@ -1,1 +1,2 @@
 
       
    62   |       A0
 
       
    63   |      +42
 
       
    64   |
 
    50   |
 
    65   |
 
    51   x  471f378eab4c (1) A0
 
    66   x  471f378eab4c (1) A0
 
    52        rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob)
 
       
    53          diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
       
    54          --- a/changeset-description
 
       
    55          +++ b/changeset-description
 
       
    56          @@ -1,1 +1,3 @@
 
       
    57          -A0
 
       
    58          +A1
 
       
    59          +
 
       
    60          +Better commit message
 
       
    61   
       
    62          diff -r 471f378eab4c -r 4ae3a4151de9 A0
 
       
    63          --- a/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
    64          +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
    65          @@ -1,1 +1,2 @@
 
       
    66           A0
 
       
    67          +42
 
       
    68   
       
    69   
    67   
    70   $ hg obslog --patch --color debug
 
    68   $ hg obslog --patch --color debug
 
    71   @  [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1]
 
    69   @  [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1]
 
       
    70   |    [evolve.verb|rewritten](description, content) from [evolve.node|471f378eab4c] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
       
    71   |      [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
 
       
    72   |      [diff.file_a|--- a/changeset-description]
 
       
    73   |      [diff.file_b|+++ b/changeset-description]
 
       
    74   |      [diff.hunk|@@ -1,1 +1,3 @@]
 
       
    75   |      [diff.deleted|-A0]
 
       
    76   |      [diff.inserted|+A1]
 
       
    77   |      [diff.inserted|+]
 
       
    78   |      [diff.inserted|+Better commit message]
 
       
    79   |
 
       
    80   |      [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
 
       
    81   |      [diff.file_a|--- a/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
    82   |      [diff.file_b|+++ b/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
    83   |      [diff.hunk|@@ -1,1 +1,2 @@]
 
       
    84   |       A0
 
       
    85   |      [diff.inserted|+42]
 
       
    86   |
 
    72   |
 
    87   |
 
    73   x  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
    88   x  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
 
    74        [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
 
       
    75          [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
 
       
    76          [diff.file_a|--- a/changeset-description]
 
       
    77          [diff.file_b|+++ b/changeset-description]
 
       
    78          [diff.hunk|@@ -1,1 +1,3 @@]
 
       
    79          [diff.deleted|-A0]
 
       
    80          [diff.inserted|+A1]
 
       
    81          [diff.inserted|+]
 
       
    82          [diff.inserted|+Better commit message]
 
       
    83   
       
    84          [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
 
       
    85          [diff.file_a|--- a/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
    86          [diff.file_b|+++ b/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
    87          [diff.hunk|@@ -1,1 +1,2 @@]
 
       
    88           A0
 
       
    89          [diff.inserted|+42]
 
       
    90   
       
    91   
    89   
    92 
    90 
    93   $ hg obslog --no-graph --patch 4ae3a4151de9
 
    91   $ hg obslog --no-graph --patch 4ae3a4151de9
 
    94   4ae3a4151de9 (2) A1
 
    92   4ae3a4151de9 (2) A1
 
    95   
    93     rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)    
    96   471f378eab4c (1) A0
 
       
    97     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)    
       
    98       diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
    94       diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
    99       --- a/changeset-description
 
    95       --- a/changeset-description
 
   100       +++ b/changeset-description
 
    96       +++ b/changeset-description
 
   101       @@ -1,1 +1,3 @@
 
    97       @@ -1,1 +1,3 @@
 
   102       -A0
 
    98       -A0
 
   110       @@ -1,1 +1,2 @@
 
   106       @@ -1,1 +1,2 @@
 
   111        A0
 
   107        A0
 
   112       +42
 
   108       +42
 
   113   
   109   
   114   
   110   
       
   111   471f378eab4c (1) A0
 
       
   112   
   115 
   113 
   116 Test that content diff works with templating
 
   114 Test that content diff works with templating
 
   117   $ hg obslog --color=debug --patch 4ae3a4151de9 \
 
   115   $ hg obslog --color=debug --patch 4ae3a4151de9 \
 
   118   > -T '{node|short} {desc|firstline}\n{markers % "patch:\n```{patch}```\n"}'
 
   116   > -T '{node|short} {desc|firstline}\n{markers % "patch:\n```{patch}```\n"}'
 
   119   @  4ae3a4151de9 A1
 
   117   @  4ae3a4151de9 A1
 
   120   |
 
   118   |  patch:
 
       
   119   |  ```
 
       
   120   |  [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
 
       
   121   |  [diff.file_a|--- a/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
   122   |  [diff.file_b|+++ b/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
   123   |  [diff.hunk|@@ -1,1 +1,2 @@]
 
       
   124   |   A0
 
       
   125   |  [diff.inserted|+42]
 
       
   126   |  ```
 
   121   x  471f378eab4c A0
 
   127   x  471f378eab4c A0
 
   122      patch:
 
   128   
   123      ```
 
   129 
   124      [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
 
   130   $ hg obslog 4ae3a4151de9 --graph --no-origin -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
 
   125      [diff.file_a|--- a/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
   126      [diff.file_b|+++ b/A0	Thu Jan 01 00:00:00 1970 +0000]
 
       
   127      [diff.hunk|@@ -1,1 +1,2 @@]
 
       
   128       A0
 
       
   129      [diff.inserted|+42]
 
       
   130      ```
 
       
   131 
       
   132   $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}'
 
       
   133   @  A1
 
   131   @  A1
 
   134   |
 
   132   |
 
   135   x  A0 at 0 0 by test
 
   133   x  A0 at 0 0 by test
 
   136   
   134   
       
   135   $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
 
       
   136   @  A1 at 0 0 by test
 
       
   137   |
 
       
   138   x  A0
 
       
   139   
   137 
   140 
   138 Check that the same thing works with the old {shortdescription} form
 
   141 Check that the same thing works with the old {shortdescription} form
 
   139   $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}'
 
   142   $ hg obslog 4ae3a4151de9 --graph --no-origin -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
 
   140   @  A1
 
   143   @  A1
 
   141   |
 
   144   |
 
   142   x  A0 at 0 0 by test
 
   145   x  A0 at 0 0 by test
 
       
   146   
       
   147   $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
 
       
   148   @  A1 at 0 0 by test
 
       
   149   |
 
       
   150   x  A0
 
   143   
   151   
   144   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
 
   152   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
 
   145   [
 
   153   [
 
   146       {
 
   154       {
 
   147           "markers": [],
 
       
   148           "node": "4ae3a4151de9aa872113f0b196e28323308981e8",
 
       
   149           "shortdescription": "A1"
 
       
   150       },
 
       
   151       {
 
       
   152           "markers": [
 
   155           "markers": [
 
   153               {
 
   156               {
 
   154                   "date": [
 
   157                   "dates": [
 
   155                       *, (glob)
 
   158                       [
 
   156                       0
 
   159                           *, (glob)
 
       
   160                           0
 
       
   161                       ]
 
   157                   ],
 
   162                   ],
 
   158                   "effects": [
 
   163                   "effects": [
 
   159                       "description",
 
   164                       "description",
 
   160                       "content"
 
   165                       "content"
 
   161                   ],
 
   166                   ],
 
   162                   "operation": "amend",
 
   167                   "operations": [
 
   163                   "succnodes": [
 
   168                       "amend"
 
   164                       "4ae3a4151de9aa872113f0b196e28323308981e8"
 
       
   165                   ],
 
   169                   ],
 
   166                   "user": "test",
 
   170                   "prednodes": [
 
       
   171                       "471f378eab4c5e25f6c77f785b27c936efb22874"
 
       
   172                   ],
 
       
   173                   "users": [
 
       
   174                       "test"
 
       
   175                   ],
 
   167                   "verb": "rewritten"
 
   176                   "verb": "rewritten"
 
   168               }
 
   177               }
 
   169           ],
 
   178           ],
 
       
   179           "node": "4ae3a4151de9aa872113f0b196e28323308981e8",
 
       
   180           "shortdescription": "A1"
 
       
   181       },
 
       
   182       {
 
       
   183           "markers": [],
 
   170           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
 
   184           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
 
   171           "shortdescription": "A0"
 
   185           "shortdescription": "A0"
 
   172       }
 
   186       }
 
   173   ]
 
   187   ]
 
   174   $ hg obslog --hidden --patch 471f378eab4c
 
   188   $ hg obslog --hidden --patch 471f378eab4c
 
   175   x  471f378eab4c (1) A0
 
   189   x  471f378eab4c (1) A0
 
   176        rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   177          diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
       
   178          --- a/changeset-description
 
       
   179          +++ b/changeset-description
 
       
   180          @@ -1,1 +1,3 @@
 
       
   181          -A0
 
       
   182          +A1
 
       
   183          +
 
       
   184          +Better commit message
 
       
   185   
       
   186          diff -r 471f378eab4c -r 4ae3a4151de9 A0
 
       
   187          --- a/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
   188          +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
   189          @@ -1,1 +1,2 @@
 
       
   190           A0
 
       
   191          +42
 
       
   192   
       
   193   
   190   
   194   $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
 
   191   $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
 
   195   [
 
   192   [
 
   196       {
 
   193       {
 
   197           "markers": [
 
   194           "markers": [],
 
   198               {
 
       
   199                   "date": [
 
       
   200                       *, (glob)
 
       
   201                       0
 
       
   202                   ],
 
       
   203                   "effects": [
 
       
   204                       *, (glob)
 
       
   205                       "content"
 
       
   206                   ],
 
       
   207                   "operation": "amend",
 
       
   208                   "succnodes": [
 
       
   209                       "4ae3a4151de9aa872113f0b196e28323308981e8"
 
       
   210                   ],
 
       
   211                   "user": "test",
 
       
   212                   "verb": "rewritten"
 
       
   213               }
 
       
   214           ],
 
       
   215           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
 
   195           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
 
   216           "shortdescription": "A0"
 
   196           "shortdescription": "A0"
 
   217       }
 
   197       }
 
   218   ]
 
   198   ]
 
   219   $ hg update 471f378eab4c
 
   199   $ hg update 471f378eab4c
 
   228   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
 
   208   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
 
   229 
   209 
   230 Check output on the server side
 
   210 Check output on the server side
 
   231 -------------------------------
 
   211 -------------------------------
 
   232 
   212 
   233   $ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9
 
   213   $ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9 --no-origin
 
   234   o  4ae3a4151de9 (1) A1
 
   214   o  4ae3a4151de9 (1) A1
 
   235   |
 
   215   |
 
   236   x  471f378eab4c
 
   216   x  471f378eab4c
 
   237        rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   217        rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   238          (No patch available, context is not local)
 
   218          (No patch available, context is not local)
 
   239   
   219   
   240   $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
 
   220   $ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9
 
   241   o  4ae3a4151de9 (1) A1
 
   221   o  4ae3a4151de9 (1) A1
 
   242   
   222   |    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   243   $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
 
   223   |      (No patch available, predecessor is unknown locally)
 
       
   224   |
 
       
   225   x  471f378eab4c
 
       
   226   
       
   227   $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9 --no-origin
 
   244   4ae3a4151de9 (1) A1
 
   228   4ae3a4151de9 (1) A1
 
   245   
   229   
   246   471f378eab4c
 
   230   471f378eab4c
 
   247     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   231     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   248       (No patch available, context is not local)
 
   232       (No patch available, context is not local)
 
   249   
   233   
   250 
   234   $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
 
       
   235   4ae3a4151de9 (1) A1
 
       
   236     rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
       
   237       (No patch available, predecessor is unknown locally)
 
       
   238   
       
   239   471f378eab4c
 
       
   240   
       
   241 
       
   242   $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9 --no-origin
 
       
   243   o  4ae3a4151de9 (1) A1
 
       
   244   
       
   245   $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
 
       
   246   o  4ae3a4151de9 (1) A1
 
       
   247   
       
   248   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9 --no-origin
 
       
   249   4ae3a4151de9 (1) A1
 
       
   250   
   251   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
 
   251   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
 
   252   4ae3a4151de9 (1) A1
 
   252   4ae3a4151de9 (1) A1
 
   253   
       
   254   471f378eab4c
 
       
   255     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
       
   256       (No patch available, context is not local)
 
       
   257   
   253   
   258 
   254 
   259 Amend two more times
 
   255 Amend two more times
 
   260 ====================
 
   256 ====================
 
   261 
   257 
   283   $ hg up tip
 
   279   $ hg up tip
 
   284   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   280   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   285   $ hg amend -m "A2
 
   281   $ hg amend -m "A2
 
   286   > 
   282   > 
   287   > Better better commit message"
 
   283   > Better better commit message"
 
   288   $ hg amend -m "A3
 
   284   $ hg amend --config devel.default-date='1 0' -m "A3
 
   289   > 
   285   > 
   290   > Better better better commit message"
 
   286   > Better better better commit message"
 
   291   $ sync
 
   287   $ sync
 
   292   $ hg log --hidden -G
 
   288   $ hg log --hidden -G
 
   293   @  changeset:   4:92210308515b
 
   289   @  changeset:   4:92210308515b
 
   325 Check the output on the client
 
   321 Check the output on the client
 
   326 ------------------------------
 
   322 ------------------------------
 
   327 
   323 
   328   $ hg obslog --patch 92210308515b
 
   324   $ hg obslog --patch 92210308515b
 
   329   @  92210308515b (4) A3
 
   325   @  92210308515b (4) A3
 
   330   |
 
   326   |    reworded(description) from 4f1685185907 using amend by test (Thu Jan 01 00:00:01 1970 +0000)
 
   331   x  4f1685185907 (3) A2
 
       
   332   |    reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   333   |      diff -r 4f1685185907 -r 92210308515b changeset-description
 
   327   |      diff -r 4f1685185907 -r 92210308515b changeset-description
 
   334   |      --- a/changeset-description
 
   328   |      --- a/changeset-description
 
   335   |      +++ b/changeset-description
 
   329   |      +++ b/changeset-description
 
   336   |      @@ -1,3 +1,3 @@
 
   330   |      @@ -1,3 +1,3 @@
 
   337   |      -A2
 
   331   |      -A2
 
   339   |
 
   333   |
 
   340   |      -Better better commit message
 
   334   |      -Better better commit message
 
   341   |      +Better better better commit message
 
   335   |      +Better better better commit message
 
   342   |
 
   336   |
 
   343   |
 
   337   |
 
   344   x  4ae3a4151de9 (2) A1
 
   338   x  4f1685185907 (3) A2
 
   345   |    reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   339   |    reworded(description) from 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   346   |      diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
 
   340   |      diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
 
   347   |      --- a/changeset-description
 
   341   |      --- a/changeset-description
 
   348   |      +++ b/changeset-description
 
   342   |      +++ b/changeset-description
 
   349   |      @@ -1,3 +1,3 @@
 
   343   |      @@ -1,3 +1,3 @@
 
   350   |      -A1
 
   344   |      -A1
 
   352   |
 
   346   |
 
   353   |      -Better commit message
 
   347   |      -Better commit message
 
   354   |      +Better better commit message
 
   348   |      +Better better commit message
 
   355   |
 
   349   |
 
   356   |
 
   350   |
 
       
   351   x  4ae3a4151de9 (2) A1
 
       
   352   |    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   353   |      diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
       
   354   |      --- a/changeset-description
 
       
   355   |      +++ b/changeset-description
 
       
   356   |      @@ -1,1 +1,3 @@
 
       
   357   |      -A0
 
       
   358   |      +A1
 
       
   359   |      +
 
       
   360   |      +Better commit message
 
       
   361   |
 
       
   362   |      diff -r 471f378eab4c -r 4ae3a4151de9 A0
 
       
   363   |      --- a/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
   364   |      +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
   365   |      @@ -1,1 +1,2 @@
 
       
   366   |       A0
 
       
   367   |      +42
 
       
   368   |
 
       
   369   |
 
   357   x  471f378eab4c (1) A0
 
   370   x  471f378eab4c (1) A0
 
   358        rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   359          diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
 
       
   360          --- a/changeset-description
 
       
   361          +++ b/changeset-description
 
       
   362          @@ -1,1 +1,3 @@
 
       
   363          -A0
 
       
   364          +A1
 
       
   365          +
 
       
   366          +Better commit message
 
       
   367   
       
   368          diff -r 471f378eab4c -r 4ae3a4151de9 A0
 
       
   369          --- a/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
   370          +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
 
       
   371          @@ -1,1 +1,2 @@
 
       
   372           A0
 
       
   373          +42
 
       
   374   
       
   375   
   371   
   376 Test that description diff works with templating
 
   372 Test that description diff works with templating
 
   377   $ hg obslog --color=debug --patch 92210308515b \
 
   373   $ hg obslog --color=debug --patch 92210308515b \
 
   378   > -T '{node|short} {desc|firstline}\n{markers % "description diff:\n```{descdiff}```\n"}'
 
   374   > -T '{node|short} {desc|firstline}\n{markers % "description diff:\n```{descdiff}```\n"}'
 
   379   @  92210308515b A3
 
   375   @  92210308515b A3
 
   380   |
 
       
   381   x  4f1685185907 A2
 
       
   382   |  description diff:
 
   376   |  description diff:
 
   383   |  ```
 
   377   |  ```
 
   384   |  [diff.diffline|diff -r 4f1685185907 -r 92210308515b changeset-description]
 
   378   |  [diff.diffline|diff -r 4f1685185907 -r 92210308515b changeset-description]
 
   385   |  [diff.file_a|--- a/changeset-description]
 
   379   |  [diff.file_a|--- a/changeset-description]
 
   386   |  [diff.file_b|+++ b/changeset-description]
 
   380   |  [diff.file_b|+++ b/changeset-description]
 
   389   |  [diff.inserted|+A3]
 
   383   |  [diff.inserted|+A3]
 
   390   |
 
   384   |
 
   391   |  [diff.deleted|-Better better commit message]
 
   385   |  [diff.deleted|-Better better commit message]
 
   392   |  [diff.inserted|+Better better better commit message]
 
   386   |  [diff.inserted|+Better better better commit message]
 
   393   |  ```
 
   387   |  ```
 
   394   x  4ae3a4151de9 A1
 
   388   x  4f1685185907 A2
 
   395   |  description diff:
 
   389   |  description diff:
 
   396   |  ```
 
   390   |  ```
 
   397   |  [diff.diffline|diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description]
 
   391   |  [diff.diffline|diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description]
 
   398   |  [diff.file_a|--- a/changeset-description]
 
   392   |  [diff.file_a|--- a/changeset-description]
 
   399   |  [diff.file_b|+++ b/changeset-description]
 
   393   |  [diff.file_b|+++ b/changeset-description]
 
   402   |  [diff.inserted|+A2]
 
   396   |  [diff.inserted|+A2]
 
   403   |
 
   397   |
 
   404   |  [diff.deleted|-Better commit message]
 
   398   |  [diff.deleted|-Better commit message]
 
   405   |  [diff.inserted|+Better better commit message]
 
   399   |  [diff.inserted|+Better better commit message]
 
   406   |  ```
 
   400   |  ```
 
       
   401   x  4ae3a4151de9 A1
 
       
   402   |  description diff:
 
       
   403   |  ```
 
       
   404   |  [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
 
       
   405   |  [diff.file_a|--- a/changeset-description]
 
       
   406   |  [diff.file_b|+++ b/changeset-description]
 
       
   407   |  [diff.hunk|@@ -1,1 +1,3 @@]
 
       
   408   |  [diff.deleted|-A0]
 
       
   409   |  [diff.inserted|+A1]
 
       
   410   |  [diff.inserted|+]
 
       
   411   |  [diff.inserted|+Better commit message]
 
       
   412   |  ```
 
   407   x  471f378eab4c A0
 
   413   x  471f378eab4c A0
 
   408      description diff:
 
   414   
   409      ```
 
       
   410      [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
 
       
   411      [diff.file_a|--- a/changeset-description]
 
       
   412      [diff.file_b|+++ b/changeset-description]
 
       
   413      [diff.hunk|@@ -1,1 +1,3 @@]
 
       
   414      [diff.deleted|-A0]
 
       
   415      [diff.inserted|+A1]
 
       
   416      [diff.inserted|+]
 
       
   417      [diff.inserted|+Better commit message]
 
       
   418      ```
 
       
   419 
   415 
   420 Check the output on the server
 
   416 Check the output on the server
 
   421 ------------------------------
 
   417 ------------------------------
 
   422 
   418 
   423   $ hg obslog -R $TESTTMP/server --patch 92210308515b
 
   419   $ hg obslog -R $TESTTMP/server --patch 92210308515b
 
   424   o  92210308515b (2) A3
 
   420   o  92210308515b (2) A3
 
       
   421   |    reworded(description) from 4f1685185907 using amend by test (Thu Jan 01 00:00:01 1970 +0000)
 
       
   422   |      (No patch available, predecessor is unknown locally)
 
   425   |
 
   423   |
 
   426   x  4f1685185907
 
   424   x  4f1685185907
 
   427   |    reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   425   |    reworded(description) from 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   428   |      (No patch available, context is not local)
 
   426   |      (No patch available, context is not local)
 
   429   |
 
   427   |
 
   430   x  4ae3a4151de9 (1) A1
 
   428   x  4ae3a4151de9 (1) A1
 
   431   |    reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   429   |    rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   432   |      (No patch available, successor is unknown locally)
 
   430   |      (No patch available, predecessor is unknown locally)
 
   433   |
 
   431   |
 
   434   x  471f378eab4c
 
   432   x  471f378eab4c
 
   435        rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   436          (No patch available, context is not local)
 
       
   437   
   433   
   438   $ hg obslog -R $TESTTMP/server -f --patch 92210308515b
 
   434   $ hg obslog -R $TESTTMP/server -f --patch 92210308515b
 
   439   o  92210308515b (2) A3
 
   435   o  92210308515b (2) A3
 
       
   436   |    reworded(description) from 4ae3a4151de9 using amend by test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000)
 
       
   437   |      diff -r 4ae3a4151de9 -r 92210308515b changeset-description
 
       
   438   |      --- a/changeset-description
 
       
   439   |      +++ b/changeset-description
 
       
   440   |      @@ -1,3 +1,3 @@
 
       
   441   |      -A1
 
       
   442   |      +A3
 
       
   443   |
 
       
   444   |      -Better commit message
 
       
   445   |      +Better better better commit message
 
       
   446   |
 
   440   |
 
   447   |
 
   441   x  4ae3a4151de9 (1) A1
 
   448   x  4ae3a4151de9 (1) A1
 
   442        reworded(description) as 92210308515b using amend by test (at Thu Jan 01 00:00:00 1970 +0000)
 
       
   443          diff -r 4ae3a4151de9 -r 92210308515b changeset-description
 
       
   444          --- a/changeset-description
 
       
   445          +++ b/changeset-description
 
       
   446          @@ -1,3 +1,3 @@
 
       
   447          -A1
 
       
   448          +A3
 
       
   449   
       
   450          -Better commit message
 
       
   451          +Better better better commit message
 
       
   452   
       
   453   
   449   
   454   $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
 
   450   $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
 
   455   92210308515b (2) A3
 
   451   92210308515b (2) A3
 
       
   452     reworded(description) from 4f1685185907 using amend by test (Thu Jan 01 00:00:01 1970 +0000)        
       
   453       (No patch available, predecessor is unknown locally)
 
   456   
   454   
   457   4f1685185907
 
   455   4f1685185907
 
   458     reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   456     reworded(description) from 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   459       (No patch available, context is not local)
 
   457       (No patch available, context is not local)
 
   460   
   458   
   461   4ae3a4151de9 (1) A1
 
   459   4ae3a4151de9 (1) A1
 
   462     reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   460     rewritten(description, content) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   463       (No patch available, successor is unknown locally)
 
   461       (No patch available, predecessor is unknown locally)
 
   464   
   462   
   465   471f378eab4c
 
   463   471f378eab4c
 
   466     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   464   
   467       (No patch available, context is not local)
 
       
   468   
       
   469 
       
   470   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
 
   465   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
 
   471   92210308515b (2) A3
 
   466   92210308515b (2) A3
 
   472   
   467     reworded(description) from 4ae3a4151de9 using amend by test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000)    
   473   4f1685185907
 
   468       diff -r 4ae3a4151de9 -r 92210308515b changeset-description
 
   474     reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   469       --- a/changeset-description
 
   475       (No patch available, context is not local)
 
   470       +++ b/changeset-description
 
   476   
   471       @@ -1,3 +1,3 @@
 
   477   4ae3a4151de9 (1) A1
 
   472       -A1
 
   478     reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   473       +A3
 
   479       (No patch available, successor is unknown locally)
 
   474    
   480   
   475       -Better commit message
 
   481   471f378eab4c
 
   476       +Better better better commit message
 
   482     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)        
   477       
   483       (No patch available, context is not local)
 
   478   
   484   
   479   4ae3a4151de9 (1) A1
 
       
   480
evolve