This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4404

commitextras: work nicely with other extensions
ClosedPublic

Authored by valentin.gatienbaron on Aug 27 2018, 4:28 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1cb7c9777852: commitextras: work nicely with other extensions
Summary

Before this change, it doesn't add these extra fields when loaded
alongside another extension that does a bunch of things, including
wrapping commit.

I did not investigate exactly why, but

  • the documentation of extensions.wrapfunction says to use subclassing

to play nicely with other extensions

  • using subclassing does make commitextras work when loaded alongside

my other extension

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/commitextras.py (19 lines)

Diff 10617

hgext/commitextras.py

import re import re
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
commands, commands,
error, error,
extensions, extensions,
registrar, registrar,
util,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
usedinternally = { usedinternally = {
'amend_source', 'amend_source',
def extsetup(ui): def extsetup(ui):
entry = extensions.wrapcommand(commands.table, 'commit', _commit) entry = extensions.wrapcommand(commands.table, 'commit', _commit)
options = entry[1] options = entry[1]
options.append(('', 'extra', [], options.append(('', 'extra', [],
_('set a changeset\'s extra values'), _("KEY=VALUE"))) _('set a changeset\'s extra values'), _("KEY=VALUE")))
def _commit(orig, ui, repo, *pats, **opts): def _commit(orig, ui, repo, *pats, **opts):
origcommit = repo.commit if util.safehasattr(repo, 'unfiltered'):
try: repo = repo.unfiltered()
def _wrappedcommit(*innerpats, **inneropts): class repoextra(repo.__class__):
def commit(self, *innerpats, **inneropts):
extras = opts.get(r'extra') extras = opts.get(r'extra')
if extras: if extras:
for raw in extras: for raw in extras:
if '=' not in raw: if '=' not in raw:
msg = _("unable to parse '%s', should follow " msg = _("unable to parse '%s', should follow "
"KEY=VALUE format") "KEY=VALUE format")
raise error.Abort(msg % raw) raise error.Abort(msg % raw)
k, v = raw.split('=', 1) k, v = raw.split('=', 1)
if not k: if not k:
msg = _("unable to parse '%s', keys can't be empty") msg = _("unable to parse '%s', keys can't be empty")
raise error.Abort(msg % raw) raise error.Abort(msg % raw)
if re.search('[^\w-]', k): if re.search('[^\w-]', k):
msg = _("keys can only contain ascii letters, digits," msg = _("keys can only contain ascii letters, digits,"
" '_' and '-'") " '_' and '-'")
raise error.Abort(msg) raise error.Abort(msg)
if k in usedinternally: if k in usedinternally:
msg = _("key '%s' is used internally, can't be set " msg = _("key '%s' is used internally, can't be set "
"manually") "manually")
raise error.Abort(msg % k) raise error.Abort(msg % k)
inneropts[r'extra'][k] = v inneropts[r'extra'][k] = v
return origcommit(*innerpats, **inneropts) return super(repoextra, self).commit(*innerpats, **inneropts)
repo.__class__ = repoextra
# This __dict__ logic is needed because the normal
# extension.wrapfunction doesn't seem to work.
repo.__dict__[r'commit'] = _wrappedcommit
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)
finally:
del repo.__dict__[r'commit']