This is an archive of the discontinued Mercurial Phabricator instance.

obsshelve: update savebackup signature
ClosedPublic

Authored by durham on Jul 17 2017, 6:56 AM.

Reviewers

stash

Group Reviewers

Restricted Project

Commits

rFBHGX10b2e4bf23cd: obsshelve: update savebackup signature

Summary

Upstream has changed the signature of saveback to include the full name. Let's
update to match it.

Test Plan

The test now passes

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision is now accepted and ready to land.Jul 17 2017, 7:02 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			hgext3rd/obsshelve.py (4 lines)

	def _restoreactivebookmark(repo, mark):			def _restoreactivebookmark(repo, mark):
	if mark:			if mark:
	bookmarks.activate(repo, mark)			bookmarks.activate(repo, mark)

	def _aborttransaction(repo):			def _aborttransaction(repo):
	'''Abort current transaction for shelve/unshelve, but keep dirstate			'''Abort current transaction for shelve/unshelve, but keep dirstate
	'''			'''
	tr = repo.currenttransaction()			tr = repo.currenttransaction()
	repo.dirstate.savebackup(tr, suffix='.shelve')			repo.dirstate.savebackup(tr, 'dirstate.shelve')
	tr.abort()			tr.abort()
	repo.dirstate.restorebackup(None, suffix='.shelve')			repo.dirstate.restorebackup(None, 'dirstate.shelve')

	def createcmd(ui, repo, pats, opts):			def createcmd(ui, repo, pats, opts):
	"""subcommand that creates a new shelve"""			"""subcommand that creates a new shelve"""
	with repo.wlock():			with repo.wlock():
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	return _docreatecmd(ui, repo, pats, opts)			return _docreatecmd(ui, repo, pats, opts)

	def getshelvename(repo, parent, opts):			def getshelvename(repo, parent, opts):