Mercurial > public > mercurial-scm > evolve
diff hgext3rd/topic/__init__.py @ 6537:80d5d4e587f7
topic: experimental config option and topic namespace checking in precheck()
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 22 Jun 2023 21:51:37 -0300 |
parents | d324fa553620 |
children | 45689da4ed41 |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Mon Jul 17 16:20:16 2023 -0300 +++ b/hgext3rd/topic/__init__.py Thu Jun 22 21:51:37 2023 -0300 @@ -186,6 +186,7 @@ phases, pycompat, registrar, + rewriteutil, scmutil, smartset, templatefilters, @@ -273,6 +274,11 @@ configitem(b'devel', b'tns-report-transactions', default=lambda: [], ) +# used for allowing users to rewrite history only in their "own" topic +# namespaces +configitem(b'experimental', b'tns-allow-rewrite', + default=configitems.dynamicdefault, +) configitem(b'experimental', b'topic-mode.server', default=configitems.dynamicdefault, ) @@ -568,6 +574,15 @@ extensions.wrapfunction(histedit.histeditaction, 'applychange', applychangewrap) + # Wrapping precheck() both in core and in evolve to make sure all rewrite + # operations that could use precheck() are covered + extensions.wrapfunction(rewriteutil, 'precheck', wrapprecheck) + try: + evolve = extensions.find(b'evolve') + extensions.wrapfunction(evolve.rewriteutil, 'precheck', wrapprecheck) + except (KeyError, AttributeError): + pass + server.setupserver(ui) def reposetup(ui, repo): @@ -1704,6 +1719,26 @@ if topic: _changecurrenttopic(repo, topic) +def wrapprecheck(orig, repo, revs, action=b'rewrite', check_divergence=True): + # hg <= 6.1 (d4752aeb20f1) + args = pycompat.getargspec(orig).args + if r'check_divergence' in args: + orig(repo, revs, action, check_divergence=check_divergence) + else: + orig(repo, revs, action) + + # TODO: at some point in future the default will change from '*' to the + # default topic namespace for the current user + allow = set(repo.ui.configlist(b'experimental', b'tns-allow-rewrite', [b'*'])) + if b'*' not in allow: + namespaces = set(repo[rev].topic_namespace() for rev in revs) + disallowed = namespaces - allow + if disallowed: + msg = _(b"refusing to %s changesets with these topic namespaces: %s") + msg %= (action, b' '.join(disallowed)) + hint = _(b"modify experimental.tns-allow-rewrite to allow rewriting changesets from these topic namespaces") + raise compat.InputError(msg, hint=hint) + def _changecurrenttns(repo, tns): if tns != b'none': with repo.wlock():