This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	indygreg	D2151 py3: check for bytes instead of str in hg.share()
Closed	indygreg	D2150 py3: port metaedit extension to Python 3
Closed	indygreg	D2149 py3: pass system string to email.message.Message.set_type()
Closed	indygreg	D2148 py3: open temporary file in binary mode
Closed	indygreg	D2147 py3: use email parser that operates on bytes
Closed	indygreg	D2176 py3: convert traceback representation to bytes when logging
Closed	indygreg	D2175 py3: use b'' in mockblackbox.py
Closed	indygreg	D2174 py3: convert context to bytes instead of str
Closed	indygreg	D2173 py3: add missing b'' literal to sshprotoext.py
Closed	indygreg	D2172 py3: convert FrameInfo members to bytes
Closed	indygreg	D2171 ui: use named attributes on FrameInfo instance
Closed	indygreg	D2170 py3: make dummyssh compatible with Python 3
Closed	indygreg	D2169 py3: explicitly cast bool to bytes
Closed	indygreg	D2168 mail: import email.utils not email.Utils
Closed	indygreg	D2167 py3: cast character set to bytes
Closed	indygreg	D2166 py3: cast decode() argument to system string
Closed	indygreg	D2165 githelp: cast commands to bytes
Closed	indygreg	D2164 py3: avoid changing dictionary during iteration
Closed	indygreg	D2163 py3: use raw string for key in **kwargs
Closed	indygreg	D2162 py3: preserve chunks as an iterable of bytes
Closed	indygreg	D2161 py3: use b'' for changegroup version literals
Closed	indygreg	D2160 py3: use b'' in inline extension
Closed	indygreg	D2159 py3: use hex(hasher.digest())
Needs Revision	indygreg	D2158 py3: use raw string for open() mode
Closed	indygreg	D2157 py3: use string for "close" value in commit extras
Closed	indygreg	D2156 py3: catch TypeError during template operations
Closed	indygreg	D2155 py3: use bytes literals for test extension
Closed	indygreg	D2154 py3: use system strings when calling __import__
Closed	indygreg	D2153 py3: open patches.queue in binary mode
Closed	indygreg	D2152 py3: compare against bytes instead of str
Closed	indygreg	D2146 py3: port string formatting
Closed	indygreg	D2145 py3: port ext-phase-report.py extension
Closed	indygreg	D2144 py3: more robustly cast UUID to bytes
Closed	indygreg	D2143 py3: use bytes() to cast context instances
Closed	indygreg	D2142 py3: convert __doc__ to bytes
Closed	indygreg	D2141 py3: cast repr() result to bytes
Closed	indygreg	D2140 py3: fix file i/o in test-status.t
Closed	indygreg	D2139 py3: pass system string to socket.getservbyname
Closed	indygreg	D2138 run-tests: report tests that exception occurred in
Closed	indygreg	D2137 py3: use raw string for file open mode
Closed	indygreg	D2136 py3: convert content-type to bytes

Diff 5759

hgext/githelp.py


	from __future__ import absolute_import			from __future__ import absolute_import

	import getopt			import getopt
	import re			import re

	from mercurial.i18n import _			from mercurial.i18n import _
	from mercurial import (			from mercurial import (
				encoding,
	error,			error,
	fancyopts,			fancyopts,
	registrar,			registrar,
	util,			util,
	)			)

	# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for			# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
	# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should			# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
	return args, opts			return args, opts

	class Command(object):			class Command(object):
	def __init__(self, name):			def __init__(self, name):
	self.name = name			self.name = name
	self.args = []			self.args = []
	self.opts = {}			self.opts = {}

	def __str__(self):			def __bytes__(self):
	cmd = "hg " + self.name			cmd = "hg " + self.name
	if self.opts:			if self.opts:
	for k, values in sorted(self.opts.iteritems()):			for k, values in sorted(self.opts.iteritems()):
	for v in values:			for v in values:
	if v:			if v:
	cmd += " %s %s" % (k, v)			cmd += " %s %s" % (k, v)
	else:			else:
	cmd += " %s" % (k,)			cmd += " %s" % (k,)
	if self.args:			if self.args:
	cmd += " "			cmd += " "
	cmd += " ".join(self.args)			cmd += " ".join(self.args)
	return cmd			return cmd

				__str__ = encoding.strmethod(__bytes__)
				pulkitUnsubmitted Not Done This should be `__str__ = encoding.strmethod(__bytes__)` otherwise we will get an error like str returned a non-string value. pulkit: This should be `__str__ = encoding.strmethod(__bytes__)` otherwise we will get an error like…

	def append(self, value):			def append(self, value):
	self.args.append(value)			self.args.append(value)

	def extend(self, values):			def extend(self, values):
	self.args.extend(values)			self.args.extend(values)

	def __setitem__(self, key, value):			def __setitem__(self, key, value):
	values = self.opts.setdefault(key, [])			values = self.opts.setdefault(key, [])
	cmd = Command("add")			cmd = Command("add")

	if not opts.get('all'):			if not opts.get('all'):
	cmd.extend(args)			cmd.extend(args)
	else:			else:
	ui.status(_("note: use hg addremove to remove files that have "			ui.status(_("note: use hg addremove to remove files that have "
	"been deleted.\n\n"))			"been deleted.\n\n"))

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def am(ui, repo, args, *kwargs):			def am(ui, repo, args, *kwargs):
	cmdoptions=[			cmdoptions=[
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)
	cmd = Command('import')			cmd = Command('import')
	ui.status(str(cmd), "\n")			ui.status(bytes(cmd), "\n")

	def apply(ui, repo, args, *kwargs):			def apply(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('p', 'p', int, ''),			('p', 'p', int, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('import --no-commit')			cmd = Command('import --no-commit')
	if (opts.get('p')):			if (opts.get('p')):
	cmd['-p'] = opts.get('p')			cmd['-p'] = opts.get('p')
	cmd.extend(args)			cmd.extend(args)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def bisect(ui, repo, args, *kwargs):			def bisect(ui, repo, args, *kwargs):
	ui.status(_("See 'hg help bisect' for how to use bisect.\n\n"))			ui.status(_("See 'hg help bisect' for how to use bisect.\n\n"))

	def blame(ui, repo, args, *kwargs):			def blame(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)
	cmd = Command('annotate -udl')			cmd = Command('annotate -udl')
	cmd.extend([convert(v) for v in args])			cmd.extend([convert(v) for v in args])
	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def branch(ui, repo, args, *kwargs):			def branch(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'set-upstream', None, ''),			('', 'set-upstream', None, ''),
	('', 'set-upstream-to', '', ''),			('', 'set-upstream-to', '', ''),
	('d', 'delete', None, ''),			('d', 'delete', None, ''),
	('D', 'delete', None, ''),			('D', 'delete', None, ''),
	('m', 'move', None, ''),			('m', 'move', None, ''),
	cmd['-m'] = old			cmd['-m'] = old
	cmd.append(new)			cmd.append(new)
	else:			else:
	if len(args) > 1:			if len(args) > 1:
	cmd['-r'] = args[1]			cmd['-r'] = args[1]
	cmd.append(args[0])			cmd.append(args[0])
	elif len(args) == 1:			elif len(args) == 1:
	cmd.append(args[0])			cmd.append(args[0])
	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def ispath(repo, string):			def ispath(repo, string):
	"""			"""
	The first argument to git checkout can either be a revision or a path. Let's			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			generally assume it's a revision, unless it's obviously a path. There are
	too many ways to spell revisions in git for us to reasonably catch all of			too many ways to spell revisions in git for us to reasonably catch all of
	them, so let's be conservative.			them, so let's be conservative.
	"""			"""
	else:			else:
	cmd.append(rev)			cmd.append(rev)
	elif opts.get('force'):			elif opts.get('force'):
	cmd = Command('revert')			cmd = Command('revert')
	cmd['--all'] = None			cmd['--all'] = None
	else:			else:
	raise error.Abort("a commit must be specified")			raise error.Abort("a commit must be specified")

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def cherrypick(ui, repo, args, *kwargs):			def cherrypick(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'continue', None, ''),			('', 'continue', None, ''),
	('', 'abort', None, ''),			('', 'abort', None, ''),
	('e', 'edit', None, ''),			('e', 'edit', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('graft')			cmd = Command('graft')

	if opts.get('edit'):			if opts.get('edit'):
	cmd['--edit'] = None			cmd['--edit'] = None
	if opts.get('continue'):			if opts.get('continue'):
	cmd['--continue'] = None			cmd['--continue'] = None
	elif opts.get('abort'):			elif opts.get('abort'):
	ui.status(_("note: hg graft does not have --abort.\n\n"))			ui.status(_("note: hg graft does not have --abort.\n\n"))
	return			return
	else:			else:
	cmd.extend(args)			cmd.extend(args)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def clean(ui, repo, args, *kwargs):			def clean(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('d', 'd', None, ''),			('d', 'd', None, ''),
	('f', 'force', None, ''),			('f', 'force', None, ''),
	('x', 'x', None, ''),			('x', 'x', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('purge')			cmd = Command('purge')
	if opts.get('x'):			if opts.get('x'):
	cmd['--all'] = None			cmd['--all'] = None
	cmd.extend(args)			cmd.extend(args)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def clone(ui, repo, args, *kwargs):			def clone(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'bare', None, ''),			('', 'bare', None, ''),
	('n', 'no-checkout', None, ''),			('n', 'no-checkout', None, ''),
	('b', 'branch', '', ''),			('b', 'branch', '', ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)
	elif opts.get('no_checkout'):			elif opts.get('no_checkout'):
	cmd['-U'] = None			cmd['-U'] = None

	if opts.get('branch'):			if opts.get('branch'):
	cocmd = Command("update")			cocmd = Command("update")
	cocmd.append(opts.get('branch'))			cocmd.append(opts.get('branch'))
	cmd = cmd & cocmd			cmd = cmd & cocmd

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def commit(ui, repo, args, *kwargs):			def commit(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('a', 'all', None, ''),			('a', 'all', None, ''),
	('m', 'message', '', ''),			('m', 'message', '', ''),
	('p', 'patch', None, ''),			('p', 'patch', None, ''),
	('C', 'reuse-message', '', ''),			('C', 'reuse-message', '', ''),
	('F', 'file', '', ''),			('F', 'file', '', ''),
	if opts.get('author'):			if opts.get('author'):
	cmd['-u'] = opts.get('author')			cmd['-u'] = opts.get('author')

	if opts.get('date'):			if opts.get('date'):
	cmd['-d'] = opts.get('date')			cmd['-d'] = opts.get('date')

	cmd.extend(args)			cmd.extend(args)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def deprecated(ui, repo, args, *kwargs):			def deprecated(ui, repo, args, *kwargs):
	ui.warn(_('This command has been deprecated in the git project, ' +			ui.warn(_('This command has been deprecated in the git project, ' +
	'thus isn\'t supported by this tool.\n\n'))			'thus isn\'t supported by this tool.\n\n'))

	def diff(ui, repo, args, *kwargs):			def diff(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('a', 'all', None, ''),			('a', 'all', None, ''),
	for a in list(args):			for a in list(args):
	args.remove(a)			args.remove(a)
	try:			try:
	repo.revs(a)			repo.revs(a)
	cmd['-r'] = a			cmd['-r'] = a
	except Exception:			except Exception:
	cmd.append(a)			cmd.append(a)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def difftool(ui, repo, args, *kwargs):			def difftool(ui, repo, args, *kwargs):
	ui.status(_('Mercurial does not enable external difftool by default. You '			ui.status(_('Mercurial does not enable external difftool by default. You '
	'need to enable the extdiff extension in your .hgrc file by adding\n'			'need to enable the extdiff extension in your .hgrc file by adding\n'
	'extdiff =\n'			'extdiff =\n'
	'to the [extensions] section and then running\n\n'			'to the [extensions] section and then running\n\n'
	'hg extdiff -p <program>\n\n'			'hg extdiff -p <program>\n\n'
	'See \'hg help extdiff\' and \'hg help -e extdiff\' for more '			'See \'hg help extdiff\' and \'hg help -e extdiff\' for more '
	"-B can be used to specify which bookmark you want to pull." +			"-B can be used to specify which bookmark you want to pull." +
	"\n\n"))			"\n\n"))
	for v in args[1:]:			for v in args[1:]:
	if v in repo._bookmarks:			if v in repo._bookmarks:
	cmd['-B'] = v			cmd['-B'] = v
	else:			else:
	cmd['-r'] = v			cmd['-r'] = v

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def grep(ui, repo, args, *kwargs):			def grep(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('grep')			cmd = Command('grep')

	# For basic usage, git grep and hg grep are the same. They both have the			# For basic usage, git grep and hg grep are the same. They both have the
	# pattern first, followed by paths.			# pattern first, followed by paths.
	cmd.extend(args)			cmd.extend(args)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def init(ui, repo, args, *kwargs):			def init(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('init')			cmd = Command('init')

	if len(args) > 0:			if len(args) > 0:
	cmd.append(args[0])			cmd.append(args[0])

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def log(ui, repo, args, *kwargs):			def log(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'follow', None, ''),			('', 'follow', None, ''),
	('', 'decorate', None, ''),			('', 'decorate', None, ''),
	('n', 'number', '', ''),			('n', 'number', '', ''),
	('1', '1', None, ''),			('1', '1', None, ''),
	('', 'pretty', '', ''),			('', 'pretty', '', ''),

	if len(args) > 0:			if len(args) > 0:
	if '..' in args[0]:			if '..' in args[0]:
	since, until = args[0].split('..')			since, until = args[0].split('..')
	cmd['-r'] = "'%s::%s'" % (since, until)			cmd['-r'] = "'%s::%s'" % (since, until)
	del args[0]			del args[0]
	cmd.extend(args)			cmd.extend(args)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def lsfiles(ui, repo, args, *kwargs):			def lsfiles(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('c', 'cached', None, ''),			('c', 'cached', None, ''),
	('d', 'deleted', None, ''),			('d', 'deleted', None, ''),
	('m', 'modified', None, ''),			('m', 'modified', None, ''),
	('o', 'others', None, ''),			('o', 'others', None, ''),
	('i', 'ignored', None, ''),			('i', 'ignored', None, ''),
	ui.status(_("note: Mercurial doesn't have a staging area, ignoring "			ui.status(_("note: Mercurial doesn't have a staging area, ignoring "
	"--stage\n"))			"--stage\n"))
	if opts.get('_zero'):			if opts.get('_zero'):
	cmd['-0'] = None			cmd['-0'] = None
	cmd.append('.')			cmd.append('.')
	for include in args:			for include in args:
	cmd['-I'] = util.shellquote(include)			cmd['-I'] = util.shellquote(include)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def merge(ui, repo, args, *kwargs):			def merge(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('merge')			cmd = Command('merge')

	if len(args) > 0:			if len(args) > 0:
	cmd.append(args[len(args) - 1])			cmd.append(args[len(args) - 1])

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def mergebase(ui, repo, args, *kwargs):			def mergebase(ui, repo, args, *kwargs):
	cmdoptions = []			cmdoptions = []
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	if len(args) != 2:			if len(args) != 2:
	args = ['A', 'B']			args = ['A', 'B']

	cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'"			cmd = Command("log -T '{node}\\n' -r 'ancestor(%s,%s)'"
	% (args[0], args[1]))			% (args[0], args[1]))

	ui.status(_('NOTE: ancestors() is part of the revset language.\n'),			ui.status(_('NOTE: ancestors() is part of the revset language.\n'),
	_("Learn more about revsets with 'hg help revsets'\n\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):			def mergetool(ui, repo, args, *kwargs):
	cmdoptions = []			cmdoptions = []
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command("resolve")			cmd = Command("resolve")

	if len(args) == 0:			if len(args) == 0:
	cmd['--all'] = None			cmd['--all'] = None
	cmd.extend(args)			cmd.extend(args)
	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def mv(ui, repo, args, *kwargs):			def mv(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('f', 'force', None, ''),			('f', 'force', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('mv')			cmd = Command('mv')
	cmd.extend(args)			cmd.extend(args)

	if opts.get('force'):			if opts.get('force'):
	cmd['-f'] = None			cmd['-f'] = None

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def pull(ui, repo, args, *kwargs):			def pull(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'all', None, ''),			('', 'all', None, ''),
	('f', 'force', None, ''),			('f', 'force', None, ''),
	('r', 'rebase', None, ''),			('r', 'rebase', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)
	"-B can be used to specify which bookmark you want to pull." +			"-B can be used to specify which bookmark you want to pull." +
	"\n\n"))			"\n\n"))
	for v in args[1:]:			for v in args[1:]:
	if v in repo._bookmarks:			if v in repo._bookmarks:
	cmd['-B'] = v			cmd['-B'] = v
	else:			else:
	cmd['-r'] = v			cmd['-r'] = v

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def push(ui, repo, args, *kwargs):			def push(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'all', None, ''),			('', 'all', None, ''),
	('f', 'force', None, ''),			('f', 'force', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	if v in repo._bookmarks:			if v in repo._bookmarks:
	cmd['-B'] = v			cmd['-B'] = v
	else:			else:
	cmd['-r'] = v			cmd['-r'] = v

	if opts.get('force'):			if opts.get('force'):
	cmd['-f'] = None			cmd['-f'] = None

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def rebase(ui, repo, args, *kwargs):			def rebase(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'all', None, ''),			('', 'all', None, ''),
	('i', 'interactive', None, ''),			('i', 'interactive', None, ''),
	('', 'onto', '', ''),			('', 'onto', '', ''),
	('', 'abort', None, ''),			('', 'abort', None, ''),
	('', 'continue', None, ''),			('', 'continue', None, ''),
	('', 'skip', None, ''),			('', 'skip', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	if opts.get('interactive'):			if opts.get('interactive'):
	ui.status(_("note: hg histedit does not perform a rebase. " +			ui.status(_("note: hg histedit does not perform a rebase. " +
	"It just edits history.\n\n"))			"It just edits history.\n\n"))
	cmd = Command('histedit')			cmd = Command('histedit')
	if len(args) > 0:			if len(args) > 0:
	ui.status(_("also note: 'hg histedit' will automatically detect"			ui.status(_("also note: 'hg histedit' will automatically detect"
	" your stack, so no second argument is necessary.\n\n"))			" your stack, so no second argument is necessary.\n\n"))
	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")
	return			return

	if opts.get('skip'):			if opts.get('skip'):
	cmd = Command('revert --all -r .')			cmd = Command('revert --all -r .')
	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	cmd = Command('rebase')			cmd = Command('rebase')

	if opts.get('continue') or opts.get('skip'):			if opts.get('continue') or opts.get('skip'):
	cmd['--continue'] = None			cmd['--continue'] = None
	if opts.get('abort'):			if opts.get('abort'):
	cmd['--abort'] = None			cmd['--abort'] = None

	if opts.get('onto'):			if opts.get('onto'):
	ui.status(_("note: if you're trying to lift a commit off one branch, " +			ui.status(_("note: if you're trying to lift a commit off one branch, " +
	"try hg rebase -d <destination commit> -s <commit to be lifted>" +			"try hg rebase -d <destination commit> -s <commit to be lifted>" +
	"\n\n"))			"\n\n"))
	cmd['-d'] = convert(opts.get('onto'))			cmd['-d'] = convert(opts.get('onto'))
	if len(args) < 2:			if len(args) < 2:
	raise error.Abort("Expected format: git rebase --onto X Y Z")			raise error.Abort("Expected format: git rebase --onto X Y Z")
	cmd['-s'] = "'::%s - ::%s'" % (convert(args[1]), convert(args[0]))			cmd['-s'] = "'::%s - ::%s'" % (convert(args[1]), convert(args[0]))
	else:			else:
	if len(args) == 1:			if len(args) == 1:
	cmd['-d'] = convert(args[0])			cmd['-d'] = convert(args[0])
	elif len(args) == 2:			elif len(args) == 2:
	cmd['-d'] = convert(args[0])			cmd['-d'] = convert(args[0])
	cmd['-b'] = convert(args[1])			cmd['-b'] = convert(args[1])

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def reflog(ui, repo, args, *kwargs):			def reflog(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'all', None, ''),			('', 'all', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('journal')			cmd = Command('journal')
	if opts.get('all'):			if opts.get('all'):
	cmd['--all'] = None			cmd['--all'] = None
	if len(args) > 0:			if len(args) > 0:
	cmd.append(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"			ui.status(_("note: in hg commits can be deleted from repo but we always"
	" have backups.\n"))			" have backups.\n"))

	def reset(ui, repo, args, *kwargs):			def reset(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'soft', None, ''),			('', 'soft', None, ''),
	('', 'hard', None, ''),			('', 'hard', None, ''),
	('', 'mixed', None, ''),			('', 'mixed', None, ''),
	'staging area\n\n'))			'staging area\n\n'))

	cmd = Command('update')			cmd = Command('update')
	if hard:			if hard:
	cmd.append('--clean')			cmd.append('--clean')

	cmd.append(commit)			cmd.append(commit)

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def revert(ui, repo, args, *kwargs):			def revert(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	if len(args) > 1:			if len(args) > 1:
	ui.status(_("note: hg backout doesn't support multiple commits at " +			ui.status(_("note: hg backout doesn't support multiple commits at " +
	"once\n\n"))			"once\n\n"))

	cmd = Command('backout')			cmd = Command('backout')
	if args:			if args:
	cmd.append(args[0])			cmd.append(args[0])

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def revparse(ui, repo, args, *kwargs):			def revparse(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'show-cdup', None, ''),			('', 'show-cdup', None, ''),
	('', 'show-toplevel', None, ''),			('', 'show-toplevel', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	if opts.get('show_cdup') or opts.get('show_toplevel'):			if opts.get('show_cdup') or opts.get('show_toplevel'):
	cmd = Command('root')			cmd = Command('root')
	if opts.get('show_cdup'):			if opts.get('show_cdup'):
	ui.status(_("note: hg root prints the root of the repository\n\n"))			ui.status(_("note: hg root prints the root of the repository\n\n"))
	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")
	else:			else:
	ui.status(_("note: see hg help revset for how to refer to commits\n"))			ui.status(_("note: see hg help revset for how to refer to commits\n"))

	def rm(ui, repo, args, *kwargs):			def rm(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('f', 'force', None, ''),			('f', 'force', None, ''),
	('n', 'dry-run', None, ''),			('n', 'dry-run', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('rm')			cmd = Command('rm')
	cmd.extend(args)			cmd.extend(args)

	if opts.get('force'):			if opts.get('force'):
	cmd['-f'] = None			cmd['-f'] = None
	if opts.get('dry_run'):			if opts.get('dry_run'):
	cmd['-n'] = None			cmd['-n'] = None

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def show(ui, repo, args, *kwargs):			def show(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'name-status', None, ''),			('', 'name-status', None, ''),
	('', 'pretty', '', ''),			('', 'pretty', '', ''),
	('U', 'unified', int, ''),			('U', 'unified', int, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)
	if opts.get('unified'):			if opts.get('unified'):
	cmd.append('--config diff.unified=%d' % (opts['unified'],))			cmd.append('--config diff.unified=%d' % (opts['unified'],))
	elif opts.get('unified'):			elif opts.get('unified'):
	cmd = Command('export')			cmd = Command('export')
	cmd.append('--config diff.unified=%d' % (opts['unified'],))			cmd.append('--config diff.unified=%d' % (opts['unified'],))
	else:			else:
	cmd = Command('export')			cmd = Command('export')

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def stash(ui, repo, args, *kwargs):			def stash(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('shelve')			cmd = Command('shelve')
	action = args[0] if len(args) > 0 else None			action = args[0] if len(args) > 0 else None
	return			return
	else:			else:
	if len(args) > 0:			if len(args) > 0:
	if args[0] != 'save':			if args[0] != 'save':
	cmd['--name'] = args[0]			cmd['--name'] = args[0]
	elif len(args) > 1:			elif len(args) > 1:
	cmd['--name'] = args[1]			cmd['--name'] = args[1]

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def status(ui, repo, args, *kwargs):			def status(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('', 'ignored', None, ''),			('', 'ignored', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('status')			cmd = Command('status')
	cmd.extend(args)			cmd.extend(args)

	if opts.get('ignored'):			if opts.get('ignored'):
	cmd['-i'] = None			cmd['-i'] = None

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def svn(ui, repo, args, *kwargs):			def svn(ui, repo, args, *kwargs):
	svncmd = args[0]			svncmd = args[0]
	if not svncmd in gitsvncommands:			if not svncmd in gitsvncommands:
	ui.warn(_("error: unknown git svn command %s\n") % (svncmd))			ui.warn(_("error: unknown git svn command %s\n") % (svncmd))

	args = args[1:]			args = args[1:]
	return gitsvncommands[svncmd](ui, repo, args, *kwargs)			return gitsvncommands[svncmd](ui, repo, args, *kwargs)

	def svndcommit(ui, repo, args, *kwargs):			def svndcommit(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('push')			cmd = Command('push')

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def svnfetch(ui, repo, args, *kwargs):			def svnfetch(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('pull')			cmd = Command('pull')
	cmd.append('default-push')			cmd.append('default-push')

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def svnfindrev(ui, repo, args, *kwargs):			def svnfindrev(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	cmd = Command('log')			cmd = Command('log')
	cmd['-r'] = args[0]			cmd['-r'] = args[0]

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def svnrebase(ui, repo, args, *kwargs):			def svnrebase(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('l', 'local', None, ''),			('l', 'local', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	pullcmd = Command('pull')			pullcmd = Command('pull')
	pullcmd.append('default-push')			pullcmd.append('default-push')
	rebasecmd = Command('rebase')			rebasecmd = Command('rebase')
	rebasecmd.append('tip')			rebasecmd.append('tip')

	cmd = pullcmd & rebasecmd			cmd = pullcmd & rebasecmd

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	def tag(ui, repo, args, *kwargs):			def tag(ui, repo, args, *kwargs):
	cmdoptions = [			cmdoptions = [
	('f', 'force', None, ''),			('f', 'force', None, ''),
	('l', 'list', None, ''),			('l', 'list', None, ''),
	('d', 'delete', None, ''),			('d', 'delete', None, ''),
	]			]
	args, opts = parseoptions(ui, cmdoptions, args)			args, opts = parseoptions(ui, cmdoptions, args)

	if opts.get('list'):			if opts.get('list'):
	cmd = Command('tags')			cmd = Command('tags')
	else:			else:
	cmd = Command('tag')			cmd = Command('tag')
	cmd.append(args[0])			cmd.append(args[0])
	if len(args) > 1:			if len(args) > 1:
	cmd['-r'] = args[1]			cmd['-r'] = args[1]

	if opts.get('delete'):			if opts.get('delete'):
	cmd['--remove'] = None			cmd['--remove'] = None

	if opts.get('force'):			if opts.get('force'):
	cmd['-f'] = None			cmd['-f'] = None

	ui.status((str(cmd)), "\n")			ui.status((bytes(cmd)), "\n")

	gitcommands = {			gitcommands = {
	'add': add,			'add': add,
	'am': am,			'am': am,
	'apply': apply,			'apply': apply,
	'bisect': bisect,			'bisect': bisect,
	'blame': blame,			'blame': blame,
	'branch': branch,			'branch': branch,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5466		Feb 11 2018, 9:35 PM	★	★
Diff 2	5759	rHG257f3651ada9dbcb2cb97bbe799fa59c57619cc6	Feb 11 2018, 8:23 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

githelp: cast commands to bytesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 5759

hgext/githelp.py

githelp: cast commands to bytes
ClosedPublic

Revision Contents
Changeset List