Mercurial > public > mercurial-scm > evolve
changeset 7038:395798a9eb1a mercurial-5.9
test-compat: merge mercurial-6.0 into mercurial-5.9
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 10 Mar 2025 17:42:43 +0400 |
| parents | e45b2d251704 (current diff) e5167867861a (diff) |
| children | f7a9d83b8e14 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 11 files changed, 50 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab/issue_templates/new-version.md Wed Feb 05 14:55:23 2025 +0100 +++ b/.gitlab/issue_templates/new-version.md Mon Mar 10 17:42:43 2025 +0400 @@ -17,7 +17,6 @@ * [ ] update the `__version__` field of all relevant extensions * [ ] create a new Debian entry * [ ] tag the version -* [ ] move the `@` bookmark to the new tag * [ ] push/publish the tag to the main repository * [ ] upload the tarball to PyPI * [ ] build .deb on Heptapod CI for the tagged commit
--- a/.hgtags Wed Feb 05 14:55:23 2025 +0100 +++ b/.hgtags Mon Mar 10 17:42:43 2025 +0400 @@ -113,3 +113,5 @@ ed7c98393e060210689f0b94d79e8b990403b6a9 11.1.4 6219898ee0ad2ebd1d75500ac9d1b02e5b539de2 11.1.5 885e8a8414bde9a14dcefbd342a9704e8ace7649 11.1.6 +3ea6267f54f19546fee70190c9fcf58ed6fa74a3 11.1.7 +175b1a7325335e651d3e25eb9f5487429c64706c 11.1.7.post1
--- a/CHANGELOG Wed Feb 05 14:55:23 2025 +0100 +++ b/CHANGELOG Mon Mar 10 17:42:43 2025 +0400 @@ -1,7 +1,21 @@ Changelog ========= -11.1.7 - in progress +11.1.8 - in progress +-------------------- + + * compatibility with Mercurial 7.0 + +topic (1.1.8) + + * compatibility with Mercurial 7.0 + +11.1.7.post1 -- 2025-02-06 +-------------------------- + + * no changes from 11.1.7, only upgraded packaging + +11.1.7 -- 2025-02-06 -------------------- * evolve: fix version check from 972d98ce3552 for hg 6.8 (issue6958)
--- a/README.rst Wed Feb 05 14:55:23 2025 +0100 +++ b/README.rst Mon Mar 10 17:42:43 2025 +0400 @@ -299,8 +299,6 @@ * tag the commit, -* move ``@`` bookmark to the new tag, - * push and publish the tag, * upload the tarball to PyPI,
--- a/debian/changelog Wed Feb 05 14:55:23 2025 +0100 +++ b/debian/changelog Mon Mar 10 17:42:43 2025 +0400 @@ -1,3 +1,15 @@ +mercurial-evolve (11.1.7.post1-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov <av6@dwimlabs.net> Thu, 06 Feb 2025 22:57:24 +0100 + +mercurial-evolve (11.1.7-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov <av6@dwimlabs.net> Thu, 06 Feb 2025 14:22:10 +0100 + mercurial-evolve (11.1.6-1) unstable; urgency=medium * new upstream release
--- a/docs/conf.py Wed Feb 05 14:55:23 2025 +0100 +++ b/docs/conf.py Mon Mar 10 17:42:43 2025 +0400 @@ -33,7 +33,7 @@ # General substitutions. project = 'evolve extension for Mercurial' -copyright = '2010-2014, Pierre-Yves David, Greg Ward, and contributors' +copyright = '2010-2025, Pierre-Yves David, Greg Ward, and contributors' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. @@ -98,7 +98,7 @@ # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -html_favicon = 'logo-evolve.ico' +html_favicon = 'static/logo-evolve.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files,
--- a/docs/troubles-handling.rst Wed Feb 05 14:55:23 2025 +0100 +++ b/docs/troubles-handling.rst Mon Mar 10 17:42:43 2025 +0400 @@ -1,3 +1,5 @@ +:orphan: + ########################################################### Possible troubles in rewriting history and their resolution ###########################################################
--- a/docs/tutorial/README.rst Wed Feb 05 14:55:23 2025 +0100 +++ b/docs/tutorial/README.rst Mon Mar 10 17:42:43 2025 +0400 @@ -1,3 +1,5 @@ +:orphan: + ============================= Training supports =============================
--- a/hgext3rd/evolve/metadata.py Wed Feb 05 14:55:23 2025 +0100 +++ b/hgext3rd/evolve/metadata.py Mon Mar 10 17:42:43 2025 +0400 @@ -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'11.1.7.dev0' -testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9' +__version__ = b'11.1.8.dev0' +testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0' minimumhgversion = b'4.9' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Wed Feb 05 14:55:23 2025 +0100 +++ b/hgext3rd/topic/__init__.py Mon Mar 10 17:42:43 2025 +0400 @@ -238,9 +238,9 @@ b'log.topic': b'green_background', } -__version__ = b'1.1.7.dev0' +__version__ = b'1.1.8.dev0' -testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9' +testedwith = b'4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0' minimumhgversion = b'4.9' buglink = b'https://bz.mercurial-scm.org/' @@ -719,8 +719,8 @@ self._topic_namespaces = namespaces return namespaces - def wlock(self, wait=True): - wlock = super(topicrepo, self).wlock(wait=wait) + def wlock(self, wait=True, **kwargs): + wlock = super(topicrepo, self).wlock(wait=wait, **kwargs) # we should definitely drop this at some point, but it depends on # our own release schedule, not core's, so here's hg 1.0 # hg <= 1.0 (cfa08c88a5c4)
--- a/tests/testlib/pythonpath.sh Wed Feb 05 14:55:23 2025 +0100 +++ b/tests/testlib/pythonpath.sh Mon Mar 10 17:42:43 2025 +0400 @@ -11,3 +11,12 @@ else export PYTHONPATH=$SRCDIR fi + +for SP in "$HGTMP"/install/lib/python*/site-packages/; do + # find site-packages directory for each Python version (there's most likely + # only one, but let's be safe) + if [ -d "$SP" ]; then + # adding path to our extensions to the current virtualenv + echo "$SRCDIR" > "$SP/evolve.pth" + fi +done