This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1468

commands: add value for cmdtype argument for read only commands
ClosedPublic

Authored by pulkit on Nov 20 2017, 6:09 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG4b288d118d8b: commands: add value for cmdtype argument for read only commands
Summary

In the previous release we added an argument cmdtype to registrar.command()
which is a enum and tells whether the command is read only, recoverable write or
unrecoverable write command. This patch add the value of cmdtype argument for
commands which are read only.

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.Nov 20 2017, 6:09 PM
durin42 accepted this revision.Nov 20 2017, 6:25 PM
This revision is now accepted and ready to land.Nov 20 2017, 6:25 PM
Closed by commit rHG4b288d118d8b: commands: add value for cmdtype argument for read only commands (authored by pulkit). · Explain WhyNov 20 2017, 6:36 PM
This revision was automatically updated to reflect the committed changes.
dlax added a subscriber: dlax.Nov 21 2017, 3:07 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (39 lines)

Diff 3686

mercurial/commands.py

) )
release = lockmod.release release = lockmod.release
table = {} table = {}
table.update(debugcommandsmod.command._table) table.update(debugcommandsmod.command._table)
command = registrar.command(table) command = registrar.command(table)
readonly = registrar.command.readonly
# common command options # common command options
globalopts = [ globalopts = [
('R', 'repository', '', ('R', 'repository', '',
_('repository root directory or name of overlay bundle file'), _('repository root directory or name of overlay bundle file'),
_('REPO')), _('REPO')),
('', 'cwd', '', ('', 'cwd', '',
ui.status(_('(branches are permanent and global, ' ui.status(_('(branches are permanent and global, '
'did you want a bookmark?)\n')) 'did you want a bookmark?)\n'))
@command('branches', @command('branches',
[('a', 'active', False, [('a', 'active', False,
_('show only branches that have unmerged heads (DEPRECATED)')), _('show only branches that have unmerged heads (DEPRECATED)')),
('c', 'closed', False, _('show normal and closed branches')), ('c', 'closed', False, _('show normal and closed branches')),
] + formatteropts, ] + formatteropts,
_('[-c]')) _('[-c]'), cmdtype=readonly)
def branches(ui, repo, active=False, closed=False, **opts): def branches(ui, repo, active=False, closed=False, **opts):
"""list repository named branches """list repository named branches
List the repository's named branches, indicating which ones are List the repository's named branches, indicating which ones are
inactive. If -c/--closed is specified, also list branches which have inactive. If -c/--closed is specified, also list branches which have
been marked closed (see :hg:`commit --close-branch`). been marked closed (see :hg:`commit --close-branch`).
Use the command :hg:`update` to switch to an existing branch. Use the command :hg:`update` to switch to an existing branch.
@command('cat', @command('cat',
[('o', 'output', '', [('o', 'output', '',
_('print output to file with formatted name'), _('FORMAT')), _('print output to file with formatted name'), _('FORMAT')),
('r', 'rev', '', _('print the given revision'), _('REV')), ('r', 'rev', '', _('print the given revision'), _('REV')),
('', 'decode', None, _('apply any matching decode filter')), ('', 'decode', None, _('apply any matching decode filter')),
] + walkopts + formatteropts, ] + walkopts + formatteropts,
_('[OPTION]... FILE...'), _('[OPTION]... FILE...'),
inferrepo=True) inferrepo=True, cmdtype=readonly)
def cat(ui, repo, file1, *pats, **opts): def cat(ui, repo, file1, *pats, **opts):
"""output the current or given revision of files """output the current or given revision of files
Print the specified files as they were at the given revision. If Print the specified files as they were at the given revision. If
no revision is given, the parent of the working directory is used. no revision is given, the parent of the working directory is used.
Output may be to a file, in which case the name of the file is Output may be to a file, in which case the name of the file is
given using a format string. The formatting rules as follows: given using a format string. The formatting rules as follows:
cmdutil.commitstatus(repo, node, branch, bheads, opts) cmdutil.commitstatus(repo, node, branch, bheads, opts)
@command('config|showconfig|debugconfig', @command('config|showconfig|debugconfig',
[('u', 'untrusted', None, _('show untrusted configuration options')), [('u', 'untrusted', None, _('show untrusted configuration options')),
('e', 'edit', None, _('edit user config')), ('e', 'edit', None, _('edit user config')),
('l', 'local', None, _('edit repository config')), ('l', 'local', None, _('edit repository config')),
('g', 'global', None, _('edit global config'))] + formatteropts, ('g', 'global', None, _('edit global config'))] + formatteropts,
_('[-u] [NAME]...'), _('[-u] [NAME]...'),
optionalrepo=True) optionalrepo=True, cmdtype=readonly)
def config(ui, repo, *values, **opts): def config(ui, repo, *values, **opts):
"""show combined config settings from all hgrc files """show combined config settings from all hgrc files
With no arguments, print names and values of all config items. With no arguments, print names and values of all config items.
With one argument of the form section.name, print just the value With one argument of the form section.name, print just the value
of that config item. of that config item.
cmdlist = [' '.join(c[0]) for c in cmdlist.values()] cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
ui.write("%s\n" % "\n".join(sorted(cmdlist))) ui.write("%s\n" % "\n".join(sorted(cmdlist)))
@command('^diff', @command('^diff',
[('r', 'rev', [], _('revision'), _('REV')), [('r', 'rev', [], _('revision'), _('REV')),
('c', 'change', '', _('change made by revision'), _('REV')) ('c', 'change', '', _('change made by revision'), _('REV'))
] + diffopts + diffopts2 + walkopts + subrepoopts, ] + diffopts + diffopts2 + walkopts + subrepoopts,
_('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
inferrepo=True) inferrepo=True, cmdtype=readonly)
def diff(ui, repo, *pats, **opts): def diff(ui, repo, *pats, **opts):
"""diff repository (or selected files) """diff repository (or selected files)
Show differences between revisions for the specified files. Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format. Differences between files are shown using the unified diff format.
.. note:: .. note::
root=opts.get('root')) root=opts.get('root'))
@command('^export', @command('^export',
[('o', 'output', '', [('o', 'output', '',
_('print output to file with formatted name'), _('FORMAT')), _('print output to file with formatted name'), _('FORMAT')),
('', 'switch-parent', None, _('diff against the second parent')), ('', 'switch-parent', None, _('diff against the second parent')),
('r', 'rev', [], _('revisions to export'), _('REV')), ('r', 'rev', [], _('revisions to export'), _('REV')),
] + diffopts, ] + diffopts,
_('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly)
def export(ui, repo, *changesets, **opts): def export(ui, repo, *changesets, **opts):
"""dump the header and diffs for one or more changesets """dump the header and diffs for one or more changesets
Print the changeset header and diffs for one or more revisions. Print the changeset header and diffs for one or more revisions.
If no revision is given, the parent of the working directory is used. If no revision is given, the parent of the working directory is used.
The information shown in the changeset header is: author, date, The information shown in the changeset header is: author, date,
branch name (if non-default), changeset hash, parent(s) and commit branch name (if non-default), changeset hash, parent(s) and commit
cmdutil.export(repo, revs, fntemplate=opts.get('output'), cmdutil.export(repo, revs, fntemplate=opts.get('output'),
switch_parent=opts.get('switch_parent'), switch_parent=opts.get('switch_parent'),
opts=patch.diffallopts(ui, opts)) opts=patch.diffallopts(ui, opts))
@command('files', @command('files',
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
('0', 'print0', None, _('end filenames with NUL, for use with xargs')), ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
] + walkopts + formatteropts + subrepoopts, ] + walkopts + formatteropts + subrepoopts,
_('[OPTION]... [FILE]...')) _('[OPTION]... [FILE]...'), cmdtype=readonly)
def files(ui, repo, *pats, **opts): def files(ui, repo, *pats, **opts):
"""list tracked files """list tracked files
Print files under Mercurial control in the working directory or Print files under Mercurial control in the working directory or
specified revision for given files (excluding removed files). specified revision for given files (excluding removed files).
Files can be specified as filenames or filesets. Files can be specified as filenames or filesets.
If no files are given to match, this command prints the names If no files are given to match, this command prints the names
_('print only filenames and revisions that match')), _('print only filenames and revisions that match')),
('n', 'line-number', None, _('print matching line numbers')), ('n', 'line-number', None, _('print matching line numbers')),
('r', 'rev', [], ('r', 'rev', [],
_('only search files changed within revision range'), _('REV')), _('only search files changed within revision range'), _('REV')),
('u', 'user', None, _('list the author (long with -v)')), ('u', 'user', None, _('list the author (long with -v)')),
('d', 'date', None, _('list the date (short with -q)')), ('d', 'date', None, _('list the date (short with -q)')),
] + formatteropts + walkopts, ] + formatteropts + walkopts,
_('[OPTION]... PATTERN [FILE]...'), _('[OPTION]... PATTERN [FILE]...'),
inferrepo=True) inferrepo=True, cmdtype=readonly)
def grep(ui, repo, pattern, *pats, **opts): def grep(ui, repo, pattern, *pats, **opts):
"""search revision history for a pattern in specified files """search revision history for a pattern in specified files
Search revision history for a regular expression in the specified Search revision history for a regular expression in the specified
files or the entire project. files or the entire project.
By default, grep prints the most recent revision number for each By default, grep prints the most recent revision number for each
file in which it finds a match. To get it to print every revision file in which it finds a match. To get it to print every revision
@command('heads', @command('heads',
[('r', 'rev', '', [('r', 'rev', '',
_('show only heads which are descendants of STARTREV'), _('STARTREV')), _('show only heads which are descendants of STARTREV'), _('STARTREV')),
('t', 'topo', False, _('show topological heads only')), ('t', 'topo', False, _('show topological heads only')),
('a', 'active', False, _('show active branchheads only (DEPRECATED)')), ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
('c', 'closed', False, _('show normal and closed branch heads')), ('c', 'closed', False, _('show normal and closed branch heads')),
] + templateopts, ] + templateopts,
_('[-ct] [-r STARTREV] [REV]...')) _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly)
def heads(ui, repo, *branchrevs, **opts): def heads(ui, repo, *branchrevs, **opts):
"""show branch heads """show branch heads
With no arguments, show all open branch heads in the repository. With no arguments, show all open branch heads in the repository.
Branch heads are changesets that have no descendants on the Branch heads are changesets that have no descendants on the
same branch. They are where development generally takes place and same branch. They are where development generally takes place and
are the usual targets for update and merge operations. are the usual targets for update and merge operations.
@command('help', @command('help',
[('e', 'extension', None, _('show only help for extensions')), [('e', 'extension', None, _('show only help for extensions')),
('c', 'command', None, _('show only help for commands')), ('c', 'command', None, _('show only help for commands')),
('k', 'keyword', None, _('show topics matching keyword')), ('k', 'keyword', None, _('show topics matching keyword')),
('s', 'system', [], _('show help for specific platform(s)')), ('s', 'system', [], _('show help for specific platform(s)')),
], ],
_('[-ecks] [TOPIC]'), _('[-ecks] [TOPIC]'),
norepo=True) norepo=True, cmdtype=readonly)
def help_(ui, name=None, **opts): def help_(ui, name=None, **opts):
"""show help for a given topic or a help overview """show help for a given topic or a help overview
With no arguments, print a list of commands with short help messages. With no arguments, print a list of commands with short help messages.
Given a topic, extension, or command name, print help for that Given a topic, extension, or command name, print help for that
topic. topic.
_('identify the specified revision'), _('REV')), _('identify the specified revision'), _('REV')),
('n', 'num', None, _('show local revision number')), ('n', 'num', None, _('show local revision number')),
('i', 'id', None, _('show global revision id')), ('i', 'id', None, _('show global revision id')),
('b', 'branch', None, _('show branch')), ('b', 'branch', None, _('show branch')),
('t', 'tags', None, _('show tags')), ('t', 'tags', None, _('show tags')),
('B', 'bookmarks', None, _('show bookmarks')), ('B', 'bookmarks', None, _('show bookmarks')),
] + remoteopts + formatteropts, ] + remoteopts + formatteropts,
_('[-nibtB] [-r REV] [SOURCE]'), _('[-nibtB] [-r REV] [SOURCE]'),
optionalrepo=True) optionalrepo=True, cmdtype=readonly)
def identify(ui, repo, source=None, rev=None, def identify(ui, repo, source=None, rev=None,
num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
"""identify the working directory or specified revision """identify the working directory or specified revision
Print a summary identifying the repository state at REV using one or Print a summary identifying the repository state at REV using one or
two parent hash identifiers, followed by a "+" if the working two parent hash identifiers, followed by a "+" if the working
directory has uncommitted changes, the branch name (if not default), directory has uncommitted changes, the branch name (if not default),
a list of tags, and a list of bookmarks. a list of tags, and a list of bookmarks.
_('show only changesets within the given named branch (DEPRECATED)'), _('show only changesets within the given named branch (DEPRECATED)'),
_('BRANCH')), _('BRANCH')),
('b', 'branch', [], ('b', 'branch', [],
_('show changesets within the given named branch'), _('BRANCH')), _('show changesets within the given named branch'), _('BRANCH')),
('P', 'prune', [], ('P', 'prune', [],
_('do not display revision or any of its ancestors'), _('REV')), _('do not display revision or any of its ancestors'), _('REV')),
] + logopts + walkopts, ] + logopts + walkopts,
_('[OPTION]... [FILE]'), _('[OPTION]... [FILE]'),
inferrepo=True) inferrepo=True, cmdtype=readonly)
def log(ui, repo, *pats, **opts): def log(ui, repo, *pats, **opts):
"""show revision history of entire repository or files """show revision history of entire repository or files
Print the revision history of the specified files or the entire Print the revision history of the specified files or the entire
project. project.
If no revision range is specified, the default is ``tip:0`` unless If no revision range is specified, the default is ``tip:0`` unless
--follow is set, in which case the working directory parent is --follow is set, in which case the working directory parent is
count += 1 count += 1
displayer.close() displayer.close()
@command('manifest', @command('manifest',
[('r', 'rev', '', _('revision to display'), _('REV')), [('r', 'rev', '', _('revision to display'), _('REV')),
('', 'all', False, _("list files from all revisions"))] ('', 'all', False, _("list files from all revisions"))]
+ formatteropts, + formatteropts,
_('[-r REV]')) _('[-r REV]'), cmdtype=readonly)
def manifest(ui, repo, node=None, rev=None, **opts): def manifest(ui, repo, node=None, rev=None, **opts):
"""output the current or given revision of the project manifest """output the current or given revision of the project manifest
Print a list of version controlled files for the given revision. Print a list of version controlled files for the given revision.
If no revision is given, the first parent of the working directory If no revision is given, the first parent of the working directory
is used, or the null revision if no revision is checked out. is used, or the null revision if no revision is checked out.
With -v, print file permissions, symlink and executable bits. With -v, print file permissions, symlink and executable bits.
p = [cp.node() for cp in ctx.parents()] p = [cp.node() for cp in ctx.parents()]
displayer = cmdutil.show_changeset(ui, repo, opts) displayer = cmdutil.show_changeset(ui, repo, opts)
for n in p: for n in p:
if n != nullid: if n != nullid:
displayer.show(repo[n]) displayer.show(repo[n])
displayer.close() displayer.close()
@command('paths', formatteropts, _('[NAME]'), optionalrepo=True) @command('paths', formatteropts, _('[NAME]'), optionalrepo=True,
cmdtype=readonly)
def paths(ui, repo, search=None, **opts): def paths(ui, repo, search=None, **opts):
"""show aliases for remote repositories """show aliases for remote repositories
Show definition of symbolic path name NAME. If no name is given, Show definition of symbolic path name NAME. If no name is given,
show definition of all available names. show definition of all available names.
Option -q/--quiet suppresses all output when searching for NAME Option -q/--quiet suppresses all output when searching for NAME
and shows only the path names when listing all definitions. and shows only the path names when listing all definitions.
Returns 0 on success, 1 if no rollback data is available. Returns 0 on success, 1 if no rollback data is available.
""" """
if not ui.configbool('ui', 'rollback'): if not ui.configbool('ui', 'rollback'):
raise error.Abort(_('rollback is disabled because it is unsafe'), raise error.Abort(_('rollback is disabled because it is unsafe'),
hint=('see `hg help -v rollback` for information')) hint=('see `hg help -v rollback` for information'))
return repo.rollback(dryrun=opts.get(r'dry_run'), return repo.rollback(dryrun=opts.get(r'dry_run'),
force=opts.get(r'force')) force=opts.get(r'force'))
@command('root', []) @command('root', [], cmdtype=readonly)
def root(ui, repo): def root(ui, repo):
"""print the root (top) of the current working directory """print the root (top) of the current working directory
Print the root directory of the current repository. Print the root directory of the current repository.
Returns 0 on success. Returns 0 on success.
""" """
ui.write(repo.root + "\n") ui.write(repo.root + "\n")
('n', 'no-status', None, _('hide status prefix')), ('n', 'no-status', None, _('hide status prefix')),
('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')),
('C', 'copies', None, _('show source of copied files')), ('C', 'copies', None, _('show source of copied files')),
('0', 'print0', None, _('end filenames with NUL, for use with xargs')), ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
('', 'rev', [], _('show difference from revision'), _('REV')), ('', 'rev', [], _('show difference from revision'), _('REV')),
('', 'change', '', _('list the changed files of a revision'), _('REV')), ('', 'change', '', _('list the changed files of a revision'), _('REV')),
] + walkopts + subrepoopts + formatteropts, ] + walkopts + subrepoopts + formatteropts,
_('[OPTION]... [FILE]...'), _('[OPTION]... [FILE]...'),
inferrepo=True) inferrepo=True, cmdtype=readonly)
def status(ui, repo, *pats, **opts): def status(ui, repo, *pats, **opts):
"""show changed files in the working directory """show changed files in the working directory
Show status of files in the repository. If names are given, only Show status of files in the repository. If names are given, only
files that match are shown. Files that are clean or ignored or files that match are shown. Files that are clean or ignored or
the source of a copy/move operation, are not listed unless the source of a copy/move operation, are not listed unless
-c/--clean, -i/--ignored, -C/--copies or -A/--all are given. -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
Unless options described with "show only ..." are given, the Unless options described with "show only ..." are given, the
label='status.copied') label='status.copied')
if ((ui.verbose or ui.configbool('commands', 'status.verbose')) if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
and not ui.plain()): and not ui.plain()):
cmdutil.morestatus(repo, fm) cmdutil.morestatus(repo, fm)
fm.end() fm.end()
@command('^summary|sum', @command('^summary|sum',
[('', 'remote', None, _('check for push and pull'))], '[--remote]') [('', 'remote', None, _('check for push and pull'))],
'[--remote]', cmdtype=readonly)
def summary(ui, repo, **opts): def summary(ui, repo, **opts):
"""summarize working directory state """summarize working directory state
This generates a brief summary of the working directory state, This generates a brief summary of the working directory state,
including parents, branch, commit status, phase and available updates. including parents, branch, commit status, phase and available updates.
With the --remote option, this will check the default paths for With the --remote option, this will check the default paths for
incoming and outgoing changes. This can be time-consuming. incoming and outgoing changes. This can be time-consuming.
scmutil.revsingle(repo, rev_).rev() == nullrev): scmutil.revsingle(repo, rev_).rev() == nullrev):
raise error.Abort(_("cannot tag null revision")) raise error.Abort(_("cannot tag null revision"))
tagsmod.tag(repo, names, r, message, opts.get('local'), tagsmod.tag(repo, names, r, message, opts.get('local'),
opts.get('user'), date, editor=editor) opts.get('user'), date, editor=editor)
finally: finally:
release(lock, wlock) release(lock, wlock)
@command('tags', formatteropts, '') @command('tags', formatteropts, '', cmdtype=readonly)
def tags(ui, repo, **opts): def tags(ui, repo, **opts):
"""list repository tags """list repository tags
This lists both regular and local tags. When the -v/--verbose This lists both regular and local tags. When the -v/--verbose
switch is used, a third column "local" is printed for local tags. switch is used, a third column "local" is printed for local tags.
When the -q/--quiet switch is used, only the tag name is printed. When the -q/--quiet switch is used, only the tag name is printed.
Returns 0 on success. Returns 0 on success.
Please see https://mercurial-scm.org/wiki/RepositoryCorruption Please see https://mercurial-scm.org/wiki/RepositoryCorruption
for more information about recovery from corruption of the for more information about recovery from corruption of the
repository. repository.
Returns 0 on success, 1 if errors are encountered. Returns 0 on success, 1 if errors are encountered.
""" """
return hg.verify(repo) return hg.verify(repo)
@command('version', [] + formatteropts, norepo=True) @command('version', [] + formatteropts, norepo=True, cmdtype=readonly)
def version_(ui, **opts): def version_(ui, **opts):
"""output version and copyright information""" """output version and copyright information"""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if ui.verbose: if ui.verbose:
ui.pager('version') ui.pager('version')
fm = ui.formatter("version", opts) fm = ui.formatter("version", opts)
fm.startitem() fm.startitem()
fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),