This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1179

amend: error out if the note is greater than 255bytes
ClosedPublic

Authored by pulkit on Oct 18 2017, 6:11 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG554885e10868: amend: error out if the note is greater than 255bytes
rHG9dc521c54f01: amend: error out if the note is greater than 255bytes
Summary

In obsmarker we can't store keys and values of more than 255 bytes in metadata.
If we try to do so, ProgrammingError is raised. The note flag to amend stores
the note in obsmetadata. If a user will try to store a larger note, he will
encounter ProgrammingError which is wrong. We must error out early.

Thanks to Yuya for warning about this.

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.

Event Timeline

pulkit created this revision.Oct 18 2017, 6:11 PM
durin42 accepted this revision.Oct 18 2017, 6:14 PM
This revision is now accepted and ready to land.Oct 18 2017, 6:14 PM
Closed by commit rHG9dc521c54f01: amend: error out if the note is greater than 255bytes (authored by pulkit). · Explain WhyOct 18 2017, 6:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/amend.py (3 lines)
Mtests/test-amend.t (3 lines)

Diff 3007

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,
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 = 'ships-with-hg-core' testedwith = '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.
""" """
if len(opts['note']) > 255:
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, **opts) return commands._docommit(ui, repo, *pats, **opts)

tests/test-amend.t

| x 1 112478962961 B | x 1 112478962961 B
|/ |/
o 0 426bada5c675 A o 0 426bada5c675 A
Checking the note stored in the obsmarker Checking the note stored in the obsmarker
$ echo foo > bar $ echo foo > bar
$ hg add bar $ hg add bar
$ hg amend --note 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
abort: cannot store a note of more than 255 bytes
[255]
$ hg amend --note "adding bar" $ hg amend --note "adding bar"
$ hg debugobsolete -r . $ hg debugobsolete -r .
112478962961147124edd43549aedd1a335e44bf be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} 112478962961147124edd43549aedd1a335e44bf be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 16084da537dd8f84cfdb3055c633772269d62e1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'note': 'adding bar', 'operation': 'amend', 'user': 'test'} be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 16084da537dd8f84cfdb3055c633772269d62e1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'note': 'adding bar', 'operation': 'amend', 'user': 'test'}
#endif #endif
Cannot amend public changeset Cannot amend public changeset