# HG changeset patch # User Pierre-Yves David # Date 1583331449 -3600 # Node ID 7bcda49915e8fe97898797f28718694df4167ba0 # Parent 591a0afd2ef35bd3775d1d645a491bdc421754ba# Parent b8b234123fe65c6acbb61e385df6bd4068646073 branching: merge with stable diff -r 591a0afd2ef3 -r 7bcda49915e8 .gitlab/issue_templates/new-version.md --- a/.gitlab/issue_templates/new-version.md Wed Mar 04 15:09:22 2020 +0100 +++ b/.gitlab/issue_templates/new-version.md Wed Mar 04 15:17:29 2020 +0100 @@ -17,6 +17,7 @@ * [ ] update the `__version__` field of all relevant extensions * [ ] create a new Debian entry * [ ] tag the version +* [ ] move the `@` bookmark on the new tag * [ ] push/publish the tag to the main repository * [ ] upload the tarball to PyPI * [ ] add `.dev` to the `__version__` field diff -r 591a0afd2ef3 -r 7bcda49915e8 README --- a/README Wed Mar 04 15:09:22 2020 +0100 +++ b/README Wed Mar 04 15:17:29 2020 +0100 @@ -117,7 +117,7 @@ .. _evolution: https://bz.mercurial-scm.org/buglist.cgi?component=evolution&query_format=advanced&resolution=--- The recommended way is to create Merge Request on -https://dev.heptapod.net/mercurial/evolve. To do so, create an account and +https://foss.heptapod.net/mercurial/evolve. To do so, create an account and request access. You'll then be able to create topic based merge request. Alternatively, you can use the patchbomb extension to send email to `mercurial diff -r 591a0afd2ef3 -r 7bcda49915e8 hgext3rd/evolve/depthcache.py --- a/hgext3rd/evolve/depthcache.py Wed Mar 04 15:09:22 2020 +0100 +++ b/hgext3rd/evolve/depthcache.py Wed Mar 04 15:17:29 2020 +0100 @@ -16,6 +16,12 @@ scmutil, ) +try: + from mercurial.utils.stringutil import forcebytestr +except ImportError: + # hg <= 4.5 (f99d64e8a4e4) + from mercurial.util import forcebytestr + from . import ( compat, error, @@ -206,5 +212,5 @@ cachefile.close() self._ondiskkey = self._cachekey except (IOError, OSError) as exc: - repo.ui.log(b'depthcache', b'could not write update %s\n' % exc) - repo.ui.debug(b'depthcache: could not write update %s\n' % exc) + repo.ui.log(b'depthcache', b'could not write update %s\n' % forcebytestr(exc)) + repo.ui.debug(b'depthcache: could not write update %s\n' % forcebytestr(exc)) diff -r 591a0afd2ef3 -r 7bcda49915e8 hgext3rd/evolve/firstmergecache.py --- a/hgext3rd/evolve/firstmergecache.py Wed Mar 04 15:09:22 2020 +0100 +++ b/hgext3rd/evolve/firstmergecache.py Wed Mar 04 15:17:29 2020 +0100 @@ -16,6 +16,12 @@ node as nodemod, ) +try: + from mercurial.utils.stringutil import forcebytestr +except ImportError: + # hg <= 4.5 (f99d64e8a4e4) + from mercurial.util import forcebytestr + from . import ( compat, error, @@ -143,5 +149,5 @@ cachefile.close() self._ondiskkey = self._cachekey except (IOError, OSError) as exc: - repo.ui.log(b'firstmergecache', b'could not write update %s\n' % exc) - repo.ui.debug(b'firstmergecache: could not write update %s\n' % exc) + repo.ui.log(b'firstmergecache', b'could not write update %s\n' % forcebytestr(exc)) + repo.ui.debug(b'firstmergecache: could not write update %s\n' % forcebytestr(exc)) diff -r 591a0afd2ef3 -r 7bcda49915e8 hgext3rd/evolve/obscache.py --- a/hgext3rd/evolve/obscache.py Wed Mar 04 15:09:22 2020 +0100 +++ b/hgext3rd/evolve/obscache.py Wed Mar 04 15:17:29 2020 +0100 @@ -19,6 +19,12 @@ util, ) +try: + from mercurial.utils.stringutil import forcebytestr +except ImportError: + # hg <= 4.5 (f99d64e8a4e4) + from mercurial.util import forcebytestr + from . import ( compat, exthelper, @@ -411,8 +417,8 @@ cachefile.close() self._ondiskkey = self._cachekey except (IOError, OSError) as exc: - repo.ui.log(b'obscache', b'could not write update %s\n' % exc) - repo.ui.debug(b'obscache: could not write update %s\n' % exc) + repo.ui.log(b'obscache', b'could not write update %s\n' % forcebytestr(exc)) + repo.ui.debug(b'obscache: could not write update %s\n' % forcebytestr(exc)) def load(self, repo): """load data from disk""" diff -r 591a0afd2ef3 -r 7bcda49915e8 hgext3rd/evolve/stablerangecache.py --- a/hgext3rd/evolve/stablerangecache.py Wed Mar 04 15:09:22 2020 +0100 +++ b/hgext3rd/evolve/stablerangecache.py Wed Mar 04 15:17:29 2020 +0100 @@ -22,6 +22,12 @@ util, ) +try: + from mercurial.utils.stringutil import forcebytestr +except ImportError: + # hg <= 4.5 (f99d64e8a4e4) + from mercurial.util import forcebytestr + from . import ( compat, exthelper, @@ -282,8 +288,8 @@ if r'_con' in vars(self): del self._con self._unsavedsubranges.clear() - repo.ui.log(b'evoext-cache', b'error while saving new data: %s' % exc) - repo.ui.debug(b'evoext-cache: error while saving new data: %s' % exc) + repo.ui.log(b'evoext-cache', b'error while saving new data: %s' % forcebytestr(exc)) + repo.ui.debug(b'evoext-cache: error while saving new data: %s' % forcebytestr(exc)) def _trysave(self, repo): repo = repo.unfiltered() diff -r 591a0afd2ef3 -r 7bcda49915e8 hgext3rd/evolve/stablesort.py --- a/hgext3rd/evolve/stablesort.py Wed Mar 04 15:09:22 2020 +0100 +++ b/hgext3rd/evolve/stablesort.py Wed Mar 04 15:17:29 2020 +0100 @@ -259,6 +259,12 @@ scmutil, ) +try: + from mercurial.utils.stringutil import forcebytestr +except ImportError: + # hg <= 4.5 (f99d64e8a4e4) + from mercurial.util import forcebytestr + from mercurial.i18n import _ from . import ( @@ -932,8 +938,8 @@ cachefile.close() self._ondiskkey = self._cachekey except (IOError, OSError) as exc: - repo.ui.log(b'stablesortcache', b'could not write update %s\n' % exc) - repo.ui.debug(b'stablesortcache: could not write update %s\n' % exc) + repo.ui.log(b'stablesortcache', b'could not write update %s\n' % forcebytestr(exc)) + repo.ui.debug(b'stablesortcache: could not write update %s\n' % forcebytestr(exc)) @eh.reposetup def setupcache(ui, repo): diff -r 591a0afd2ef3 -r 7bcda49915e8 hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Wed Mar 04 15:09:22 2020 +0100 +++ b/hgext3rd/topic/__init__.py Wed Mar 04 15:17:29 2020 +0100 @@ -579,7 +579,7 @@ msg = _(b"active topic '%s' grew its first changeset\n%s") ui.status(msg % (ct, hint)) else: - msg = _(b"active topic '%s' grew its %s first changesets\n%s") + msg = _(b"active topic '%s' grew its %d first changesets\n%s") ui.status(msg % (ct, csetcount, hint)) tr.addpostclose(b'signalcurrenttopicempty', currenttopicempty)