This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7790		Apr 6 2018, 1:59 PM	★	★
Diff 2	7819		Apr 6 2018, 7:42 PM	★	★
Diff 3	7857	rHG444ed53f93df02981f9a5d3984c08d87e171d3d9	Apr 6 2018, 1:49 PM	★	★

Status	Author	Revision
Closed	martinvonz	D3165 infinitepush: look up bookmarks only among bookmarks
Closed	martinvonz	D3164 destutil: look up bookmarks only among bookmarks
Closed	martinvonz	D3163 discovery: look up bookmarks only among bookmarks
Closed	martinvonz	D3162 bookmarks: introduce a repo._bookmarks.changectx(mark) method and use it

Diff 7857


	# internal config: bookmarks.pushing			# internal config: bookmarks.pushing
	newbookmarks = [localbookmarks.expandname(b)			newbookmarks = [localbookmarks.expandname(b)
	for b in pushop.ui.configlist('bookmarks', 'pushing')]			for b in pushop.ui.configlist('bookmarks', 'pushing')]

	for bm in localbookmarks:			for bm in localbookmarks:
	rnode = remotebookmarks.get(bm)			rnode = remotebookmarks.get(bm)
	if rnode and rnode in repo:			if rnode and rnode in repo:
	lctx, rctx = repo[bm], repo[rnode]			lctx, rctx = localbookmarks.changectx(bm), repo[rnode]
	if bookmarks.validdest(repo, rctx, lctx):			if bookmarks.validdest(repo, rctx, lctx):
	bookmarkedheads.add(lctx.node())			bookmarkedheads.add(lctx.node())
	else:			else:
	if bm in newbookmarks and bm not in remotebookmarks:			if bm in newbookmarks and bm not in remotebookmarks:
	bookmarkedheads.add(repo[bm].node())			bookmarkedheads.add(localbookmarks[bm])

	return bookmarkedheads			return bookmarkedheads

	def checkheads(pushop):			def checkheads(pushop):
	"""Check that a push won't add any outgoing head			"""Check that a push won't add any outgoing head

	raise Abort error and display ui message as needed.			raise Abort error and display ui message as needed.
	"""			"""