This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6841

uncommit: drop the hyphen from --current-user and --current-date
ClosedPublic

Authored by mharbison72 on Sep 10 2019, 11:24 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa50661567f83: uncommit: drop the hyphen from --current-user and --current-date
Summary

I didn't pay enough attention to these long forms- graft, amend and MQ already
use the old style naming. It's probably more important to be consistent than
modern. The hypenated style came from evolve.

Yuya mentioned this naming discrepancy in 4145fd3569c3, but it didn't attract
any discussion[1]. There's also a bit of inconsistency in that the default
parameter for currentdate is False for graft, and None for the rest.

[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-January/126767.html

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
Mmercurial/cmdutil.py (8 lines)
Mtests/test-uncommit.t (4 lines)

Diff 16511

mercurial/cmdutil.py

commitopts2 = [ commitopts2 = [
('d', 'date', '', ('d', 'date', '',
_('record the specified date as commit date'), _('DATE')), _('record the specified date as commit date'), _('DATE')),
('u', 'user', '', ('u', 'user', '',
_('record the specified user as committer'), _('USER')), _('record the specified user as committer'), _('USER')),
] ]
commitopts3 = [ commitopts3 = [
(b'D', b'current-date', None, (b'D', b'currentdate', None,
_(b'record the current date as commit date')), _(b'record the current date as commit date')),
(b'U', b'current-user', None, (b'U', b'currentuser', None,
_(b'record the current user as committer')), _(b'record the current user as committer')),
] ]
formatteropts = [ formatteropts = [
('T', 'template', '', ('T', 'template', '',
_('display with template'), _('TEMPLATE')), _('display with template'), _('TEMPLATE')),
] ]
# special string such that everything below this line will be ingored in the # special string such that everything below this line will be ingored in the
# editor text # editor text
_linebelow = "^HG: ------------------------ >8 ------------------------$" _linebelow = "^HG: ------------------------ >8 ------------------------$"
def resolvecommitoptions(ui, opts): def resolvecommitoptions(ui, opts):
"""modify commit options dict to handle related options """modify commit options dict to handle related options
""" """
# N.B. this is extremely similar to setupheaderopts() in mq.py # N.B. this is extremely similar to setupheaderopts() in mq.py
if not opts.get(b'date') and opts.get(b'current_date'): if not opts.get(b'date') and opts.get(b'currentdate'):
opts[b'date'] = b'%d %d' % dateutil.makedate() opts[b'date'] = b'%d %d' % dateutil.makedate()
if not opts.get(b'user') and opts.get(b'current_user'): if not opts.get(b'user') and opts.get(b'currentuser'):
opts[b'user'] = ui.username() opts[b'user'] = ui.username()
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()

tests/test-uncommit.t

--keep allow an empty commit after uncommiting --keep allow an empty commit after uncommiting
--allow-dirty-working-copy allow uncommit with outstanding changes --allow-dirty-working-copy allow uncommit with outstanding changes
-I --include PATTERN [+] include names matching the given patterns -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns
-m --message TEXT use text as commit message -m --message TEXT use text as commit message
-l --logfile FILE read commit message from file -l --logfile FILE read commit message from file
-d --date DATE record the specified date as commit date -d --date DATE record the specified date as commit date
-u --user USER record the specified user as committer -u --user USER record the specified user as committer
-D --current-date record the current date as commit date -D --currentdate record the current date as commit date
-U --current-user record the current user as committer -U --currentuser record the current user as committer
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)
Uncommit with no commits should fail Uncommit with no commits should fail
$ hg uncommit $ hg uncommit
abort: cannot uncommit null changeset abort: cannot uncommit null changeset
(no changeset checked out) (no changeset checked out)