This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D2046 py3: add b'' to literals in check-config.py
Closed	pulkit	D2045 check-config: specify the mode 'rb' to open the file
Closed	pulkit	D2044 py3: use open() instead of file()
Closed	pulkit	D2043 py3: use pycompat.strkwargs() to convert kwargs' key to str
Closed	pulkit	D2042 py3: add __bytes__() for mq.patchheader and make sure __str__ returns str
Closed	pulkit	D2041 py3: use "%d" to convert integer to bytes
Closed	pulkit	D2040 py3: use .startswith() instead of bytes[0]
Closed	pulkit	D2039 py3: slice on bytes to prevent getting the ascii values
Closed	pulkit	D2038 py3: add r'' to convert keys to keyword arguments to str
Closed	pulkit	D2037 py3: add b'' to tweakdefualts config string

Diff 5209

hgext/shelve.py

	"""subcommand that abort an in-progress unshelve"""			"""subcommand that abort an in-progress unshelve"""
	with repo.lock():			with repo.lock():
	try:			try:
	checkparents(repo, state)			checkparents(repo, state)

	repo.vfs.rename('unshelverebasestate', 'rebasestate')			repo.vfs.rename('unshelverebasestate', 'rebasestate')
	try:			try:
	rebase.rebase(ui, repo, **{			rebase.rebase(ui, repo, **{
	'abort' : True			r'abort' : True
	})			})
	except Exception:			except Exception:
	repo.vfs.rename('rebasestate', 'unshelverebasestate')			repo.vfs.rename('rebasestate', 'unshelverebasestate')
	raise			raise

	mergefiles(ui, repo, state.wctx, state.pendingctx)			mergefiles(ui, repo, state.wctx, state.pendingctx)
	repair.strip(ui, repo, state.nodestoremove, backup=False,			repair.strip(ui, repo, state.nodestoremove, backup=False,
	topic='shelve')			topic='shelve')

	# revert will overwrite unknown files, so move them out of the way			# revert will overwrite unknown files, so move them out of the way
	for file in repo.status(unknown=True).unknown:			for file in repo.status(unknown=True).unknown:
	if file in files:			if file in files:
	util.rename(file, scmutil.origpath(ui, repo, file))			util.rename(file, scmutil.origpath(ui, repo, file))
	ui.pushbuffer(True)			ui.pushbuffer(True)
	cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),			cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
	*pathtofiles(repo, files),			*pathtofiles(repo, files),
	**{'no_backup': True})			**{r'no_backup': True})
	ui.popbuffer()			ui.popbuffer()

	def restorebranch(ui, repo, branchtorestore):			def restorebranch(ui, repo, branchtorestore):
	if branchtorestore and branchtorestore != repo.dirstate.branch():			if branchtorestore and branchtorestore != repo.dirstate.branch():
	repo.dirstate.setbranch(branchtorestore)			repo.dirstate.setbranch(branchtorestore)
	ui.status(_('marked working directory as branch %s\n')			ui.status(_('marked working directory as branch %s\n')
	% branchtorestore)			% branchtorestore)

	if list(ms.unresolved()):			if list(ms.unresolved()):
	raise error.Abort(			raise error.Abort(
	_("unresolved conflicts, can't continue"),			_("unresolved conflicts, can't continue"),
	hint=_("see 'hg resolve', then 'hg unshelve --continue'"))			hint=_("see 'hg resolve', then 'hg unshelve --continue'"))

	repo.vfs.rename('unshelverebasestate', 'rebasestate')			repo.vfs.rename('unshelverebasestate', 'rebasestate')
	try:			try:
	rebase.rebase(ui, repo, **{			rebase.rebase(ui, repo, **{
	'continue' : True			r'continue' : True
	})			})
	except Exception:			except Exception:
	repo.vfs.rename('rebasestate', 'unshelverebasestate')			repo.vfs.rename('rebasestate', 'unshelverebasestate')
	raise			raise

	shelvectx = repo['tip']			shelvectx = repo['tip']
	if state.pendingctx not in shelvectx.parents():			if state.pendingctx not in shelvectx.parents():
	# rebase was a no-op, so it produced no child commit			# rebase was a no-op, so it produced no child commit
	# If the shelve is not immediately on top of the commit			# If the shelve is not immediately on top of the commit
	# we'll be merging with, rebase it to be on top.			# we'll be merging with, rebase it to be on top.
	if tmpwctx.node() == shelvectx.parents()[0].node():			if tmpwctx.node() == shelvectx.parents()[0].node():
	return shelvectx			return shelvectx

	ui.status(_('rebasing shelved changes\n'))			ui.status(_('rebasing shelved changes\n'))
	try:			try:
	rebase.rebase(ui, repo, **{			rebase.rebase(ui, repo, **{
	'rev': [shelvectx.rev()],			r'rev': [shelvectx.rev()],
	'dest': str(tmpwctx.rev()),			r'dest': str(tmpwctx.rev()),
	'keep': True,			r'keep': True,
	'tool': opts.get('tool', ''),			r'tool': opts.get('tool', ''),
	})			})
	except error.InterventionRequired:			except error.InterventionRequired:
	tr.close()			tr.close()

	nodestoremove = [repo.changelog.node(rev)			nodestoremove = [repo.changelog.node(rev)
	for rev in xrange(oldtiprev, len(repo))]			for rev in xrange(oldtiprev, len(repo))]
	shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,			shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,
	branchtorestore, opts.get('keep'), activebookmark)			branchtorestore, opts.get('keep'), activebookmark)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5196		Feb 5 2018, 3:22 AM	★	★
Diff 2	5209	rHG78b985c75731ba2bdf0a8d99497b14fbb222f080	Feb 4 2018, 10:16 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

py3: add r'' to convert keys to keyword arguments to strClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 5209

hgext/shelve.py

py3: add r'' to convert keys to keyword arguments to str
ClosedPublic

Revision Contents
Changeset List