--- a/CHANGELOG Mon Jan 15 20:45:13 2018 +0100
+++ b/CHANGELOG Mon Jan 15 21:47:40 2018 +0100
@@ -1,36 +1,30 @@
Changelog
=========
-7.2.0 - in progress
+7.2.0 -- 2018-01-15
-------------------
+ * evolve: changes to the on disk format for interrupted evolve
+ * evolve: --continue now propertly preserve phase information (issue5720)
+ * evolve: --continue now properly reports merges as evolve
+ * commit: suggest using topic on new heads
+ * uncommit: `--revert` flag added to clean the wdir after uncommit
+ * obslog: add color support to content-diff output with --patch
+ * fix `hg prev` behavior on obsolete changesets
+ * no longer issues "obsolete working copy" message during no-op
+
* use the new instabilities names from mercurial 4.4+
(in `hg evolve --list` and other messages)
* new algorithm for obshashrange discovery:
- The new algorithm is fast, simpler to cache and with better complexity. It
+ The new algorithm is faster, simpler to cache and with better complexity. It
is able to handle repository of any size (naive python implementation is a
bit slow). Support for the previous experimental approach have been
dropped, please update both clients and servers. The new approach is still
hidden behind and experimental flag for now.
- * uncommit: `--revert` flag added to clean the wdir after uncommit
- * evolve: changes to the on disk format for interrupted evolve
- * evolve: preserve phase information with --continue (issue5720)
- * evolve: --continue now properly reports merges as evolve
- * commit: suggest using topic on new heads
- * obslog: add color support to content-diff output with --patch
-
-topic (0.7.1)
-
-7.1.1 - in progress
--------------------
-
- * fix `hg prev` behavior on obsolete changesets
- * no longer issue "obsolete working copy" message during no-op
-
-topic (0.6.1)
+topic (0.7.0)
* fix compatibility with Mercurial-4.3
* new template keyword `topic` to get changesets topic
--- a/debian/changelog Mon Jan 15 20:45:13 2018 +0100
+++ b/debian/changelog Mon Jan 15 21:47:40 2018 +0100
@@ -1,3 +1,9 @@
+mercurial-evolve (7.2.0) UNRELEASED; urgency=medium
+
+ * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Mon, 15 Jan 2018 21:44:57 +0100
+
mercurial-evolve (7.1.0-1) unstable; urgency=medium
* new upstream release
--- a/hgext3rd/evolve/depthcache.py Mon Jan 15 20:45:13 2018 +0100
+++ b/hgext3rd/evolve/depthcache.py Mon Jan 15 21:47:40 2018 +0100
@@ -1,3 +1,12 @@
+# Code dedicated to the caching of changeset depth
+#
+# These stable ranges are use for obsolescence markers discovery
+#
+# Copyright 2017 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
from __future__ import absolute_import
import array
--- a/hgext3rd/evolve/firstmergecache.py Mon Jan 15 20:45:13 2018 +0100
+++ b/hgext3rd/evolve/firstmergecache.py Mon Jan 15 21:47:40 2018 +0100
@@ -1,3 +1,12 @@
+# Code dedicated to the cache of 'max(merge()) and ::X'
+#
+# These stable ranges are use for obsolescence markers discovery
+#
+# Copyright 2017 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
from __future__ import absolute_import
import array
--- a/hgext3rd/evolve/metadata.py Mon Jan 15 20:45:13 2018 +0100
+++ b/hgext3rd/evolve/metadata.py Mon Jan 15 21:47:40 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__ = '7.2.0.dev'
+__version__ = '7.2.0'
testedwith = '4.1.3 4.2.3 4.3.2 4.4.2'
minimumhgversion = '4.1'
buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/evolve/stablerangecache.py Mon Jan 15 20:45:13 2018 +0100
+++ b/hgext3rd/evolve/stablerangecache.py Mon Jan 15 21:47:40 2018 +0100
@@ -1,3 +1,12 @@
+# Code dedicated to the caching of "stable ranges"
+#
+# These stable ranges are use for obsolescence markers discovery
+#
+# Copyright 2017 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
import abc
import heapq
import sqlite3
--- a/hgext3rd/topic/__init__.py Mon Jan 15 20:45:13 2018 +0100
+++ b/hgext3rd/topic/__init__.py Mon Jan 15 21:47:40 2018 +0100
@@ -175,7 +175,7 @@
'topic.active': 'green',
}
-__version__ = '0.7.0.dev'
+__version__ = '0.7.0'
testedwith = '4.1.3 4.2.3 4.3.3 4.4.2'
minimumhgversion = '4.1'