Backed out changeset: e1dde7363601

hgext/churn.py

@@ -150,10 +150,8 b' def churn(ui, repo, *pats, **opts):'
     if opts.get('diffstat'):
         width -= 15
         def format(name, (added, removed)):
-            return "%s %15s %s%s\n" % (ui.label(pad(name, maxname),
-                                                'ui.plain'),
-                                       ui.label('+%d/-%d' % (added, removed),
-                                                'ui.plain'),
+            return "%s %15s %s%s\n" % (pad(name, maxname),
+                                       '+%d/-%d' % (added, removed),
                                        ui.label('+' * charnum(added),
                                                 'diffstat.inserted'),
                                        ui.label('-' * charnum(removed),
@@ -161,14 +159,14 b' def churn(ui, repo, *pats, **opts):'
     else:
         width -= 6
         def format(name, count):
-            return ui.label("%s %6d %s\n" % (pad(name, maxname), sum(count),
-                            '*' * charnum(sum(count))), 'ui.plain')
+            return "%s %6d %s\n" % (pad(name, maxname), sum(count),
+                                    '*' * charnum(sum(count)))
 
     def charnum(count):
         return int(round(count * width / maxcount))
 
     for name, count in rate:
-        ui.write(format(name, count), label='ui.labeled')
+        ui.write(format(name, count))
 
 
 cmdtable = {

hgext/color.py

@@ -108,9 +108,7 b' from mercurial.i18n import _'
            'status.ignored': 'black bold',
            'status.modified': 'blue bold',
            'status.removed': 'red bold',
-           'status.unknown': 'magenta bold underline',
-           'ui.labeled': 'none',
-           'ui.plain': 'none'}
+           'status.unknown': 'magenta bold underline'}
 
 
 def render_effects(text, effects):
@@ -144,8 +142,6 b' def configstyles(ui):'
 
 _buffers = None
 def style(msg, label):
-    if label in ('ui.plain', 'ui.labeled'):
-        return msg
     effects = []
     for l in label.split():
         s = _styles.get(l, '')

hgext/mq.py

@@ -2145,17 +2145,17 b' def guard(ui, repo, *args, **opts):'
     '''
     def status(idx):
         guards = q.series_guards[idx] or ['unguarded']
-        out = ['%s: ' % ui.label(q.series[idx], 'qguard.patch')]
+        ui.write('%s: ' % ui.label(q.series[idx], 'qguard.patch'))
         for i, guard in enumerate(guards):
             if guard.startswith('+'):
-                out.append(ui.label(guard, 'qguard.positive'))
+                ui.write(guard, label='qguard.positive')
             elif guard.startswith('-'):
-                out.append(ui.label(guard, 'qguard.negative'))
+                ui.write(guard, label='qguard.negative')
             else:
-                out.append(ui.label(guard, 'qguard.unguarded'))
+                ui.write(guard, label='qguard.unguarded')
             if i != len(guards) - 1:
-                out.append(ui.label(' ', 'ui.plain'))
-        ui.write(''.join(out) + '\n', label='ui.labeled')
+                ui.write(' ')
+        ui.write('\n')
     q = repo.mq
     patch = None
     args = list(args)
@@ -2799,8 +2799,7 b' def summary(orig, ui, repo, *args, **kwa'
     if u:
         m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u)
     if m:
-        ui.write("mq:     ")
-        ui.write(', '.join(m) + '\n', label='ui.labeled')
+        ui.write("mq:     %s\n" % ', '.join(m))
     else:
         ui.note(_("mq:     (empty queue)\n"))
     return r

mercurial/commands.py

@@ -3280,22 +3280,22 b' def summary(ui, repo, **opts):'
     cleanworkdir = False
 
     if len(parents) > 1:
-        t += ui.label(_(' (merge)'), 'ui.plain')
+        t += _(' (merge)')
     elif branch != parents[0].branch():
-        t += ui.label(_(' (new branch)'), 'ui.plain')
+        t += _(' (new branch)')
     elif (parents[0].extra().get('close') and
           pnode in repo.branchheads(branch, closed=True)):
-        t += ui.label(_(' (head closed)'), 'ui.plain')
+        t += _(' (head closed)')
     elif (not st[0] and not st[1] and not st[2] and not st[7]):
-        t += ui.label(_(' (clean)'), 'ui.plain')
+        t += _(' (clean)')
         cleanworkdir = True
     elif pnode not in bheads:
-        t += ui.label(_(' (new branch head)'), 'ui.plain')
+        t += _(' (new branch head)')
 
     if cleanworkdir:
-        ui.status(_('commit: %s\n') % t.strip(), label='ui.labeled')
+        ui.status(_('commit: %s\n') % t.strip())
     else:
-        ui.write(_('commit: %s\n') % t.strip(), label='ui.labeled')
+        ui.write(_('commit: %s\n') % t.strip())
 
     # all ancestors of branch heads - all ancestors of parent = new csets
     new = [0] * len(repo)

mercurial/ui.py

@@ -546,9 +546,5 b' class ui(object):'
 
         ui.write(s, 'label') is equivalent to
         ui.write(ui.label(s, 'label')).
-
-        Callers of ui.label() should pass labeled text back to
-        ui.write() with a label of 'ui.labeled' so implementations know
-        that the text has already been escaped and marked up.
         '''
         return msg