Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use new function for getting first line of string
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 24 Mar 2022 22:05:36 -0700
changeset 49028 db93041e5b1c
parent 49027 0f0e3830c099
child 49029 eb8aed493a56
filemerge: use new function for getting first line of string Differential Revision: https://phab.mercurial-scm.org/D12411
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Thu Mar 24 22:05:27 2022 -0700
+++ b/mercurial/filemerge.py	Thu Mar 24 22:05:36 2022 -0700
@@ -848,7 +848,7 @@
 
     props = {b'ctx': ctx}
     templateresult = template.renderdefault(props)
-    input.label_detail = templateresult.splitlines()[0]  # split for safety
+    input.label_detail = stringutil.firstline(templateresult)  # avoid '\n'
 
 
 def _populate_label_details(repo, inputs, tool=None):
mercurial