Mercurial > hg-stable
changeset 47434:54849b65dc5f
cmdutil: make checknotesize() work on str-keyed opts
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.
Differential Revision: https://phab.mercurial-scm.org/D10859
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 10 Jun 2021 14:25:16 -0700 |
| parents | 6ce89165eaa0 |
| children | 5c49e0aa7fad |
| files | hgext/amend.py hgext/uncommit.py mercurial/cmdutil.py |
| diffstat | 3 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/amend.py Thu Jun 10 10:53:43 2021 -0700 +++ b/hgext/amend.py Thu Jun 10 14:25:16 2021 -0700 @@ -16,7 +16,6 @@ from mercurial import ( cmdutil, commands, - pycompat, registrar, ) @@ -66,7 +65,7 @@ See :hg:`help commit` for more details. """ - cmdutil.checknotesize(ui, pycompat.byteskwargs(opts)) + cmdutil.check_note_size(opts) with repo.wlock(), repo.lock(): if not opts.get('logfile'):
--- a/hgext/uncommit.py Thu Jun 10 10:53:43 2021 -0700 +++ b/hgext/uncommit.py Thu Jun 10 14:25:16 2021 -0700 @@ -153,9 +153,8 @@ If no files are specified, the commit will be pruned, unless --keep is given. """ + cmdutil.check_note_size(opts) opts = pycompat.byteskwargs(opts) - - cmdutil.checknotesize(ui, opts) cmdutil.resolvecommitoptions(ui, opts) with repo.wlock(), repo.lock():
--- a/mercurial/cmdutil.py Thu Jun 10 10:53:43 2021 -0700 +++ b/mercurial/cmdutil.py Thu Jun 10 14:25:16 2021 -0700 @@ -328,10 +328,10 @@ return datemaydiffer -def checknotesize(ui, opts): +def check_note_size(opts): """make sure note is of valid format""" - note = opts.get(b'note') + note = opts.get('note') if not note: return