This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6854

amend: prevent '\n' in the note string
ClosedPublic

Authored by mharbison72 on Sep 15 2019, 12:57 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7e9997041781: amend: prevent '\n' in the note string
Summary

This comes from the evolve function. I'm not sure why this check was missing in
core, since it was present when the length check was added to evolve.

I didn't flag this as BC because 530b7361e3a9 mentioned this argument wasn't
added to the release notes due to no display capability, and that hasn't changed
AFAIK.

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 (5 lines)
Mmercurial/cmdutil.py (12 lines)

Diff 16556

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,
error,
pycompat, 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.
"""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.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if len(opts['note']) > 255: cmdutil.checknotesize(ui, opts)
raise error.Abort(_("cannot store a note of more than 255 bytes"))
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['.'].description() opts['message'] = opts.get('message') or repo['.'].description()
opts['amend'] = True opts['amend'] = True
return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts)) return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts))

mercurial/cmdutil.py

opts[b'date'] = b'%d %d' % dateutil.makedate() opts[b'date'] = b'%d %d' % dateutil.makedate()
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):
""" make sure note is of valid format """
note = opts.get('note')
if not note:
return
if len(note) > 255:
raise error.Abort(_(b"cannot store a note of more than 255 bytes"))
if b'\n' in note:
raise error.Abort(_(b"note cannot contain a newline"))
def ishunk(x): def ishunk(x):
hunkclasses = (crecordmod.uihunk, patch.recordhunk) hunkclasses = (crecordmod.uihunk, patch.recordhunk)
return isinstance(x, hunkclasses) return isinstance(x, hunkclasses)
def newandmodified(chunks, originalchunks): def newandmodified(chunks, originalchunks):
newlyaddedandmodifiedfiles = set() newlyaddedandmodifiedfiles = set()
alsorestore = set() alsorestore = set()
for chunk in chunks: for chunk in chunks: