##// END OF EJS Templates
configitems: register the 'ui.mergemarkertemplate' config
Boris Feld -
r33523:11025c4f default
parent child Browse files
Show More
@@ -484,6 +484,14 b" coreconfigitem('ui', 'merge',"
484 coreconfigitem('ui', 'mergemarkers',
484 coreconfigitem('ui', 'mergemarkers',
485 default='basic',
485 default='basic',
486 )
486 )
487 coreconfigitem('ui', 'mergemarkertemplate',
488 default=('{node|short} '
489 '{ifeq(tags, "tip", "", '
490 'ifeq(tags, "", "", "{tags} "))}'
491 '{if(bookmarks, "{bookmarks} ")}'
492 '{ifeq(branch, "default", "", "{branch} ")}'
493 '- {author|user}: {desc|firstline}')
494 )
487 coreconfigitem('ui', 'nontty',
495 coreconfigitem('ui', 'nontty',
488 default=False,
496 default=False,
489 )
497 )
@@ -555,13 +555,6 b' def _formatconflictmarker(repo, ctx, tem'
555 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
555 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
556 return util.ellipsis(mark, 80 - 8)
556 return util.ellipsis(mark, 80 - 8)
557
557
558 _defaultconflictmarker = ('{node|short} '
559 '{ifeq(tags, "tip", "", '
560 'ifeq(tags, "", "", "{tags} "))}'
561 '{if(bookmarks, "{bookmarks} ")}'
562 '{ifeq(branch, "default", "", "{branch} ")}'
563 '- {author|user}: {desc|firstline}')
564
565 _defaultconflictlabels = ['local', 'other']
558 _defaultconflictlabels = ['local', 'other']
566
559
567 def _formatlabels(repo, fcd, fco, fca, labels):
560 def _formatlabels(repo, fcd, fco, fca, labels):
@@ -574,7 +567,7 b' def _formatlabels(repo, fcd, fco, fca, l'
574 ca = fca.changectx()
567 ca = fca.changectx()
575
568
576 ui = repo.ui
569 ui = repo.ui
577 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
570 template = ui.config('ui', 'mergemarkertemplate')
578 template = templater.unquotestring(template)
571 template = templater.unquotestring(template)
579 tmpl = formatter.maketemplater(ui, template)
572 tmpl = formatter.maketemplater(ui, template)
580
573
General Comments 0
You need to be logged in to leave comments. Login now