# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1573176164 28800
# Node ID bd50608f54d8089811a6e28804b2081d88e7fe7f
# Parent  f84a6ddb7f3785aaf03ae9e3fcbd3e0082bbd399
obslog: rename {desc-diff} to {descdiff} since the former is invalid

diff -r f84a6ddb7f37 -r bd50608f54d8 hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Thu Nov 07 17:22:16 2019 -0800
+++ b/hgext3rd/evolve/obshistory.py	Thu Nov 07 17:22:44 2019 -0800
@@ -599,7 +599,7 @@
                     chunk = chunk.strip(b'\t')
                     if chunk and chunk != b'\n':
                         fm.plain(b'    ')
-                    fm.write(b'desc-diff', b'%s', chunk, label=label)
+                    fm.write(b'descdiff', b'%s', chunk, label=label)
 
             # Content patch
             diffopts = patch.diffallopts(repo.ui, {})
@@ -739,7 +739,7 @@
                     chunk = chunk.strip(b'\t')
                     if chunk and chunk != b'\n':
                         fm.plain(b'    ')
-                    fm.write(b'desc-diff', b'%s', chunk, label=label)
+                    fm.write(b'descdiff', b'%s', chunk, label=label)
 
             # Content patch
             diffopts = patch.diffallopts(repo.ui, {})
diff -r f84a6ddb7f37 -r bd50608f54d8 tests/test-evolve-obshistory-amend.t
--- a/tests/test-evolve-obshistory-amend.t	Thu Nov 07 17:22:16 2019 -0800
+++ b/tests/test-evolve-obshistory-amend.t	Thu Nov 07 17:22:44 2019 -0800
@@ -364,11 +364,18 @@
 Test that description diff works with templating
 BROKEN: should show description diff
   $ hg obslog --color=debug --patch 92210308515b \
-  > -T '{node} {desc|firstline}\n{markers % "description diff:\n```{desc-diff}```\n"}'
+  > -T '{node} {desc|firstline}\n{markers % "description diff:\n```{descdiff}```\n"}'
   @  92210308515b A3
   |
-  [ ui.warning|hg: parse error: arithmetic only defined on integers]
-  [255]
+  x  4f1685185907
+  |  description diff:
+  |  ``````
+  x  4ae3a4151de9 A1
+  |  description diff:
+  |  ``````
+  x  471f378eab4c
+     description diff:
+     ``````
 
 Check the output on the server
 ------------------------------