diff -r 10b6fc51f672 -r 451ec905625b mercurial/templater.py
--- a/mercurial/templater.py	Wed Oct 18 12:26:12 2006 +0200
+++ b/mercurial/templater.py	Wed Oct 18 17:58:51 2006 +0200
@@ -431,14 +431,15 @@
             if endname in self.t:
                 yield self.t(endname, **args)
 
-        if brinfo:
-            def showbranches(**args):
-                if changenode in brinfo:
-                    for x in showlist('branch', brinfo[changenode],
-                                      plural='branches', **args):
-                        yield x
-        else:
-            showbranches = ''
+        def showbranches(**args):
+            branch = changes[5].get("branch")
+            if branch:
+                yield showlist('branch', [branch], plural='branches', **args)
+            # add old style branches if requested
+            if brinfo and changenode in brinfo:
+                for x in showlist('branch', brinfo[changenode],
+                                  plural='branches', **args):
+                    yield x
 
         if self.ui.debugflag:
             def showmanifest(**args):