# HG changeset patch # User Anton Shestakov # Date 1702743818 10800 # Node ID e0596b012b69effb6e39a3236fef2cfb239f59c3 # Parent c92d2c61dec8c58d0e7fe599fbfacefdb9c3968b# Parent 5199463aef07cfac7d081ef9f1f1587b5f1c8907 branching: merge with stable diff -r 5199463aef07 -r e0596b012b69 .gitlab-ci.yml --- a/.gitlab-ci.yml Tue Oct 24 16:31:34 2023 -0300 +++ b/.gitlab-ci.yml Sat Dec 16 13:23:38 2023 -0300 @@ -58,7 +58,7 @@ allow_failure: true doc: - image: registry.heptapod.net/mercurial/ci-images/py3-evolve-doc + image: registry.heptapod.net/mercurial/ci-images/py3-evolve-doc:v2.0 script: - make doc variables: diff -r 5199463aef07 -r e0596b012b69 debian/control --- a/debian/control Tue Oct 24 16:31:34 2023 -0300 +++ b/debian/control Sat Dec 16 13:23:38 2023 -0300 @@ -7,7 +7,7 @@ Pierre-Yves David , Standards-Version: 4.3.0 Build-Depends: - mercurial (>= 4.9), + mercurial (>= 5.6), python3, debhelper (>= 10), dh-python, @@ -26,7 +26,7 @@ ${python3:Depends}, ${misc:Depends}, ${sphinxdoc:Depends}, - mercurial (>= 4.9), + mercurial (>= 5.6), Built-Using: ${sphinxdoc:Built-Using} Description: evolve extension for Mercurial This package provides the experimental "evolve" extension for the Mercurial diff -r 5199463aef07 -r e0596b012b69 docs/conf.py --- a/docs/conf.py Tue Oct 24 16:31:34 2023 -0300 +++ b/docs/conf.py Sat Dec 16 13:23:38 2023 -0300 @@ -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, diff -r 5199463aef07 -r e0596b012b69 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Tue Oct 24 16:31:34 2023 -0300 +++ b/hgext3rd/evolve/__init__.py Sat Dec 16 13:23:38 2023 -0300 @@ -30,7 +30,7 @@ backported to older version of Mercurial by this extension. Some older experimental protocols are also supported for a longer time in the extension to help people transitioning. (The extension is currently compatible down to -Mercurial version 4.9). +Mercurial version 5.6). New Config:: diff -r 5199463aef07 -r e0596b012b69 hgext3rd/evolve/metadata.py --- a/hgext3rd/evolve/metadata.py Tue Oct 24 16:31:34 2023 -0300 +++ b/hgext3rd/evolve/metadata.py Sat Dec 16 13:23:38 2023 -0300 @@ -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.1.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' -minimumhgversion = b'4.9' +__version__ = b'11.2.0.dev0' +testedwith = b'5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5' +minimumhgversion = b'5.6' buglink = b'https://bz.mercurial-scm.org/' diff -r 5199463aef07 -r e0596b012b69 hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Tue Oct 24 16:31:34 2023 -0300 +++ b/hgext3rd/topic/__init__.py Sat Dec 16 13:23:38 2023 -0300 @@ -236,10 +236,10 @@ b'log.topic': b'green_background', } -__version__ = b'1.1.1.dev0' +__version__ = b'1.2.0.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' -minimumhgversion = b'4.9' +testedwith = b'5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5' +minimumhgversion = b'5.6' buglink = b'https://bz.mercurial-scm.org/' configtable = {} @@ -748,7 +748,11 @@ def branchheads(self, branch=None, start=None, closed=False): if branch is None: - branch = self[None].branch() + # using dirstate.branch() instead of self[None].branch() + # because we wrap context.branch method to return branch + # already in FQBN format, and we can't give it to formatfqbn() + # again directly + branch = self.dirstate.branch() branch = common.formatfqbn(branch, self.currenttns, self.currenttopic) return super(topicrepo, self).branchheads(branch=branch, start=start, diff -r 5199463aef07 -r e0596b012b69 hgext3rd/topic/discovery.py --- a/hgext3rd/topic/discovery.py Tue Oct 24 16:31:34 2023 -0300 +++ b/hgext3rd/topic/discovery.py Sat Dec 16 13:23:38 2023 -0300 @@ -325,11 +325,9 @@ caps.append(b'topics-namespaces') return caps -# **kwargs is for accommodating an optional changelog argument -# hg <= 4.8 (5e5c8f2a1eb5) -def wrapbranchinfo(orig, self, rev, **kwargs): +def wrapbranchinfo(orig, self, rev): # NOTE: orig can be either branchinfo() or _branchinfo()! - b, close = orig(self, rev, **kwargs) + b, close = orig(self, rev) if common.hastopicext(self._repo): if self._repo.ui.configbool(b'_internal', b'tns-disable-fqbn'): # the config option prevents this function from doing anything, @@ -344,16 +342,14 @@ b = ctx.fqbn() return b, close -# **kwargs is for accommodating an optional changelog argument -# hg <= 4.8 (5e5c8f2a1eb5) -def wrapslowbranchinfo(orig, self, rev, **kwargs): +def wrapslowbranchinfo(orig, self, rev): if self.branchinfo == self._branchinfo: # _branchinfo() gets called directly and needs to do the conversion - return wrapbranchinfo(orig, self, rev, **kwargs) + return wrapbranchinfo(orig, self, rev) else: # _branchinfo() gets called through branchinfo(), the latter will need # to do the conversion - return orig(self, rev, **kwargs) + return orig(self, rev) def wrapaddpartrevbranchcache(orig, repo, bundler, outgoing): """making sure we send rev-branch-cache that only has bare branches""" diff -r 5199463aef07 -r e0596b012b69 hgext3rd/topic/server.py --- a/hgext3rd/topic/server.py Tue Oct 24 16:31:34 2023 -0300 +++ b/hgext3rd/topic/server.py Sat Dec 16 13:23:38 2023 -0300 @@ -5,7 +5,6 @@ from mercurial.i18n import _ from mercurial import ( - branchmap, error, extensions, localrepo, @@ -16,6 +15,8 @@ wireprotov1server, ) +from mercurial.utils import repoviewutil + from . import ( common, compat, @@ -169,6 +170,5 @@ if FILTERNAME not in repoview.filtertable: repoview.filtertable[FILTERNAME] = computeunservedtopic - # hg <= 4.9 (caebe5e7f4bd) - branchmap.subsettable[FILTERNAME] = b'immutable' - branchmap.subsettable[b'served'] = FILTERNAME + repoviewutil.subsettable[FILTERNAME] = b'immutable' + repoviewutil.subsettable[b'served'] = FILTERNAME diff -r 5199463aef07 -r e0596b012b69 tests/test-evolve-public-content-divergent-discard.t --- a/tests/test-evolve-public-content-divergent-discard.t Tue Oct 24 16:31:34 2023 -0300 +++ b/tests/test-evolve-public-content-divergent-discard.t Sat Dec 16 13:23:38 2023 -0300 @@ -681,12 +681,12 @@ marked working directory as topic: topic-2 (make other divergent a closed branch head) - $ hg ci --amend -m "closing branch double//slash" --close-branch + $ hg ci --amend -m "closing default branch" --close-branch active topic 'topic-2' grew its first changeset (see 'hg help topics' for more information) $ hg glog - @ 6:fe5d55b4e488 closing branch double//slash + @ 6:638eff2d31b7 closing default branch | draft content-divergent | | o 5:bde8ac1c636a added d @@ -706,11 +706,11 @@ $ hg evolve --content-divergent merge:[5] added d - with: [6] closing branch double//slash + with: [6] closing default branch base: [3] added d 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - other divergent changeset fe5d55b4e488 is a closed branch head and differs from local bde8ac1c636a by "branch, description" only, discarding fe5d55b4e488 - content divergence resolution between bde8ac1c636a (public) and fe5d55b4e488 has same content as bde8ac1c636a, discarding fe5d55b4e488 + other divergent changeset 638eff2d31b7 is a closed branch head and differs from local bde8ac1c636a by "branch, description" only, discarding 638eff2d31b7 + content divergence resolution between bde8ac1c636a (public) and 638eff2d31b7 has same content as bde8ac1c636a, discarding 638eff2d31b7 active topic 'topic-2' is now empty working directory is now at bde8ac1c636a