mercurial: comparison mercurial/commands.py

equal deleted inserted replaced

-:346af7687c6f
+:89a2afe31e82
 + walkopts,
 _(b'[OPTION]... DEST'),
 helpcategory=command.CATEGORY_IMPORT_EXPORT,
 )
 def archive(ui, repo, dest, **opts):
-'''create an unversioned archive of a repository revision
+"""create an unversioned archive of a repository revision
 By default, the revision used is the parent of the working
 directory; use -r/--rev to specify a different revision.
 The archive type is automatically detected based on file
 prepended. Use -p/--prefix to specify a format string for the
 prefix. The default is the basename of the archive, with suffixes
 removed.
 Returns 0 on success.
-'''
+"""
 opts = pycompat.byteskwargs(opts)
 rev = opts.get(b'rev')
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
 + commitopts2,
 _(b'[OPTION]... [-r] REV'),
 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
 )
 def backout(ui, repo, node=None, rev=None, **opts):
-'''reverse effect of earlier changeset
+"""reverse effect of earlier changeset
 Prepare a new changeset with the effect of REV undone in the
 current working directory. If no conflicts were encountered,
 it will be committed immediately.
 See :hg:`help revert` for a way to restore files to the state
 of another revision.
 Returns 0 on success, 1 if nothing to backout or there are unresolved
 files.
-'''
+"""
 with repo.wlock(), repo.lock():
 return _dobackout(ui, repo, node, rev, **opts)
 def _dobackout(ui, repo, node=None, rev=None, **opts):
 + formatteropts,
 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
 )
 def bookmark(ui, repo, *names, **opts):
-'''create a new bookmark or list existing bookmarks
+"""create a new bookmark or list existing bookmarks
 Bookmarks are labels on changesets to help track lines of development.
 Bookmarks are unversioned and can be moved, renamed and deleted.
 Deleting or moving a bookmark has no effect on the associated changesets.
 hg book -f @
 - print only the active bookmark name::
 hg book -ql .
-'''
+"""
 opts = pycompat.byteskwargs(opts)
 force = opts.get(b'force')
 rev = opts.get(b'rev')
 inactive = opts.get(b'inactive')  # meaning add/rename to inactive bookmark
 )
 @command(
 b'forget',
-[(b'i', b'interactive', None, _(b'use interactive mode')),]
+[
+(b'i', b'interactive', None, _(b'use interactive mode')),
+]
 + walkopts
 + dryrunopts,
 _(b'[OPTION]... FILE...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
 helpbasic=True,
 + dryrunopts,
 _(b'[OPTION]... [-r REV]... REV...'),
 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
 )
 def graft(ui, repo, *revs, **opts):
-'''copy changes from other branches onto the current branch
+"""copy changes from other branches onto the current branch
 This command uses Mercurial's merge logic to copy individual
 changes from other branches without merging branches in the
 history graph. This is sometimes known as 'backporting' or
 'cherry-picking'. By default, graft will copy user, date, and
 hg graft -r featureX --base "ancestor('featureX', 'default')"
 See :hg:`help revisions` for more about specifying revisions.
 Returns 0 on successful completion, 1 if there are unresolved files.
-'''
+"""
 with repo.wlock():
 return _dograft(ui, repo, *revs, **opts)
 def _dograft(ui, repo, *revs, **opts):
 b'f',
 b'force',
 None,
 _(b'run even when remote repository is unrelated'),
 ),
-(b'', b'confirm', None, _(b'confirm pull before applying changes'),),
+(
+b'',
+b'confirm',
+None,
+_(b'confirm pull before applying changes'),
+),
 (
 b'r',
 b'rev',
 [],
 _(b'a remote changeset intended to be added'),
 opts = pycompat.byteskwargs(opts)
 if opts.get(b'all_bookmarks'):
 cmdutil.check_incompatible_arguments(
-opts, b'all_bookmarks', [b'bookmark', b'rev'],
+opts,
+b'all_bookmarks',
+[b'bookmark', b'rev'],
 )
 opts[b'bookmark'] = list(repo._bookmarks)
 if opts.get(b'bookmark'):
 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
 return result
 @command(
 b'recover',
-[(b'', b'verify', False, b"run `hg verify` after successful recover"),],
+[
+(b'', b'verify', False, b"run `hg verify` after successful recover"),
+],
 helpcategory=command.CATEGORY_MAINTENANCE,
 )
 def recover(ui, repo, **opts):
 """roll back an interrupted transaction
 + cmdutil.walkopts,
 _(b'hg shelve [OPTION]... [FILE]...'),
 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
 )
 def shelve(ui, repo, *pats, **opts):
-'''save and set aside changes from the working directory
+"""save and set aside changes from the working directory
 Shelving takes files that "hg status" reports as not clean, saves
 the modifications to a bundle (a shelved change), and reverts the
 files so that their state in the working directory becomes clean.
 option. For each shelved change, this will print its name, age,
 and description; use ``--patch`` or ``--stat`` for more details.
 To delete specific shelved changes, use ``--delete``. To delete
 all shelved changes, use ``--cleanup``.
-'''
+"""
 opts = pycompat.byteskwargs(opts)
 allowables = [
 (b'addremove', {b'create'}),  # 'create' is pseudo action
 (b'unknown', {b'create'}),
 (b'cleanup', {b'cleanup'}),
 fn.end()
 fm.end()
 def loadcmdtable(ui, name, cmdtable):
-"""Load command functions from specified cmdtable
+"""Load command functions from specified cmdtable"""
-"""
 overrides = [cmd for cmd in cmdtable if cmd in table]
 if overrides:
 ui.warn(
 _(b"extension '%s' overrides commands: %s\n")
 % (name, b" ".join(overrides))

changeset 45942	89a2afe31e82
parent 45921	777e8d88f703
child 45978	c3d0b3c29ec4