From patchwork Wed Sep 30 14:39:58 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [evolve-ext] evolve: ignore ui argument passed to help loader
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 10705
Message-Id: <405be3783fbc91b6310f.1443623998@mimosa>
To: mercurial-devel@selenic.com
Date: Wed, 30 Sep 2015 23:39:58 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1443623580 -32400
#      Wed Sep 30 23:33:00 2015 +0900
# Node ID 405be3783fbc91b6310f183061984078227b580e
# Parent  8dfb88ca0c08c2f3b084ab090195dd5e50f65ce4
evolve: ignore ui argument passed to help loader

The API changed at Mercurial e0c572d4d112.

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -3546,7 +3546,8 @@ def _installwireprotocol(ui):
         return capabilities(oldcap, repo, proto)
     wireproto.commands['capabilities'] = (newcap, args)
 
-def _helploader():
+# Mercurial >= 3.6 passes ui
+def _helploader(ui=None):
     return help.gettext(evolutionhelptext)
 
 @eh.uisetup