This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6828

uncommit: add options to update to the current user or current date
ClosedPublic

Authored by mharbison72 on Sep 7 2019, 11:31 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG66048f6b5d0d: uncommit: add options to update to the current user or current date
Summary

These are also from the evolve extension's version of uncommit.

I tried adding validation that both forms of user or date can't be specified at
the same time, but that fails because these show up in opts with a None value
whether or not the option was given on the command line. Presumably that means
the conditional in resolvecommitoptions could be simplified. But this is how
both evolve and MQ handle it.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Sep 7 2019, 11:31 PM
pulkit accepted this revision.Sep 9 2019, 11:23 AM
pulkit added a subscriber: pulkit.

I guess --interactive is the only flag left which is extra in evolve version, right?

This revision is now accepted and ready to land.Sep 9 2019, 11:23 AM
mharbison72 added a comment.Sep 9 2019, 12:49 PM
In D6828#100139, @pulkit wrote:

I guess --interactive is the only flag left which is extra in evolve version, right?

No:

-a --all                 uncommit all changes when no arguments given
-i --interactive         interactive mode to uncommit (EXPERIMENTAL)
-r --rev REV             revert commit content to REV instead
   --revert              discard working directory changes after uncommit
-n --note TEXT           store a note on uncommit

I'd like to port --interactive and lean towards --all too for consistency with revert and resolve, though I can see how it might be used as an alternative to rollback in its current form. I didn't take the time to understand what --rev is doing.

pulkit added a comment.Sep 9 2019, 1:05 PM
In D6828#100190, @mharbison72 wrote:
In D6828#100139, @pulkit wrote:

I guess --interactive is the only flag left which is extra in evolve version, right?

No:

-a --all                 uncommit all changes when no arguments given
-i --interactive         interactive mode to uncommit (EXPERIMENTAL)
-r --rev REV             revert commit content to REV instead
   --revert              discard working directory changes after uncommit
-n --note TEXT           store a note on uncommit

I'd like to port --interactive.

That will be great. https://phab.mercurial-scm.org/D6005 should help :)

mharbison72 added a comment.Sep 9 2019, 2:31 PM
In D6828#100192, @pulkit wrote:
In D6828#100190, @mharbison72 wrote:

I'd like to port --interactive.

That will be great. https://phab.mercurial-scm.org/D6005 should help :)

I haven’t looked at it at all, and just assumed the evolve code could be dropped into place. Any idea why that patch got so complicated?

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (5 lines)
Mmercurial/cmdutil.py (16 lines)
Mmercurial/commands.py (1 line)
Mtests/test-uncommit.t (2 lines)

Diff 16449

hgext/uncommit.py

date=date, date=date,
extra=ctx.extra()) extra=ctx.extra())
return repo.commitctx(new) return repo.commitctx(new)
@command('uncommit', @command('uncommit',
[('', 'keep', None, _('allow an empty commit after uncommiting')), [('', 'keep', None, _('allow an empty commit after uncommiting')),
('', 'allow-dirty-working-copy', False, ('', 'allow-dirty-working-copy', False,
_('allow uncommit with outstanding changes')) _('allow uncommit with outstanding changes'))
] + commands.walkopts + commands.commitopts + commands.commitopts2, ] + commands.walkopts + commands.commitopts + commands.commitopts2
+ commands.commitopts3,
_('[OPTION]... [FILE]...'), _('[OPTION]... [FILE]...'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
def uncommit(ui, repo, *pats, **opts): def uncommit(ui, repo, *pats, **opts):
"""uncommit part or all of a local changeset """uncommit part or all of a local changeset
This command undoes the effect of a local commit, returning the affected This command undoes the effect of a local commit, returning the affected
files to their uncommitted state. This means that files modified or files to their uncommitted state. This means that files modified or
deleted in the changeset will be left unchanged, and so will remain deleted in the changeset will be left unchanged, and so will remain
modified in the working directory. modified in the working directory.
If no files are specified, the commit will be pruned, unless --keep is If no files are specified, the commit will be pruned, unless --keep is
given. given.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
cmdutil.resolvecommitoptions(ui, opts)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
m, a, r, d = repo.status()[:4] m, a, r, d = repo.status()[:4]
isdirtypath = any(set(m + a + r + d) & set(pats)) isdirtypath = any(set(m + a + r + d) & set(pats))
allowdirtywcopy = (opts['allow_dirty_working_copy'] or allowdirtywcopy = (opts['allow_dirty_working_copy'] or
repo.ui.configbool('experimental', 'uncommitondirtywdir')) repo.ui.configbool('experimental', 'uncommitondirtywdir'))
if not allowdirtywcopy and (not pats or isdirtypath): if not allowdirtywcopy and (not pats or isdirtypath):
cmdutil.bailifchanged(repo, hint=_('requires ' cmdutil.bailifchanged(repo, hint=_('requires '

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 = [
(b'D', b'current-date', None,
_(b'record the current date as commit date')),
(b'U', b'current-user', None,
_(b'record the current user as committer')),
]
formatteropts = [ formatteropts = [
('T', 'template', '', ('T', 'template', '',
_('display with template'), _('TEMPLATE')), _('display with template'), _('TEMPLATE')),
] ]
templateopts = [ templateopts = [
('', 'style', '', ('', 'style', '',
_('display using template map file (DEPRECATED)'), _('STYLE')), _('display using template map file (DEPRECATED)'), _('STYLE')),
('m', 'manifest', False, _('open manifest')), ('m', 'manifest', False, _('open manifest')),
('', 'dir', '', _('open directory manifest')), ('', 'dir', '', _('open directory manifest')),
] ]
# 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):
"""modify commit options dict to handle related options
"""
# N.B. this is extremely similar to setupheaderopts() in mq.py
if not opts.get(b'date') and opts.get(b'current_date'):
opts[b'date'] = b'%d %d' % dateutil.makedate()
if not opts.get(b'user') and opts.get(b'current_user'):
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()
alsorestore = set() alsorestore = set()
for chunk in chunks: for chunk in chunks:

mercurial/commands.py

_("when to paginate (boolean, always, auto, or never)"), _('TYPE')), _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
] ]
dryrunopts = cmdutil.dryrunopts dryrunopts = cmdutil.dryrunopts
remoteopts = cmdutil.remoteopts remoteopts = cmdutil.remoteopts
walkopts = cmdutil.walkopts walkopts = cmdutil.walkopts
commitopts = cmdutil.commitopts commitopts = cmdutil.commitopts
commitopts2 = cmdutil.commitopts2 commitopts2 = cmdutil.commitopts2
commitopts3 = cmdutil.commitopts3
formatteropts = cmdutil.formatteropts formatteropts = cmdutil.formatteropts
templateopts = cmdutil.templateopts templateopts = cmdutil.templateopts
logopts = cmdutil.logopts logopts = cmdutil.logopts
diffopts = cmdutil.diffopts diffopts = cmdutil.diffopts
diffwsopts = cmdutil.diffwsopts diffwsopts = cmdutil.diffwsopts
diffopts2 = cmdutil.diffopts2 diffopts2 = cmdutil.diffopts2
mergetoolopts = cmdutil.mergetoolopts mergetoolopts = cmdutil.mergetoolopts
similarityopts = cmdutil.similarityopts similarityopts = cmdutil.similarityopts

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
-U --current-user 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)