Mercurial > evolve

--- a/.hgtags	Thu Feb 04 19:23:45 2021 +0800
+++ b/.hgtags	Tue Feb 09 19:11:39 2021 +0800
@@ -90,3 +90,5 @@
 fb543438704b73b22023a493c9ef76fc8746b796 10.0.1
 1cce884c944830a7b331a17fd18614b93cbac987 10.0.2
 782cbadb123fe4991e91a03d367e02d0b5ae969c 10.1.0
+35b883a4ff5a97973eb9e6f00014e71f14cebe70 10.2.0
+eadc1d09f2f567fdae7280aefc8cf4cdc4d78cbc 10.2.0.post1
--- a/CHANGELOG	Thu Feb 04 19:23:45 2021 +0800
+++ b/CHANGELOG	Tue Feb 09 19:11:39 2021 +0800
@@ -1,35 +1,34 @@
 Changelog
 =========

-10.1.1 -- in progress
----------------------
+10.2.0.post1 -- 2021-02-01
+--------------------------
+
+same content as 10.2.0, but with a valid tarball on pypi.
+
+10.2.0 -- 2021-02-01
+--------------------
+
+  * compatibility with Mercurial 5.7

   * doc: update the MQ To Evolve guide and fix build warning for index.rst

+  * evolve: improve resolution of some case of parent divergence
+  * evolve: respect command-templates.oneline-summary if configured
   * evolve: remove spurious "working directory is now at ..." messages
   * evolve: various documentation improvements

   * packaging: default to building docs on Python 3

-topic:
+  * strip: remove experimental.prunestrip option
+
+topic (0.21.0)
+
+  * performance: speed up various operations using an in-memory cache for topic

   * rebase: prevent in-memory rebase from silently dropping topic (by disabling
     the feature)

-10.2.0 - in progress
---------------------
-
-  * compatibility with Mercurial 5.7
-
-  * evolve: improve resolution of some case of parent divergence
-  * evolve: respect command-templates.oneline-summary if configured
-
-  * strip: remove experimental.prunestrip option
-
-topic:
-
-  * performance: speed up various operations using an in-memory cache for topic
-
   * topic: rework how ctx.branch() is wrapped
   * topic: look for topic heads only when necessary, this fixes the output of
     e.g. hg heads when topics are in play
--- a/MANIFEST.in	Thu Feb 04 19:23:45 2021 +0800
+++ b/MANIFEST.in	Tue Feb 09 19:11:39 2021 +0800
@@ -4,6 +4,7 @@
 include MANIFEST.in
 include README.rst
 include setup.py
+recursive-include hgext3rd *.py
 recursive-include tests *.py *.sh *.t

 include docs/makefile
@@ -18,7 +19,7 @@

 exclude docs/tutorial/.netlify
 exclude .gitlab-ci.yml
-exclude ./hgext3rd/evolve/legacy.py
+exclude hgext3rd/evolve/legacy.py
 exclude .hg-format-source
 exclude Makefile
 exclude tests/test-drop.t
--- a/debian/changelog	Thu Feb 04 19:23:45 2021 +0800
+++ b/debian/changelog	Tue Feb 09 19:11:39 2021 +0800
@@ -1,3 +1,15 @@
+mercurial-evolve (10.2.0.post1-1) unstable; urgency=medium
+
+  * identical release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Mon, 01 Feb 2021 12:15:12 +0100
+
+mercurial-evolve (10.2.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Anton Shestakov <av6@dwimlabs.net>  Mon, 01 Feb 2021 14:43:30 +0800
+
 mercurial-evolve (10.1.0-1) unstable; urgency=medium

   * new upstream release
--- a/hgext3rd/evolve/metadata.py	Thu Feb 04 19:23:45 2021 +0800
+++ b/hgext3rd/evolve/metadata.py	Tue Feb 09 19:11:39 2021 +0800
@@ -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__ = b'10.2.0.dev'
-testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6'
+__version__ = b'10.3.0.dev'
+testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7'
 minimumhgversion = b'4.6'
 buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Thu Feb 04 19:23:45 2021 +0800
+++ b/hgext3rd/topic/__init__.py	Tue Feb 09 19:11:39 2021 +0800
@@ -232,9 +232,9 @@
               b'topic.active': b'green',
               }

-__version__ = b'0.21.0.dev'
+__version__ = b'0.22.0.dev'

-testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6'
+testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7'
 minimumhgversion = b'4.6'
 buglink = b'https://bz.mercurial-scm.org/'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-check-sdist.t	Tue Feb 09 19:11:39 2021 +0800
@@ -0,0 +1,52 @@
+#require test-repo
+
+Enable obsolescence to avoid the warning issue when obsmarkers are found
+
+  $ cat << EOF >> "$HGRCPATH"
+  > [experimental]
+  > evolution = all
+  > EOF
+
+  $ cd "$TESTDIR"/..
+  $ "$PYTHON" setup.py sdist --dist-dir "$TESTTMP"/dist > /dev/null
+  */dist.py:*: UserWarning: Unknown distribution option: 'python_requires' (glob)
+    warnings.warn(msg)
+  warning: sdist: standard file not found: should have one of README, README.txt (?)
+   (?)
+  warning: no previously-included files found matching 'docs/tutorial/.netlify'
+  warning: no previously-included files found matching '.gitlab-ci.yml'
+  warning: no previously-included files found matching '.hg-format-source'
+  warning: no previously-included files found matching 'Makefile'
+  no previously-included directories found matching 'contrib'
+  no previously-included directories found matching 'debian'
+  no previously-included directories found matching '.gitlab'
+  $ cd "$TESTTMP"/dist
+
+  $ wc -c hg-evolve-*.tar.gz
+  8????? hg-evolve-*.tar.gz (glob)
+
+  $ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files
+  $ wc -l files
+  343 files
+  $ fgrep debian files
+  tests/test-check-debian.t
+  $ fgrep __init__.py files
+  hgext3rd/__init__.py
+  hgext3rd/evolve/__init__.py
+  hgext3rd/evolve/thirdparty/__init__.py
+  hgext3rd/topic/__init__.py
+  $ fgrep common.sh files
+  docs/tutorial/testlib/common.sh
+  tests/testlib/common.sh
+  $ fgrep README files
+  README.rst
+  docs/README
+  docs/tutorial/README.rst
+  hgext3rd/topic/README
+
+  $ egrep '(gitlab|contrib|hack|format-source)' files
+  [1]
+  $ fgrep legacy.py files
+  [1]
+  $ fgrep netlify files
+  [1]
--- a/tests/test-topic-stack.t	Thu Feb 04 19:23:45 2021 +0800
+++ b/tests/test-topic-stack.t	Tue Feb 09 19:11:39 2021 +0800
@@ -66,7 +66,7 @@
   active topic 'other' is now empty
   (use 'hg topic --clear' to clear it if needed)

-After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informating the user about it and displaying good data in this case.
+After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informing the user about it and displaying good data in this case.

   $ hg topic
      foo   (4 changesets)
@@ -469,10 +469,10 @@
   s1: c_c
   s0^ c_b (base)

-Case with multiple heads on the topic with unstability involved
+Case with multiple heads on the topic with instability involved
 ---------------------------------------------------------------

-We amend the message to make sure the display base pick the right changeset
+We amend the message to make sure the display base picks the right changeset

   $ hg up 'desc(c_d)'
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -759,7 +759,7 @@
 Even with some obsolete and orphan changesets

 (the ordering of each branch of "blue" change because their hash change. we
-should stabilize this eventuelly)
+should stabilize this eventually)

   $ hg up 'desc("c_B")'
   switching to topic red
@@ -1026,7 +1026,7 @@
   @@ -0,0 +1,1 @@
   +zzz

-Check that stack ouput still make sense
+Check that stack output still makes sense

   $ hg stack
   ### topic: blue