Patchwork [V2] templatefilters: inline hbisect.shortlabel()

login
register
mail settings
Submitter Yuya Nishihara
Date March 10, 2018, 8:18 a.m.
Message ID <7463bb17ee1a9a5cdc5d.1520669888@mimosa>
Download mbox | patch
Permalink /patch/29246/
State Superseded
Headers show

Comments

Yuya Nishihara - March 10, 2018, 8:18 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520342101 21600
#      Tue Mar 06 07:15:01 2018 -0600
# Node ID 7463bb17ee1a9a5cdc5dbbf6ec370e15dac5b20b
# Parent  61f2121cac167752acc5014ac7f4c4da100a2097
templatefilters: inline hbisect.shortlabel()

It's pretty simple. I don't think the business logic has to be placed in
hbisect.py.

Patch

diff --git a/mercurial/hbisect.py b/mercurial/hbisect.py
--- a/mercurial/hbisect.py
+++ b/mercurial/hbisect.py
@@ -267,12 +267,6 @@  def label(repo, node):
 
     return None
 
-def shortlabel(label):
-    if label:
-        return label[0].upper()
-
-    return None
-
 def printresult(ui, repo, state, displayer, nodes, good):
     if len(nodes) == 1:
         # narrowed it down to a single revision
diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
--- a/mercurial/templatefilters.py
+++ b/mercurial/templatefilters.py
@@ -14,7 +14,6 @@  import time
 from . import (
     encoding,
     error,
-    hbisect,
     node,
     pycompat,
     registrar,
@@ -343,13 +342,15 @@  def short(text):
     return text[:12]
 
 @templatefilter('shortbisect')
-def shortbisect(text):
-    """Any text. Treats `text` as a bisection status, and
+def shortbisect(label):
+    """Any text. Treats `label` as a bisection status, and
     returns a single-character representing the status (G: good, B: bad,
     S: skipped, U: untested, I: ignored). Returns single space if `text`
     is not a valid bisection status.
     """
-    return hbisect.shortlabel(text) or ' '
+    if label:
+        return label[0].upper()
+    return ' '
 
 @templatefilter('shortdate')
 def shortdate(text):