This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	martinvonz	D9985 softstrip: fix a reference to an undefined variable
	Closed	martinvonz	D9984 softstrip: move _bookmarkmovements() call to where it's needed

Diff 25578



	def softstrip(ui, repo, nodelist, backup=True, topic=b'backup'):			def softstrip(ui, repo, nodelist, backup=True, topic=b'backup'):
	"""perform a "soft" strip using the archived phase"""			"""perform a "soft" strip using the archived phase"""
	tostrip = [c.node() for c in repo.set(b'sort(%ln::)', nodelist)]			tostrip = [c.node() for c in repo.set(b'sort(%ln::)', nodelist)]
	if not tostrip:			if not tostrip:
	return None			return None

	newbmtarget, updatebm = _bookmarkmovements(repo, tostrip)
	if backup:			if backup:
	node = tostrip[0]			node = tostrip[0]
	backupfile = _createstripbackup(repo, tostrip, node, topic)			backupfile = _createstripbackup(repo, tostrip, node, topic)

				newbmtarget, updatebm = _bookmarkmovements(repo, tostrip)
	with repo.transaction(b'strip') as tr:			with repo.transaction(b'strip') as tr:
	phases.retractboundary(repo, tr, phases.archived, tostrip)			phases.retractboundary(repo, tr, phases.archived, tostrip)
	bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm]			bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm]
	repo._bookmarks.applychanges(repo, tr, bmchanges)			repo._bookmarks.applychanges(repo, tr, bmchanges)
	return backupfile			return backupfile


	def _bookmarkmovements(repo, tostrip):			def _bookmarkmovements(repo, tostrip):