mercurial-scm/evolve: hgext3rd/topic/topicmap.py annotate

annotate hgext3rd/topic/topicmap.py @ 6788:0674b56d3526 stable

topic: drop oldbranchmap context manager, _topiccache is now a mixin I think this hack was needed back then in d49f75eab6a3 because _topiccache was a subclass of branchmap.branchcache directly, but now it's a mixin. In any case, I didn't see any failures in the tests, so it should be fine.

author	Anton Shestakov <av6@dwimlabs.net>
date	Mon, 18 Mar 2024 14:01:40 -0300
parents	3635782b0290
children	cd8e1a697124

rev	line source
1968 08cbfeb15a1a compat: mercurial dropped alias for hashlib.sha1 timeless@gmail.com parents: 1953 diff changeset	1 import hashlib
1949 79c08d17a3d7 topicmap: move the 'usetopicmap' context manager into the topicmap module Pierre-Yves David <pierre-yves.david@fb.com> parents: 1937 diff changeset	2
3397 f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	3 from mercurial.i18n import _
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	4 from mercurial.node import nullid
1937 60b7de2b3dd1 topicmap: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1928 diff changeset	5 from mercurial import (
60b7de2b3dd1 topicmap: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1928 diff changeset	6 branchmap,
1950 99c1a26abf3f topicmap: move 'cgapply' wrapping into the topicmap module Pierre-Yves David <pierre-yves.david@fb.com> parents: 1949 diff changeset	7 changegroup,
99c1a26abf3f topicmap: move 'cgapply' wrapping into the topicmap module Pierre-Yves David <pierre-yves.david@fb.com> parents: 1949 diff changeset	8 extensions,
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	9 repoview,
4450 9b0cde5efbc9 topicmap: add compatibility for branchcache that now uses self._entries Anton Shestakov <av6@dwimlabs.net> parents: 4187 diff changeset	10 util,
1937 60b7de2b3dd1 topicmap: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1928 diff changeset	11 )
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	12
4536 9837e8d378de topic: only wrap gettopicrepo for repo with topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4464 diff changeset	13 from . import (
9837e8d378de topic: only wrap gettopicrepo for repo with topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4464 diff changeset	14 common,
4929 bb2b4f6c99dc compat: compatibility for cl.nodemap.get vs cl.index.get_rev Anton Shestakov <av6@dwimlabs.net> parents: 4814 diff changeset	15 compat,
6376 5c8196a550b6 topic: make hg stack work for branches with double slashes in them Anton Shestakov <av6@dwimlabs.net> parents: 6369 diff changeset	16 discovery,
4536 9837e8d378de topic: only wrap gettopicrepo for repo with topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4464 diff changeset	17 )
9837e8d378de topic: only wrap gettopicrepo for repo with topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4464 diff changeset	18
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	19 basefilter = set([b'base', b'immutable'])
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	20 def topicfilter(name):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	21 """return a "topic" version of a filter level"""
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	22 if name in basefilter:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	23 return name
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	24 elif name is None:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	25 return None
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	26 elif name.endswith(b'-topic'):
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	27 return name
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	28 else:
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	29 return name + b'-topic'
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	30
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	31 def istopicfilter(filtername):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	32 if filtername is None:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	33 return False
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	34 return filtername.endswith(b'-topic')
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	35
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	36 def gettopicrepo(repo):
4536 9837e8d378de topic: only wrap gettopicrepo for repo with topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4464 diff changeset	37 if not common.hastopicext(repo):
9837e8d378de topic: only wrap gettopicrepo for repo with topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4464 diff changeset	38 return repo
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	39 filtername = topicfilter(repo.filtername)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	40 if filtername == repo.filtername:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	41 return repo
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	42 return repo.filtered(filtername)
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	43
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	44 def _setuptopicfilter(ui):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	45 """extend the filter related mapping with topic related one"""
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	46 funcmap = repoview.filtertable
6387 a87abe69a2f8 topic: branchmap already imports subsettable from repoviewutil Anton Shestakov <av6@dwimlabs.net> parents: 6363 diff changeset	47 # hg <= 4.9 (caebe5e7f4bd)
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	48 partialmap = branchmap.subsettable
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	49
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	50 # filter level not affected by topic that we should not override
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	51
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	52 for plainname in list(funcmap):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	53 newfilter = topicfilter(plainname)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	54 if newfilter == plainname:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	55 continue
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	56
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	57 def revsfunc(repo, name=plainname):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	58 return repoview.filterrevs(repo, name)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	59
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	60 base = topicfilter(partialmap[plainname])
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	61
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	62 if newfilter not in funcmap:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	63 funcmap[newfilter] = revsfunc
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	64 partialmap[newfilter] = base
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	65 funcmap[b'unfiltered-topic'] = lambda repo: frozenset()
48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	66 partialmap[b'unfiltered-topic'] = b'visible-topic'
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	67
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	68 def _phaseshash(repo, maxrev):
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	69 """uniq ID for a phase matching a set of rev"""
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	70 cl = repo.changelog
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	71 fr = cl.filteredrevs
6704 3635782b0290 topic: compatibility for phase roots being revnums Anton Shestakov <av6@dwimlabs.net> parents: 6547 diff changeset	72 nppr = compat.nonpublicphaseroots(repo)
3635782b0290 topic: compatibility for phase roots being revnums Anton Shestakov <av6@dwimlabs.net> parents: 6547 diff changeset	73 # starting with hg 6.7rc0 phase roots are already revs instead of nodes
3635782b0290 topic: compatibility for phase roots being revnums Anton Shestakov <av6@dwimlabs.net> parents: 6547 diff changeset	74 # hg <= 6.6 (68289ed170c7)
3635782b0290 topic: compatibility for phase roots being revnums Anton Shestakov <av6@dwimlabs.net> parents: 6547 diff changeset	75 if not util.safehasattr(repo._phasecache, '_phaseroots'):
3635782b0290 topic: compatibility for phase roots being revnums Anton Shestakov <av6@dwimlabs.net> parents: 6547 diff changeset	76 getrev = compat.getgetrev(cl)
3635782b0290 topic: compatibility for phase roots being revnums Anton Shestakov <av6@dwimlabs.net> parents: 6547 diff changeset	77 nppr = set(getrev(n) for n in nppr)
3635782b0290 topic: compatibility for phase roots being revnums Anton Shestakov <av6@dwimlabs.net> parents: 6547 diff changeset	78 revs = sorted(set(r for r in nppr if r not in fr and r < maxrev))
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	79 key = nullid
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	80 if revs:
1968 08cbfeb15a1a compat: mercurial dropped alias for hashlib.sha1 timeless@gmail.com parents: 1953 diff changeset	81 s = hashlib.sha1()
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	82 for rev in revs:
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	83 s.update(b'%d;' % rev)
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	84 key = s.digest()
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	85 return key
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	86
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	87 def modsetup(ui):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	88 """call at uisetup time to install various wrappings"""
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	89 _setuptopicfilter(ui)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	90 _wrapbmcache(ui)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	91 extensions.wrapfunction(changegroup.cg1unpacker, 'apply', cgapply)
5665 dd9dba7c1d00 compat: make topics compatible across change to cmdutil.commitstatus() Martin von Zweigbergk <martinvonz@google.com> parents: 5426 diff changeset	92 compat.overridecommitstatus(commitstatus)
1949 79c08d17a3d7 topicmap: move the 'usetopicmap' context manager into the topicmap module Pierre-Yves David <pierre-yves.david@fb.com> parents: 1937 diff changeset	93
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	94 def cgapply(orig, self, repo, args, *kwargs):
1950 99c1a26abf3f topicmap: move 'cgapply' wrapping into the topicmap module Pierre-Yves David <pierre-yves.david@fb.com> parents: 1949 diff changeset	95 """make sure a topicmap is used when applying a changegroup"""
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	96 other = repo.filtered(topicfilter(repo.filtername))
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	97 return orig(self, other, args, *kwargs)
1950 99c1a26abf3f topicmap: move 'cgapply' wrapping into the topicmap module Pierre-Yves David <pierre-yves.david@fb.com> parents: 1949 diff changeset	98
6547 d13cfd9eb6c0 topic: compatibility for commitstatus(..., *opts) Anton Shestakov <av6@dwimlabs.net>* parents: 6388 diff changeset	99 def commitstatus(orig, repo, node, branch, bheads=None, tip=None, **opts):
1953 bdc5bb223b50 commit: wrap "commitstatus" to take topic into account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	100 # wrap commit status use the topic branch heads
bdc5bb223b50 commit: wrap "commitstatus" to take topic into account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	101 ctx = repo[node]
6376 5c8196a550b6 topic: make hg stack work for branches with double slashes in them Anton Shestakov <av6@dwimlabs.net> parents: 6369 diff changeset	102 ctxbranch = common.formatfqbn(branch=ctx.branch())
5c8196a550b6 topic: make hg stack work for branches with double slashes in them Anton Shestakov <av6@dwimlabs.net> parents: 6369 diff changeset	103 if ctx.topic() and ctxbranch == branch:
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	104 bheads = repo.branchheads(b"%s:%s" % (branch, ctx.topic()))
3397 f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	105
6376 5c8196a550b6 topic: make hg stack work for branches with double slashes in them Anton Shestakov <av6@dwimlabs.net> parents: 6369 diff changeset	106 with discovery.override_context_branch(repo) as repo:
6547 d13cfd9eb6c0 topic: compatibility for commitstatus(..., *opts) Anton Shestakov <av6@dwimlabs.net>* parents: 6388 diff changeset	107 ret = orig(repo, node, branch, bheads=bheads, tip=tip, **opts)
3397 f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	108
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	109 # logic copy-pasted from cmdutil.commitstatus()
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	110 if ctx.topic():
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	111 return ret
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	112 parents = ctx.parents()
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	113
6547 d13cfd9eb6c0 topic: compatibility for commitstatus(..., *opts) Anton Shestakov <av6@dwimlabs.net>* parents: 6388 diff changeset	114 if (not opts.get('amend') and bheads and node not in bheads and not any(
6376 5c8196a550b6 topic: make hg stack work for branches with double slashes in them Anton Shestakov <av6@dwimlabs.net> parents: 6369 diff changeset	115 p.node() in bheads and common.formatfqbn(branch=p.branch()) == branch
5c8196a550b6 topic: make hg stack work for branches with double slashes in them Anton Shestakov <av6@dwimlabs.net> parents: 6369 diff changeset	116 for p in parents
6363 f168c0fdbde9 topic: copy parent branch check in commitstatus() from core Anton Shestakov <av6@dwimlabs.net> parents: 5847 diff changeset	117 )):
4814 48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	118 repo.ui.status(_(b"(consider using topic for lightweight branches."
48b30ff742cb python3: use format-source to run byteify-strings in .py files Rapha?l Gom?s <rgomes@octobus.net> parents: 4803 diff changeset	119 b" See 'hg help topic')\n"))
3397 f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	120
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch Pulkit Goyal <7895pulkit@gmail.com> parents: 2655 diff changeset	121 return ret
1953 bdc5bb223b50 commit: wrap "commitstatus" to take topic into account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	122
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	123 def _wrapbmcache(ui):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	124 class topiccache(_topiccache, branchmap.branchcache):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	125 pass
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	126 branchmap.branchcache = topiccache
4459 d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	127
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	128 try:
5193 a4d081923c81 compat: update hg-X.Y compat comments and test them Anton Shestakov <av6@dwimlabs.net> parents: 4929 diff changeset	129 # Mercurial 5.0
4459 d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	130 class remotetopiccache(_topiccache, branchmap.remotebranchcache):
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	131 pass
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	132 branchmap.remotebranchcache = remotetopiccache
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	133
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	134 def _wrapupdatebmcachemethod(orig, self, repo):
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	135 # pass in the bound method as the original
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	136 return _wrapupdatebmcache(orig.__get__(self), repo)
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	137 extensions.wrapfunction(branchmap.BranchMapCache, 'updatecache', _wrapupdatebmcachemethod)
d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	138 except AttributeError:
5193 a4d081923c81 compat: update hg-X.Y compat comments and test them Anton Shestakov <av6@dwimlabs.net> parents: 4929 diff changeset	139 # hg <= 4.9 (3461814417f3)
4459 d46360b8c0dc topic: make topics compatible with branchmap refactor Martijn Pieters <mj@octobus.net> parents: 4450 diff changeset	140 extensions.wrapfunction(branchmap, 'updatecache', _wrapupdatebmcache)
6385 0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	141 # branchcache in hg <= 4.9 doesn't have load method, instead there's a
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	142 # module-level function to read on-disk cache and return a branchcache
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	143 extensions.wrapfunction(branchmap, 'read', _wrapbmread)
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	144
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	145 def _wrapupdatebmcache(orig, repo):
2655 417490bdf28a topic: avoid crash when topic is loaded but not enabled for a repository Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2653 diff changeset	146 previous = getattr(repo, '_autobranchmaptopic', False)
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	147 try:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	148 repo._autobranchmaptopic = False
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	149 return orig(repo)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	150 finally:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	151 repo._autobranchmaptopic = previous
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	152
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	153 class _topiccache(object): # combine me with branchmap.branchcache
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	154
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	155 def __init__(self, args, *kwargs):
6788 0674b56d3526 topic: drop oldbranchmap context manager, _topiccache is now a mixin Anton Shestakov <av6@dwimlabs.net> parents: 6704 diff changeset	156 super(_topiccache, self).__init__(args, *kwargs)
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	157 self.phaseshash = None
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	158
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	159 def copy(self):
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	160 """return an deep copy of the branchcache object"""
6788 0674b56d3526 topic: drop oldbranchmap context manager, _topiccache is now a mixin Anton Shestakov <av6@dwimlabs.net> parents: 6704 diff changeset	161 assert isinstance(self, (branchmap.branchcache, branchmap.remotebranchcache)) # help pytype
6333 f4ffe1e67a9b topic: move compatibility for branchcache._entries to topic/compat.py Anton Shestakov <av6@dwimlabs.net> parents: 6271 diff changeset	162 entries = compat.bcentries(self)
f4ffe1e67a9b topic: move compatibility for branchcache._entries to topic/compat.py Anton Shestakov <av6@dwimlabs.net> parents: 6271 diff changeset	163 args = (entries, self.tipnode, self.tiprev, self.filteredhash,
5847 ad7c9c0b7a63 topic: compatibility for branchcache having a repo argument in 5.8 Anton Shestakov <av6@dwimlabs.net> parents: 5665 diff changeset	164 self._closednodes)
ad7c9c0b7a63 topic: compatibility for branchcache having a repo argument in 5.8 Anton Shestakov <av6@dwimlabs.net> parents: 5665 diff changeset	165 if util.safehasattr(self, '_repo'):
ad7c9c0b7a63 topic: compatibility for branchcache having a repo argument in 5.8 Anton Shestakov <av6@dwimlabs.net> parents: 5665 diff changeset	166 # hg <= 5.7 (6266d19556ad)
ad7c9c0b7a63 topic: compatibility for branchcache having a repo argument in 5.8 Anton Shestakov <av6@dwimlabs.net> parents: 5665 diff changeset	167 args = (self._repo,) + args
ad7c9c0b7a63 topic: compatibility for branchcache having a repo argument in 5.8 Anton Shestakov <av6@dwimlabs.net> parents: 5665 diff changeset	168 new = self.__class__(*args)
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	169 new.phaseshash = self.phaseshash
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	170 return new
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	171
6336 453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	172 def load(self, repo, lineiter):
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	173 """call branchmap.load(), and then transform branch names to be in the
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	174 new "//" format
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	175 """
6788 0674b56d3526 topic: drop oldbranchmap context manager, _topiccache is now a mixin Anton Shestakov <av6@dwimlabs.net> parents: 6704 diff changeset	176 assert isinstance(self, branchmap.branchcache) # help pytype
6336 453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	177 super(_topiccache, self).load(repo, lineiter)
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	178 entries = compat.bcentries(self)
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	179
6336 453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	180 for branch in tuple(entries):
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	181 formatted = common.formatfqbn(branch=branch)
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	182 if branch != formatted:
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	183 entries[formatted] = entries.pop(branch)
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	184
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	185 def validfor(self, repo):
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	186 """Is the cache content valid regarding a repo
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	187
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	188 - False when cached tipnode is unknown or if we detect a strip.
e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	189 - True when cache is up to date or a subset of current repo."""
6788 0674b56d3526 topic: drop oldbranchmap context manager, _topiccache is now a mixin Anton Shestakov <av6@dwimlabs.net> parents: 6704 diff changeset	190 assert isinstance(self, (branchmap.branchcache, branchmap.remotebranchcache)) # help pytype
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	191 valid = super(_topiccache, self).validfor(repo)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	192 if not valid:
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	193 return False
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	194 elif not istopicfilter(repo.filtername) or self.phaseshash is None:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	195 # phasehash at None means this is a branchmap
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	196 # come from non topic thing
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	197 return True
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	198 else:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	199 try:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	200 valid = self.phaseshash == _phaseshash(repo, self.tiprev)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	201 return valid
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	202 except IndexError:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	203 return False
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	204
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	205 def write(self, repo):
6336 453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	206 """write cache to disk if it's not topic-only, but first transform
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	207 cache keys from branches in "//" format into bare branch names
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	208 """
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	209 # we expect mutable set to be small enough to be that computing it all
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	210 # the time will be fast enough
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	211 if not istopicfilter(repo.filtername):
6336 453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	212 cache = self.copy()
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	213 entries = compat.bcentries(cache)
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	214
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	215 for formatted in tuple(entries):
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	216 branch, tns, topic = common.parsefqbn(formatted)
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	217 if branch != formatted:
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	218 entries[branch] = entries.pop(formatted)
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	219
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	220 super(_topiccache, cache).write(repo)
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	221
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	222 def update(self, repo, revgen):
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	223 """Given a branchhead cache, self, that may have extra nodes or be
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	224 missing heads, and a generator of nodes that are strictly a superset of
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	225 heads missing, this function updates self to be correct.
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	226 """
6788 0674b56d3526 topic: drop oldbranchmap context manager, _topiccache is now a mixin Anton Shestakov <av6@dwimlabs.net> parents: 6704 diff changeset	227 assert isinstance(self, (branchmap.branchcache, branchmap.remotebranchcache)) # help pytype
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	228 if not istopicfilter(repo.filtername):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	229 return super(_topiccache, self).update(repo, revgen)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2004 diff changeset	230
6336 453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	231 # See topic.discovery._headssummary(), where repo.unfiltered gets
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	232 # overridden to return .filtered('unfiltered-topic'). revbranchcache
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	233 # only can be created for unfiltered repo (filtername is None), so we
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	234 # do that here, and this revbranchcache will be cached inside repo.
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	235 # When we get rid of *-topic filters, then this workaround can be
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	236 # removed too.
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	237 repo.unfiltered().revbranchcache()
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	238
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	239 super(_topiccache, self).update(repo, revgen)
453861da6922 topic: use fully qualified branch name during exchange Anton Shestakov <av6@dwimlabs.net> parents: 6333 diff changeset	240 self.phaseshash = _phaseshash(repo, self.tiprev)
6385 0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	241
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	242 def _wrapbmread(orig, repo):
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	243 """call branchmap.read(), and then transform branch names to be in the
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	244 new "//" format
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	245 """
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	246 partial = orig(repo)
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	247 if partial is None:
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	248 # because of IOError or OSError
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	249 return partial
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	250
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	251 entries = compat.bcentries(partial)
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	252
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	253 for branch in tuple(entries):
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	254 formatted = common.formatfqbn(branch=branch)
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	255 if branch != formatted:
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	256 entries[formatted] = entries.pop(branch)
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	257
0bc90758f613 topic: wrap branchmap.read() as well (compatibility for hg <= 4.9) Anton Shestakov <av6@dwimlabs.net> parents: 6376 diff changeset	258 return partial

Mercurial > public > mercurial-scm > evolve

annotate hgext3rd/topic/topicmap.py @ 6788:0674b56d3526 stable