Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 23 Apr 2019 14:18:10 +0200
branchmercurial-4.6
changeset 4569 2545d4e962e3
parent 4568 0cc913ea542d (diff)
parent 4560 c6843baf36fc (current diff)
child 4570 6f26dea843d6
child 4673 3ef4980353af
test-compat: merge mercurial-4.7 into mercurial-4.6
--- a/CHANGELOG	Tue Apr 23 12:29:47 2019 +0200
+++ b/CHANGELOG	Tue Apr 23 14:18:10 2019 +0200
@@ -7,6 +7,7 @@
   * evolve: make sure we use upstream merge code with 5.0,
   * evolve: restore compatibility with 4.4
             (This regress the narrow compatibility)
+  * evolve: fix progress display with hg <= 4.6
   * topic: compatibility with mercurial-5.0,
   * topic: improve extensions isolation (issue6121).
 
--- a/hgext3rd/evolve/compat.py	Tue Apr 23 12:29:47 2019 +0200
+++ b/hgext3rd/evolve/compat.py	Tue Apr 23 14:18:10 2019 +0200
@@ -67,7 +67,7 @@
             progress.complete()
 else:
     def progress(ui, topic, pos, item="", unit="", total=None):
-        ui.progress(topic, pos, item="", unit="", total=None)
+        ui.progress(topic, pos, item, unit, total)
 
 # XXX: Better detection of property cache
 if 'predecessors' not in dir(obsolete.obsstore):
--- a/hgext3rd/evolve/metadata.py	Tue Apr 23 12:29:47 2019 +0200
+++ b/hgext3rd/evolve/metadata.py	Tue Apr 23 14:18:10 2019 +0200
@@ -6,6 +6,6 @@
 # GNU General Public License version 2 or any later version.
 
 __version__ = '8.5.1.dev'
-testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
+testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9 5.0'
 minimumhgversion = '4.4'
 buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Tue Apr 23 12:29:47 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Tue Apr 23 14:18:10 2019 +0200
@@ -182,7 +182,7 @@
 
 __version__ = '0.14.1.dev'
 
-testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
+testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9 5.0'
 minimumhgversion = '4.4'
 buglink = 'https://bz.mercurial-scm.org/'
evolve