Patchwork [3,of,6,V2] filemerge: drop extra white space

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 5, 2014, 11:30 p.m.
Message ID <4399f677c588e96fd760.1407281443@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/5270/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 5, 2014, 11:30 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1407276742 25200
#      Tue Aug 05 15:12:22 2014 -0700
# Node ID 4399f677c588e96fd760bbcaccb746bd01d0857b
# Parent  e6fa924a5144ddfeddd4a7c2e9b26af694eef53c
filemerge: drop extra white space

There should be no white space around the brace.

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -321,11 +321,11 @@  def _formatlabels(repo, fcd, fco, labels
     co = fco.changectx()
 
     ui = repo.ui
     template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
     template = templater.parsestring(template, quoted=False)
-    tmpl = templater.templater(None, cache={ 'conflictmarker' : template })
+    tmpl = templater.templater(None, cache={'conflictmarker': template})
 
     pad = max(len(labels[0]), len(labels[1]))
 
     return [_formatconflictmarker(repo, cd, tmpl, labels[0], pad),
             _formatconflictmarker(repo, co, tmpl, labels[1], pad)]