From patchwork Wed Aug  1 08:29:40 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [STABLE] revlog: fix descendant deprecated method
From: Boris Feld <boris.feld@octobus.net>
X-Patchwork-Id: 32986
Message-Id: <0f5d9a95a80508a19a30.1533112180@FB-lair>
To: mercurial-devel@mercurial-scm.org
Date: Wed, 01 Aug 2018 10:29:40 +0200

# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1533111828 -7200
#      Wed Aug 01 10:23:48 2018 +0200
# Branch stable
# Node ID 0f5d9a95a80508a19a30a78cb49b0fb3c86e6831
# Parent  fe3ca1e6f786c1ea8eadf8cff9057095dbb2d463
# EXP-Topic deprecate-descendant
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 0f5d9a95a805
revlog: fix descendant deprecated method

Fix the descendant deprecated method introduced earlier in this cycle.

This was catched by Yuya, thank you.

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1701,8 +1701,8 @@ class revlog(object):
         return self.isancestorrev(a, b)
 
     def descendant(self, a, b):
-        msg = (b'revlog.descendant is deprecated, use revlog.isancestorrev')
-        self._repo.ui.deprecwarn(msg, b'4.7')
+        msg = 'revlog.descendant is deprecated, use revlog.isancestorrev'
+        util.nouideprecwarn(msg, '4.7')
         return self.isancestorrev(a, b)
 
     def isancestorrev(self, a, b):
diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -38,7 +38,7 @@ Basic amend
   |  --- /dev/null
   |  +++ b/B
   |  @@ -0,0 +1,1 @@
-  |  +B2
+  |  +B3
   |
   o  0 426bada5c675 A
      diff --git a/A b/A