From patchwork Thu Jun 10 23:22:26 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D10859: cmdutil: make checknotesize() work on str-keyed opts
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 49182
Message-Id: <differential-rev-PHID-DREV-ck7ra355d2igb2i4bl6n-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Thu, 10 Jun 2021 23:22:26 +0000

martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION 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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10859

AFFECTED FILES
  hgext/amend.py
  hgext/uncommit.py
  mercurial/cmdutil.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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
 
diff --git a/hgext/uncommit.py b/hgext/uncommit.py
--- a/hgext/uncommit.py
+++ b/hgext/uncommit.py
@@ -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():
diff --git a/hgext/amend.py b/hgext/amend.py
--- a/hgext/amend.py
+++ b/hgext/amend.py
@@ -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'):