changeset 57:5c8ae5adddfc

committemplate: stop prefixing the diff with "HG:" At some point, hg grew an option to remove everything after the scissors. Thus I can now configure Emacs to read commit buffers as diff buffers and it will work correctly.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 13 Feb 2019 15:00:18 -0500
parents 23a56d3e6055
children ada085ef8aaa
files hgrc
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgrc
+++ b/hgrc
@@ -53,7 +53,12 @@
 pager = LESS='FSRX' less
 
 # This changes the default message in commit messages to include the
-# diff I'm about to commit.
+# diff I'm about to commit. 
+#
+# Note that this actually is a properly-formatted diff, so you can set
+# up your text editor to highlight this as a diff. Thus you can see a
+# diff of the changes you're about to commit and write your commit
+# message above them.
 [committemplate]
 changeset = {desc}\n\n
     HG: {extramsg}
@@ -62,7 +67,10 @@
    }HG: branch '{branch}'\n{if(currentbookmark,
    "HG: bookmark '{currentbookmark}'\n")  }{subrepos %
    "HG: subrepo {subrepo}\n"              }
-   {splitlines(diff()) % 'HG: {line}\n'}
+    HG: ------------------------ >8 ------------------------
+    HG: Do not touch the line above.
+    HG: Everything below will be removed
+    {diff()}
 
 
 # This defines my custom xterm-256 colours.