Patchwork merge: concatenate default conflict marker at parsing phase of .py

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 2, 2016, 1:03 p.m.
Message ID <93655d2b1ba1268615fd.1470143000@mimosa>
Download mbox | patch
Permalink /patch/16035/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 2, 2016, 1:03 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1430790694 -32400
#      Tue May 05 10:51:34 2015 +0900
# Node ID 93655d2b1ba1268615fd80ff3acfa04cea6f8f14
# Parent  f6a3e181d30c8556d0188bd6d190229198fc8a01
merge: concatenate default conflict marker at parsing phase of .py

"+" operations are unnecessary.
Pierre-Yves David - Aug. 2, 2016, 2:35 p.m.
On 08/02/2016 03:03 PM, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1430790694 -32400
> #      Tue May 05 10:51:34 2015 +0900
> # Node ID 93655d2b1ba1268615fd80ff3acfa04cea6f8f14
> # Parent  f6a3e181d30c8556d0188bd6d190229198fc8a01
> merge: concatenate default conflict marker at parsing phase of .py

Pushed, thanks

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -508,11 +508,11 @@  def _formatconflictmarker(repo, ctx, tem
     # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
     return util.ellipsis(mark, 80 - 8)
 
-_defaultconflictmarker = ('{node|short} ' +
-    '{ifeq(tags, "tip", "", "{tags} ")}' +
-    '{if(bookmarks, "{bookmarks} ")}' +
-    '{ifeq(branch, "default", "", "{branch} ")}' +
-    '- {author|user}: {desc|firstline}')
+_defaultconflictmarker = ('{node|short} '
+                          '{ifeq(tags, "tip", "", "{tags} ")}'
+                          '{if(bookmarks, "{bookmarks} ")}'
+                          '{ifeq(branch, "default", "", "{branch} ")}'
+                          '- {author|user}: {desc|firstline}')
 
 _defaultconflictlabels = ['local', 'other']