mercurial: comparison hgext/githelp.py

equal deleted inserted replaced

-:6ea0b78ddcac
+:257f3651ada9
 import getopt
 import re
 from mercurial.i18n import _
 from mercurial import (
+encoding,
 error,
 fancyopts,
 registrar,
 util,
 )
 def __init__(self, name):
 self.name = name
 self.args = []
 self.opts = {}
-def __str__(self):
+def __bytes__(self):
 cmd = "hg " + self.name
 if self.opts:
 for k, values in sorted(self.opts.iteritems()):
 for v in values:
 if v:
 if self.args:
 cmd += " "
 cmd += " ".join(self.args)
 return cmd
+__str__ = encoding.strmethod(__bytes__)
 def append(self, value):
 self.args.append(value)
 def extend(self, values):
 self.args.extend(values)
 cmd.extend(args)
 else:
 ui.status(_("note: use hg addremove to remove files that have "
 "been deleted.\n\n"))
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def am(ui, repo, *args, **kwargs):
 cmdoptions=[
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('import')
-ui.status(str(cmd), "\n")
+ui.status(bytes(cmd), "\n")
 def apply(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('p', 'p', int, ''),
 ]
 cmd = Command('import --no-commit')
 if (opts.get('p')):
 cmd['-p'] = opts.get('p')
 cmd.extend(args)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def bisect(ui, repo, *args, **kwargs):
 ui.status(_("See 'hg help bisect' for how to use bisect.\n\n"))
 def blame(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('annotate -udl')
 cmd.extend([convert(v) for v in args])
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def branch(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'set-upstream', None, ''),
 ('', 'set-upstream-to', '', ''),
 if len(args) > 1:
 cmd['-r'] = args[1]
 cmd.append(args[0])
 elif len(args) == 1:
 cmd.append(args[0])
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def ispath(repo, string):
 """
 The first argument to git checkout can either be a revision or a path. Let's
 generally assume it's a revision, unless it's obviously a path. There are
 cmd = Command('revert')
 cmd['--all'] = None
 else:
 raise error.Abort("a commit must be specified")
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def cherrypick(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'continue', None, ''),
 ('', 'abort', None, ''),
 ui.status(_("note: hg graft does not have --abort.\n\n"))
 return
 else:
 cmd.extend(args)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def clean(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('d', 'd', None, ''),
 ('f', 'force', None, ''),
 cmd = Command('purge')
 if opts.get('x'):
 cmd['--all'] = None
 cmd.extend(args)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def clone(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'bare', None, ''),
 ('n', 'no-checkout', None, ''),
 if opts.get('branch'):
 cocmd = Command("update")
 cocmd.append(opts.get('branch'))
 cmd = cmd & cocmd
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def commit(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('a', 'all', None, ''),
 ('m', 'message', '', ''),
 if opts.get('date'):
 cmd['-d'] = opts.get('date')
 cmd.extend(args)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def deprecated(ui, repo, *args, **kwargs):
 ui.warn(_('This command has been deprecated in the git project, ' +
 'thus isn\'t supported by this tool.\n\n'))
 repo.revs(a)
 cmd['-r'] = a
 except Exception:
 cmd.append(a)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def difftool(ui, repo, *args, **kwargs):
 ui.status(_('Mercurial does not enable external difftool by default. You '
 'need to enable the extdiff extension in your .hgrc file by adding\n'
 'extdiff =\n'
 if v in repo._bookmarks:
 cmd['-B'] = v
 else:
 cmd['-r'] = v
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def grep(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 # For basic usage, git grep and hg grep are the same. They both have the
 # pattern first, followed by paths.
 cmd.extend(args)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def init(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('init')
 if len(args) > 0:
 cmd.append(args[0])
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def log(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'follow', None, ''),
 ('', 'decorate', None, ''),
 since, until = args[0].split('..')
 cmd['-r'] = "'%s::%s'" % (since, until)
 del args[0]
 cmd.extend(args)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def lsfiles(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('c', 'cached', None, ''),
 ('d', 'deleted', None, ''),
 cmd['-0'] = None
 cmd.append('.')
 for include in args:
 cmd['-I'] = util.shellquote(include)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def merge(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('merge')
 if len(args) > 0:
 cmd.append(args[len(args) - 1])
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def mergebase(ui, repo, *args, **kwargs):
 cmdoptions = []
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'"
 % (args[0], args[1]))
 ui.status(_('NOTE: ancestors() is part of the revset language.\n'),
 _("Learn more about revsets with 'hg help revsets'\n\n"))
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def mergetool(ui, repo, *args, **kwargs):
 cmdoptions = []
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command("resolve")
 if len(args) == 0:
 cmd['--all'] = None
 cmd.extend(args)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def mv(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('f', 'force', None, ''),
 ]
 cmd.extend(args)
 if opts.get('force'):
 cmd['-f'] = None
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def pull(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'all', None, ''),
 ('f', 'force', None, ''),
 if v in repo._bookmarks:
 cmd['-B'] = v
 else:
 cmd['-r'] = v
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def push(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'all', None, ''),
 ('f', 'force', None, ''),
 cmd['-r'] = v
 if opts.get('force'):
 cmd['-f'] = None
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def rebase(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'all', None, ''),
 ('i', 'interactive', None, ''),
 "It just edits history.\n\n"))
 cmd = Command('histedit')
 if len(args) > 0:
 ui.status(_("also note: 'hg histedit' will automatically detect"
 " your stack, so no second argument is necessary.\n\n"))
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 return
 if opts.get('skip'):
 cmd = Command('revert --all -r .')
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 cmd = Command('rebase')
 if opts.get('continue') or opts.get('skip'):
 cmd['--continue'] = None
 cmd['-d'] = convert(args[0])
 elif len(args) == 2:
 cmd['-d'] = convert(args[0])
 cmd['-b'] = convert(args[1])
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def reflog(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'all', None, ''),
 ]
 if opts.get('all'):
 cmd['--all'] = None
 if len(args) > 0:
 cmd.append(args[0])
-ui.status(str(cmd), "\n\n")
+ui.status(bytes(cmd), "\n\n")
 ui.status(_("note: in hg commits can be deleted from repo but we always"
 " have backups.\n"))
 def reset(ui, repo, *args, **kwargs):
 cmdoptions = [
 if hard:
 cmd.append('--clean')
 cmd.append(commit)
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def revert(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('backout')
 if args:
 cmd.append(args[0])
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def revparse(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'show-cdup', None, ''),
 ('', 'show-toplevel', None, ''),
 if opts.get('show_cdup') or opts.get('show_toplevel'):
 cmd = Command('root')
 if opts.get('show_cdup'):
 ui.status(_("note: hg root prints the root of the repository\n\n"))
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 else:
 ui.status(_("note: see hg help revset for how to refer to commits\n"))
 def rm(ui, repo, *args, **kwargs):
 cmdoptions = [
 if opts.get('force'):
 cmd['-f'] = None
 if opts.get('dry_run'):
 cmd['-n'] = None
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def show(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'name-status', None, ''),
 ('', 'pretty', '', ''),
 cmd = Command('export')
 cmd.append('--config diff.unified=%d' % (opts['unified'],))
 else:
 cmd = Command('export')
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def stash(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 if args[0] != 'save':
 cmd['--name'] = args[0]
 elif len(args) > 1:
 cmd['--name'] = args[1]
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def status(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('', 'ignored', None, ''),
 ]
 cmd.extend(args)
 if opts.get('ignored'):
 cmd['-i'] = None
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def svn(ui, repo, *args, **kwargs):
 svncmd = args[0]
 if not svncmd in gitsvncommands:
 ui.warn(_("error: unknown git svn command %s\n") % (svncmd))
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('push')
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def svnfetch(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('pull')
 cmd.append('default-push')
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def svnfindrev(ui, repo, *args, **kwargs):
 cmdoptions = [
 ]
 args, opts = parseoptions(ui, cmdoptions, args)
 cmd = Command('log')
 cmd['-r'] = args[0]
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def svnrebase(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('l', 'local', None, ''),
 ]
 rebasecmd = Command('rebase')
 rebasecmd.append('tip')
 cmd = pullcmd & rebasecmd
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 def tag(ui, repo, *args, **kwargs):
 cmdoptions = [
 ('f', 'force', None, ''),
 ('l', 'list', None, ''),
 cmd['--remove'] = None
 if opts.get('force'):
 cmd['-f'] = None
-ui.status((str(cmd)), "\n")
+ui.status((bytes(cmd)), "\n")
 gitcommands = {
 'add': add,
 'am': am,
 'apply': apply,

changeset 36230	257f3651ada9
parent 35721	f50067fbeead
child 37120	a8a902d7176e