This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10859

cmdutil: make checknotesize() work on str-keyed opts
ClosedPublic

Authored by martinvonz on Jun 10 2021, 7:21 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG54849b65dc5f: cmdutil: make checknotesize() work on str-keyed opts
Summary

Since this patch changes the behavior of the function, I consider it a
bonus if the signature also changes so that extensions can detect
which version they're dealing with (for the record, I don't have any
such extensions). Therefore, I also dropped an unused ui argument
and renamed the function to use snake_case.

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/amend.py (3 lines)
Mhgext/uncommit.py (3 lines)
Mmercurial/cmdutil.py (4 lines)

Diff 28632

hgext/amend.py

""" """
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
commands, commands,
pycompat,
registrar, registrar,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = b'ships-with-hg-core' testedwith = b'ships-with-hg-core'
def amend(ui, repo, *pats, **opts): def amend(ui, repo, *pats, **opts):
"""amend the working copy parent with all or specified outstanding changes """amend the working copy parent with all or specified outstanding changes
Similar to :hg:`commit --amend`, but reuse the commit message without Similar to :hg:`commit --amend`, but reuse the commit message without
invoking editor, unless ``--edit`` was set. invoking editor, unless ``--edit`` was set.
See :hg:`help commit` for more details. See :hg:`help commit` for more details.
""" """
cmdutil.checknotesize(ui, pycompat.byteskwargs(opts)) cmdutil.check_note_size(opts)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
if not opts.get('logfile'): if not opts.get('logfile'):
opts['message'] = opts.get('message') or repo[b'.'].description() opts['message'] = opts.get('message') or repo[b'.'].description()
opts['amend'] = True opts['amend'] = True
return commands._docommit(ui, repo, *pats, **opts) return commands._docommit(ui, repo, *pats, **opts)

hgext/uncommit.py

This command undoes the effect of a local commit, returning the affected This command undoes the effect of a local commit, returning the affected
files to their uncommitted state. This means that files modified or files to their uncommitted state. This means that files modified or
deleted in the changeset will be left unchanged, and so will remain deleted in the changeset will be left unchanged, and so will remain
modified in the working directory. modified in the working directory.
If no files are specified, the commit will be pruned, unless --keep is If no files are specified, the commit will be pruned, unless --keep is
given. given.
""" """
cmdutil.check_note_size(opts)
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
cmdutil.checknotesize(ui, opts)
cmdutil.resolvecommitoptions(ui, opts) cmdutil.resolvecommitoptions(ui, opts)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
st = repo.status() st = repo.status()
m, a, r, d = st.modified, st.added, st.removed, st.deleted m, a, r, d = st.modified, st.added, st.removed, st.deleted
isdirtypath = any(set(m + a + r + d) & set(pats)) isdirtypath = any(set(m + a + r + d) & set(pats))
allowdirtywcopy = opts[ allowdirtywcopy = opts[

mercurial/cmdutil.py

datemaydiffer = True datemaydiffer = True
if opts.get(b'currentuser'): if opts.get(b'currentuser'):
opts[b'user'] = ui.username() opts[b'user'] = ui.username()
return datemaydiffer return datemaydiffer
def checknotesize(ui, opts): def check_note_size(opts):
"""make sure note is of valid format""" """make sure note is of valid format"""
note = opts.get(b'note') note = opts.get('note')
if not note: if not note:
return return
if len(note) > 255: if len(note) > 255:
raise error.InputError(_(b"cannot store a note of more than 255 bytes")) raise error.InputError(_(b"cannot store a note of more than 255 bytes"))
if b'\n' in note: if b'\n' in note:
raise error.InputError(_(b"note cannot contain a newline")) raise error.InputError(_(b"note cannot contain a newline"))