# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1541791135 -3600
# Node ID 12b026c49fdfd76e1301cc4faded59ed6127d39b
# Parent  4a3d588e53118826ff7e2c154b331e5732995046# Parent  ec37b19460ccdb2c3a245f888369cb2a458562d8
test-compat: merge stable into mercurial-4.7

diff -r ec37b19460cc -r 12b026c49fdf .hgtags
--- a/.hgtags	Thu Oct 25 18:32:49 2018 +0200
+++ b/.hgtags	Fri Nov 09 20:18:55 2018 +0100
@@ -73,3 +73,4 @@
 8d8f08245f9715adf48d6f0f59772b04fd7de1f7 8.2.0
 c6362c4abd695fb96e2fd63c150c051852303c7e 8.2.1
 45d4b49d81d9ed23e40126f72bfc3fb339522356 8.3.0
+b90422a11a887c6ff756c2a5622ea0a1e260ff4c 8.3.1
diff -r ec37b19460cc -r 12b026c49fdf CHANGELOG
--- a/CHANGELOG	Thu Oct 25 18:32:49 2018 +0200
+++ b/CHANGELOG	Fri Nov 09 20:18:55 2018 +0100
@@ -2,7 +2,13 @@
 =========
 
 
-8.3.1 - in progress
+8.3.2 - in progress
+-------------------
+
+  * evolve: not longer attempt to translate revision's descriptions (issue6016)
+  * evolve: fix compatibility with mercurial 4.8's narrow extension.
+
+8.3.1 -- 2018-10-25
 -------------------
 
   * evolve+topic: fix possible crash during content-divergence evolution
diff -r ec37b19460cc -r 12b026c49fdf debian/changelog
--- a/debian/changelog	Thu Oct 25 18:32:49 2018 +0200
+++ b/debian/changelog	Fri Nov 09 20:18:55 2018 +0100
@@ -1,3 +1,9 @@
+mercurial-evolve (8.3.1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Thu, 25 Oct 2018 18:39:17 +0200
+
 mercurial-evolve (8.3.0-1) unstable; urgency=medium
 
   * new upstream release
diff -r ec37b19460cc -r 12b026c49fdf hgext3rd/evolve/compat.py
--- a/hgext3rd/evolve/compat.py	Thu Oct 25 18:32:49 2018 +0200
+++ b/hgext3rd/evolve/compat.py	Fri Nov 09 20:18:55 2018 +0100
@@ -214,6 +214,7 @@
         return bool(upres[-1])
     return bool(upres.unresolvedcount)
 
+hg48 = util.safehasattr(copies, 'stringutil')
 # code imported from Mercurial core at ae17555ef93f + patch
 def fixedcopytracing(repo, c1, c2, base):
     """A complete copy-patse of copies._fullcopytrace with a one line fix to
@@ -280,8 +281,12 @@
             }
 
     # find interesting file sets from manifests
-    addedinm1 = m1.filesnotin(mb)
-    addedinm2 = m2.filesnotin(mb)
+    if hg48:
+        addedinm1 = m1.filesnotin(mb, repo.narrowmatch())
+        addedinm2 = m2.filesnotin(mb, repo.narrowmatch())
+    else:
+        addedinm1 = m1.filesnotin(mb)
+        addedinm2 = m2.filesnotin(mb)
     bothnew = sorted(addedinm1 & addedinm2)
     if tca == base:
         # unmatched file from base
@@ -294,9 +299,16 @@
         # unmatched file from topological common ancestors (no DAG rotation)
         # need to recompute this for directory move handling when grafting
         mta = tca.manifest()
-        u1u, u2u = copies._computenonoverlap(repo, c1, c2, m1.filesnotin(mta),
-                                             m2.filesnotin(mta),
-                                             baselabel='topological common ancestor')
+        if hg48:
+            m1f = m1.filesnotin(mta, repo.narrowmatch())
+            m2f = m2.filesnotin(mta, repo.narrowmatch())
+            baselabel = 'topological common ancestor'
+            u1u, u2u = copies._computenonoverlap(repo, c1, c2, m1f, m2f,
+                                                 baselabel=baselabel)
+        else:
+            u1u, u2u = copies._computenonoverlap(repo, c1, c2, m1.filesnotin(mta),
+                                                 m2.filesnotin(mta),
+                                                 baselabel='topological common ancestor')
 
     for f in u1u:
         copies._checkcopies(c1, c2, f, base, tca, dirtyc1, limit, data1)
diff -r ec37b19460cc -r 12b026c49fdf hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Thu Oct 25 18:32:49 2018 +0200
+++ b/hgext3rd/evolve/metadata.py	Fri Nov 09 20:18:55 2018 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '8.3.1.dev'
+__version__ = '8.3.2.dev'
 testedwith = '4.3.2 4.4.2 4.5.2 4.6.2 4.7'
 minimumhgversion = '4.3'
 buglink = 'https://bz.mercurial-scm.org/'
diff -r ec37b19460cc -r 12b026c49fdf hgext3rd/evolve/utility.py
--- a/hgext3rd/evolve/utility.py	Thu Oct 25 18:32:49 2018 +0200
+++ b/hgext3rd/evolve/utility.py	Fri Nov 09 20:18:55 2018 +0100
@@ -161,8 +161,8 @@
     promptmsg = customheader + "\n"
     for idx, rev in enumerate(revs):
         curctx = repo[rev]
-        revmsg = _("%d: [%s] %s\n" % (idx, curctx,
-                                      curctx.description().split("\n")[0]))
+        revmsg = "%d: [%s] %s\n" % (idx, curctx,
+                                    curctx.description().split("\n")[0])
         promptmsg += revmsg
 
     promptmsg += _("q: quit the prompt\n")
diff -r ec37b19460cc -r 12b026c49fdf hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Thu Oct 25 18:32:49 2018 +0200
+++ b/hgext3rd/topic/__init__.py	Fri Nov 09 20:18:55 2018 +0100
@@ -177,7 +177,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.12.1.dev'
+__version__ = '0.12.2.dev'
 
 testedwith = '4.3.3 4.4.2 4.5.2 4.6.2 4.7'
 minimumhgversion = '4.3'