mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:4fadea09feca
+:d90ffee93df6
 ? foo.c
 Returns 0 if all files are successfully added.
 """
+opts = pycompat.byteskwargs(opts)
 m = scmutil.match(repo[None], pats, opts)
 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
 return rejected and 1 or 0
 @command('addremove',
 foobar.c
 R foobar.c
 Returns 0 if all files are successfully added.
 """
+opts = pycompat.byteskwargs(opts)
 try:
 sim = float(opts.get('similarity') or 100)
 except ValueError:
 raise error.Abort(_('similarity must be a number'))
 if sim < 0 or sim > 100:
 anyway, although the results will probably be neither useful
 nor desirable.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 if not pats:
 raise error.Abort(_('at least one filename or pattern is required'))
 if opts.get('follow'):
 # --follow is deprecated and now just an alias for -f/--file
 removed.
 Returns 0 on success.
 '''
+opts = pycompat.byteskwargs(opts)
 ctx = scmutil.revsingle(repo, opts.get('rev'))
 if not ctx:
 raise error.Abort(_('no working directory: please specify a revision'))
 node = ctx.node()
 dest = cmdutil.makefilename(repo, dest, node)
 return _dobackout(ui, repo, node, rev, **opts)
 finally:
 release(lock, wlock)
 def _dobackout(ui, repo, node=None, rev=None, **opts):
+opts = pycompat.byteskwargs(opts)
 if opts.get('commit') and opts.get('no_commit'):
 raise error.Abort(_("cannot use --commit with --no-commit"))
 if opts.get('merge') and opts.get('no_commit'):
 raise error.Abort(_("cannot use --merge with --no-commit"))
 - move the '@' bookmark from another branch::
 hg book -f @
 '''
+opts = pycompat.byteskwargs(opts)
 force = opts.get('force')
 rev = opts.get('rev')
 delete = opts.get('delete')
 rename = opts.get('rename')
 inactive = opts.get('inactive')
 When all heads of a branch are closed, the branch will be
 considered closed.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 if label:
 label = label.strip()
 if not opts.get('clean') and not label:
 ui.write("%s\n" % repo.dirstate.branch())
 Use the command :hg:`update` to switch to an existing branch.
 Returns 0.
 """
+opts = pycompat.byteskwargs(opts)
 ui.pager('branches')
 fm = ui.formatter('branches', opts)
 hexfunc = fm.hexfunc
 allheads = set(repo.heads())
 Applying bundles preserves all changeset contents including
 permissions, copy/rename information, and revision history.
 Returns 0 on success, 1 if no changes found.
 """
+opts = pycompat.byteskwargs(opts)
 revs = None
 if 'rev' in opts:
 revstrings = opts['rev']
 revs = scmutil.revrange(repo, revstrings)
 if revstrings and not revs:
 See :hg:`help urls` for details on specifying URLs.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 if opts.get('noupdate') and opts.get('updaterev'):
 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
 r = hg.clone(ui, opts, source, dest,
 pull=opts.get('pull'),
 return _docommit(ui, repo, *pats, **opts)
 finally:
 release(lock, wlock)
 def _docommit(ui, repo, *pats, **opts):
-opts = pycompat.byteskwargs(opts)
+if opts.get(r'interactive'):
-if opts.get('interactive'):
+opts.pop(r'interactive')
-opts.pop('interactive')
 ret = cmdutil.dorecord(ui, repo, commit, None, False,
 cmdutil.recordfilter, *pats,
-**pycompat.strkwargs(opts))
+**opts)
 # ret can be 0 (no changes to record) or the value returned by
 # commit(), 1 if nothing changed or None on success.
 return 1 if ret == 0 else ret
+opts = pycompat.byteskwargs(opts)
 if opts.get('subrepos'):
 if opts.get('amend'):
 raise error.Abort(_('cannot amend with --subrepos'))
 # Let --subrepos on the command line override config setting.
 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
 Returns 0 on success, 1 if NAME does not exist.
 """
+opts = pycompat.byteskwargs(opts)
 if opts.get('edit') or opts.get('local') or opts.get('global'):
 if opts.get('local') and opts.get('global'):
 raise error.Abort(_("can't use --local and --global together"))
 if opts.get('local'):
 This command takes effect with the next commit. To undo a copy
 before that, see :hg:`revert`.
 Returns 0 on success, 1 if errors are encountered.
 """
+opts = pycompat.byteskwargs(opts)
 with repo.wlock(False):
 return cmdutil.copy(ui, repo, pats, opts)
 @command('^diff',
 [('r', 'rev', [], _('revision'), _('REV')),
 hg diff -r 9353^2:9353  # compare against the second parent
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 revs = opts.get('rev')
 change = opts.get('change')
 stat = opts.get('stat')
 reverse = opts.get('reverse')
 on specifying file patterns.
 Returns 0 if a match is found, 1 otherwise.
 """
-ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
+opts = pycompat.byteskwargs(opts)
+ctx = scmutil.revsingle(repo, opts.get('rev'), None)
 end = '\n'
 if opts.get('print0'):
 end = '\0'
 fmt = '%s' + end
 hg forget "set:hgignore()"
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 if not pats:
 raise error.Abort(_('no files specified'))
 m = scmutil.match(repo[None], pats, opts)
 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
 '''
 with repo.wlock():
 return _dograft(ui, repo, *revs, **opts)
 def _dograft(ui, repo, *revs, **opts):
+opts = pycompat.byteskwargs(opts)
 if revs and opts.get('rev'):
 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
 'revision ordering!\n'))
 revs = list(revs)
 the repository are searched, including those that don't exist in the
 current branch or have been deleted in a prior changeset.
 Returns 0 if a match is found, 1 otherwise.
 """
+opts = pycompat.byteskwargs(opts)
 reflags = re.M
 if opts.get('ignore_case'):
 reflags |= re.I
 try:
 regexp = util.re.compile(pattern, reflags)
 topological heads (changesets with no children) will be shown.
 Returns 0 if matching heads are found, 1 if not.
 """
+opts = pycompat.byteskwargs(opts)
 start = None
 if 'rev' in opts:
 start = scmutil.revsingle(repo, opts['rev'], None).node()
 if opts.get('topo'):
 including full hash identifiers.
 Returns 0 if successful.
 """
+opts = pycompat.byteskwargs(opts)
 if not repo and not source:
 raise error.Abort(_("there is no Mercurial repository here "
 "(.hg not found)"))
 if ui.debugflag:
 hg import --config ui.fuzz=7 fuzz.patch
 Returns 0 on success, 1 on partial success (see --partial).
 """
+opts = pycompat.byteskwargs(opts)
 if not patch1:
 raise error.Abort(_('need at least one patch to import'))
 patches = (patch1,) + patches
 It is possible to specify an ``ssh://`` URL as the destination.
 See :hg:`help urls` for more information.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 hg.peer(ui, opts, ui.expandpath(dest), create=True)
 @command('locate',
 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
 See :hg:`help files` for a more versatile command.
 Returns 0 if a match is found, 1 otherwise.
 """
+opts = pycompat.byteskwargs(opts)
 if opts.get('print0'):
 end = '\0'
 else:
 end = '\n'
 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
 If option --all is specified, the list of all files from all revisions
 is printed. This includes deleted and renamed files.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 fm = ui.formatter('manifest', opts)
 if opts.get('all'):
 if rev or node:
 raise error.Abort(_("can't specify a revision with --all"))
 all changes.
 Returns 0 on success, 1 if there are unresolved files.
 """
+opts = pycompat.byteskwargs(opts)
 if opts.get('rev') and node:
 raise error.Abort(_("please specify just one revision"))
 if not node:
 node = opts.get('rev')
 existing only in the remote repository are treated as
 ``deleted``, even if it is in fact added remotely.
 Returns 0 if there are outgoing changes, 1 otherwise.
 """
+opts = pycompat.byteskwargs(opts)
 if opts.get('graph'):
 cmdutil.checkunsupportedgraphflags([], opts)
 o, other = hg._outgoing(ui, repo, dest, opts)
 if not o:
 cmdutil.outgoinghooks(ui, repo, other, opts, o)
 See :hg:`summary` and :hg:`help revsets` for related information.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
 if file_:
 m = scmutil.match(ctx, (file_,), opts)
 if m.anypats() or len(m.files()) != 1:
 See :hg:`help urls` for more information.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 ui.pager('paths')
 if search:
 pathitems = [(name, path) for name, path in ui.paths.iteritems()
 if name == search]
 else:
 Returns 0 on success, 1 if some phases could not be changed.
 (For more information about the phases concept, see :hg:`help phases`.)
 """
+opts = pycompat.byteskwargs(opts)
 # search for a unique phase argument
 targetphase = None
 for idx, name in enumerate(phases.phasenames):
 if opts[name]:
 if targetphase is not None:
 bookmark's name.
 Returns 0 on success, 1 if an update had unresolved files.
 """
+opts = pycompat.byteskwargs(opts)
 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
 msg = _('update destination required by configuration')
 hint = _('use hg pull followed by hg update DEST')
 raise error.Abort(msg, hint=hint)
 URLs. If DESTINATION is omitted, a default path will be used.
 Returns 0 if push was successful, 1 if nothing to push.
 """
+opts = pycompat.byteskwargs(opts)
 if opts.get('bookmark'):
 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
 for b in opts['bookmark']:
 # translate -B options to -r so changesets get pushed
 b = repo._bookmarks.expandname(b)
 working directory, not even if ``--force`` is specified.
 Returns 0 on success, 1 if any warnings encountered.
 """
+opts = pycompat.byteskwargs(opts)
 after, force = opts.get('after'), opts.get('force')
 if not pats and not after:
 raise error.Abort(_('no files specified'))
 m = scmutil.match(repo[None], pats, opts)
 This command takes effect at the next commit. To undo a rename
 before that, see :hg:`revert`.
 Returns 0 on success, 1 if errors are encountered.
 """
+opts = pycompat.byteskwargs(opts)
 with repo.wlock(False):
 return cmdutil.copy(ui, repo, pats, opts, rename=True)
 @command('resolve',
 [('a', 'all', None, _('select all unresolved files')),
 commit after a conflicting merge.
 Returns 0 on success, 1 if any files fail a resolve attempt.
 """
+opts = pycompat.byteskwargs(opts)
 flaglist = 'all mark unmark list no_status'.split()
 all, mark, unmark, show, nostatus = \
 [opts.get(o) for o in flaglist]
 if (show and (mark or unmark)) or (mark and unmark):
 number it uses.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 if opts["stdio"] and opts["cmdserver"]:
 raise error.Abort(_("cannot use --stdio with --cmdserver"))
 if opts["stdio"]:
 if repo is None:
 incoming and outgoing changes. This can be time-consuming.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 ui.pager('summary')
 ctx = repo[None]
 parents = ctx.parents()
 pnode = parents[0].node()
 marks = []
 Since tag names have priority over branch names during revision
 lookup, using an existing branch name as a tag name is discouraged.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 wlock = lock = None
 try:
 wlock = repo.wlock()
 lock = repo.lock()
 rev_ = "."
 When the -q/--quiet switch is used, only the tag name is printed.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 ui.pager('tags')
 fm = ui.formatter('tags', opts)
 hexfunc = fm.hexfunc
 tagtype = ""
 This command is deprecated, please use :hg:`heads` instead.
 Returns 0 on success.
 """
+opts = pycompat.byteskwargs(opts)
 displayer = cmdutil.show_changeset(ui, repo, opts)
 displayer.show(repo['tip'])
 displayer.close()
 @command('unbundle',
 return hg.verify(repo)
 @command('version', [] + formatteropts, norepo=True)
 def version_(ui, **opts):
 """output version and copyright information"""
+opts = pycompat.byteskwargs(opts)
 if ui.verbose:
 ui.pager('version')
 fm = ui.formatter("version", opts)
 fm.startitem()
 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),

changeset 32142	d90ffee93df6
parent 32135	347ab2d47463
child 32143	964c6be36590